Merge branch 'hotfix/scss_loader_option'

Former-commit-id: 12f95d6d6606d18cd9fccaf0455f977126371423 [formerly 12f95d6d6606d18cd9fccaf0455f977126371423 [formerly 12f95d6d6606d18cd9fccaf0455f977126371423 [formerly 12f95d6d6606d18cd9fccaf0455f977126371423 [formerly fa274f4 [formerly 23f68af3a61a9451058402c274ab9d4a9d206d70]]]]]
Former-commit-id: 9ffd654
Former-commit-id: f5019fe
Former-commit-id: 3a2d3f9537e17943695ec99b2fbef6418fc6eac5 [formerly 050703e14e9e6e756a39f206ccb7792e8e35eaf8]
Former-commit-id: af2452988d609a43d88363071d59279d6c7175ff
Former-commit-id: 6bed60aa914cdd772ebe8bd669c6ab98a600f0f1
Former-commit-id: c1b5cac662562704f874e2297d9dc45511f8fba1
Former-commit-id: 0ab03de8670dbf0e556ce74c1d2e735f293f58c3
Former-commit-id: e89214479b68ff59c617a903ec90541a0da8d617

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",

src/assets/style/fixed/base.scss

@@ -1,5 +1,4 @@
 // 优化显示
-
 html, body {
   margin: 0px;
   height: 100%;

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);

src/assets/style/fixed/markdown.scss

@@ -1,5 +1,4 @@
 // markdown 样式补丁
-
 .markdown-body {
   ul {
     list-style: disc;

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;

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;

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';

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;

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;

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;

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;

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

src/pages/login/style.scss

@@ -1,4 +1,3 @@
-@import '~@/assets/style/public.scss';
 .login-page {
   background-color: #EDF4FA;
   height: 100%;

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