Merge branch 'hotfix/scss_loader_option' into develop

Former-commit-id: 4fe2f4a1bdbe50549f569ecfc78458ebeae0a085 [formerly 4fe2f4a1bdbe50549f569ecfc78458ebeae0a085 [formerly 4fe2f4a1bdbe50549f569ecfc78458ebeae0a085 [formerly 4fe2f4a1bdbe50549f569ecfc78458ebeae0a085 [formerly 97ba6ce8f486c534dc9b12f9eb5b8fdbc1bc1a44 [formerly 21ff90863672b6cf1ffbf4241c62c7f7cdbb826b]]]]] Former-commit-id: 89f5a5bd18ff84310e18d1e77e811d8ffc415b73 Former-commit-id: 30e8b603baf37103c4a2bb754ea2979338650407 Former-commit-id: 8dde1a46778c70092bc0a0b9feb32674fb803f8d [formerly b1f46b4d03f32545d02e3638c034e0f87e52e3fc] Former-commit-id: 4d3c48b30bf2d4da4a5e3a50eb75f29cd24a871f Former-commit-id: f9b0dcda1fb1a3a7c56e2979b8cb3587112fc4b8 Former-commit-id: a2d15622804b5b0b032b128eda70a77aac9f6323 Former-commit-id: 8d706bc8c536658a4ea4273d0c5c1cddfac73b7f Former-commit-id: 1f571c7900fb74d16169a3280d8c35c2fe000c62
2018-11-16 22:50:00 +08:00
parent 894ab29478 fcc0cb337d
commit 0b5b307791
32 changed files with 9 additions and 33 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "d2-admin",
-  "version": "1.6.2",
+  "version": "1.6.3",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --open",
--- a/src/assets/style/fixed/base.scss
+++ b/src/assets/style/fixed/base.scss
@@ -1,5 +1,4 @@
 // 优化显示
-
 html, body {
  margin: 0px;
  height: 100%;
--- a/src/assets/style/fixed/element.scss
+++ b/src/assets/style/fixed/element.scss
@@ -1,5 +1,4 @@
 // element 样式补丁
-
 .el-card {
  &.is-always-shadow {
    box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
--- a/src/assets/style/fixed/markdown.scss
+++ b/src/assets/style/fixed/markdown.scss
@@ -1,5 +1,4 @@
 // markdown 样式补丁
-
 .markdown-body {
  ul {
    list-style: disc;
--- a/src/assets/style/fixed/vue-grid-layout.scss
+++ b/src/assets/style/fixed/vue-grid-layout.scss
@@ -1,5 +1,4 @@
 // vue-splitpane 样式补丁
-
 .vue-grid-item {
  &.vue-grid-placeholder {
    border: 1px solid $color-border-1;
--- a/src/assets/style/fixed/vue-splitpane.scss
+++ b/src/assets/style/fixed/vue-splitpane.scss
@@ -1,7 +1,4 @@
 // vue-splitpane 样式补丁
-
-@import '~@/assets/style/unit/color.scss';
-
 .splitter-pane-resizer {
  background-color: $color-border-1 !important;
  opacity: 1 !important;
--- a/src/assets/style/theme/register.scss
+++ b/src/assets/style/theme/register.scss
@@ -1,4 +1,3 @@
-@import '~@/assets/style/public.scss';
@import '~@/assets/style/theme/theme-base.scss';

@import '~@/assets/style/theme/d2/index.scss';
--- a/src/components/d2-container/components/d2-source.vue
+++ b/src/components/d2-container/components/d2-source.vue
@@ -41,7 +41,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .d2-source {
  $borderRadius: 4px;
  $paddingLR: 15px;
--- a/src/components/d2-icon-select/index.vue
+++ b/src/components/d2-icon-select/index.vue
@@ -159,7 +159,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .group {
  max-height: 400px;
  overflow-x: hidden;
--- a/src/components/d2-markdown/index.vue
+++ b/src/components/d2-markdown/index.vue
@@ -83,7 +83,6 @@ export default {
 </script>

 <style lang="scss">
-@import '~@/assets/style/public.scss';
 .component-markdown {
  .spin-group {
    height: 100px;
--- a/src/components/d2-page-cover/index.vue
+++ b/src/components/d2-page-cover/index.vue
@@ -33,7 +33,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .d2-page-cover {
  @extend %full;
  @extend %unable-select;
--- a/src/layout/header-aside/components/header-error-log/components/list/index.vue
+++ b/src/layout/header-aside/components/header-error-log/components/list/index.vue
@@ -165,7 +165,6 @@ export default {
 </script>

 <style lang="scss">
-@import '~@/assets/style/public.scss';
 .d2-error-log-list__expand-group {
  .d2-error-log-list__expand {
    padding-left: 20px;
--- a/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
+++ b/src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
@@ -69,7 +69,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .theme-preview {
  height: 50px;
  width: 100px;
--- a/src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue
+++ b/src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue
@@ -35,7 +35,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .d2-panel-search-item {
  height: 64px;
  margin: 0px -20px;
--- a/src/layout/header-aside/components/panel-search/index.vue
+++ b/src/layout/header-aside/components/panel-search/index.vue
@@ -183,7 +183,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .panel-search {
  margin: 20px;
  .panel-search__input-group {
--- a/src/pages/demo/components/contextmenu/style/pub.scss
+++ b/src/pages/demo/components/contextmenu/style/pub.scss
@@ -1,4 +1,3 @@
-@import '~@/assets/style/public.scss';
 .contextmenu-pad {
  height: 300px;
  background-color: $color-bg;
--- a/src/pages/demo/components/countup/index.vue
+++ b/src/pages/demo/components/countup/index.vue
@@ -75,7 +75,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .group {
    display: flex;
--- a/src/pages/demo/components/icon/icon.vue
+++ b/src/pages/demo/components/icon/icon.vue
@@ -9,7 +9,6 @@
 </template>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .icon-demo {
  transition: all .3s;
  font-size: 100px;
--- a/src/pages/demo/components/icon/select.vue
+++ b/src/pages/demo/components/icon/select.vue
@@ -38,7 +38,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .title-group {
  margin-top: 20px;
  margin-bottom: 10px;
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -13,7 +13,6 @@
 </template>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .icon-card {
  display: flex;
  justify-content: center;
--- a/src/pages/demo/components/layout/grid.vue
+++ b/src/pages/demo/components/layout/grid.vue
@@ -98,7 +98,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .vue-grid-layout {
    background-color: $color-bg;
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -92,7 +92,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/unit/color.scss';
 .color {
  border-radius: 4px;
  height: 90px;
--- a/src/pages/demo/playground/log/console/index.vue
+++ b/src/pages/demo/playground/log/console/index.vue
@@ -57,7 +57,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .page__image-demo {
    border-radius: 4px;
--- a/src/pages/demo/playground/store/gray/index.vue
+++ b/src/pages/demo/playground/store/gray/index.vue
@@ -67,7 +67,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .colorful {
    @extend %unable-select;
--- a/src/pages/demo/playground/store/theme/index.vue
+++ b/src/pages/demo/playground/store/theme/index.vue
@@ -59,7 +59,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .theme-preview {
    height: 50px;
--- a/src/pages/demo/plugins/better-scroll/base.vue
+++ b/src/pages/demo/plugins/better-scroll/base.vue
@@ -43,7 +43,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .demo-bs-wrapper {
  height: 200px;
  width: 300px;
--- a/src/pages/demo/plugins/better-scroll/to.vue
+++ b/src/pages/demo/plugins/better-scroll/to.vue
@@ -87,7 +87,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .demo-bs-wrapper {
  height: 400px;
  position: relative;
--- a/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
+++ b/src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
@@ -45,7 +45,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .col {
  padding: 20px;
  border-radius: 4px;
--- a/src/pages/error-page-404/page.vue
+++ b/src/pages/error-page-404/page.vue
@@ -8,7 +8,6 @@
 </template>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  background: #303133;
  background-blend-mode: multiply,multiply;
--- a/src/pages/index/page.vue
+++ b/src/pages/index/page.vue
@@ -59,7 +59,6 @@ export default {
 </script>

 <style lang="scss" scoped>
-@import '~@/assets/style/public.scss';
 .page {
  .page__logo {
    width: 120px;
--- a/src/pages/login/style.scss
+++ b/src/pages/login/style.scss
@@ -1,4 +1,3 @@
-@import '~@/assets/style/public.scss';
 .login-page {
  background-color: #EDF4FA;
  height: 100%;
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,6 +10,14 @@ module.exports = {
  devServer: {
    publicPath: baseUrl // 和 baseUrl 保持一致
  },
+  css: {
+    loaderOptions: {
+      // 设置 scss 公用变量文件
+      sass: {
+        data: `@import '~@/assets/style/public.scss';`
+      }
+    }
+  },
  // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js
  chainWebpack: config => {
    // 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559