n20-common-lib 3.0.36 → 3.0.38

package/nstc-g6/components/Form/CheckboxCustom/index.vue

@@ -72,7 +72,7 @@ export default {
 </script>
 
 <style scoped>
-.checkbox-group /deep/ .el-checkbox {
+.checkbox-group ::v-deep .el-checkbox {
   margin-right: 40px;
 }
 </style>

package/nstc-g6/components/NstcConfirm/NstcConfirm.vue

@@ -116,22 +116,22 @@ export default {
 }
 </style>
 <style scoped>
-.confirmTip /deep/ .el-dialog {
+.confirmTip ::v-deep .el-dialog {
   margin-top: 36vh !important;
 }
-.confirmTip /deep/.el-dialog__header {
+.confirmTip ::v-deep .el-dialog__header {
   /* display: none; */
   border-bottom: none !important;
 }
-.confirmTip /deep/.el-dialog__body {
+.confirmTip ::v-deep .el-dialog__body {
   padding: 24px;
   padding-bottom: 0px;
   padding: 0 20px !important;
 }
-.confirmTip /deep/.el-dialog__footer {
+.confirmTip ::v-deep .el-dialog__footer {
   padding: 16px;
 }
-.confirmTip /deep/.el-dialog__headerbtn {
+.confirmTip ::v-deep .el-dialog__headerbtn {
   display: none;
 }
 </style>

package/nstc-g6/components/NstcFileUpload/NstcFileUpload.vue

@@ -923,7 +923,7 @@ export default {
 }
 </style>
 <style scoped>
-.nstc-file-upload /deep/ .cell {
+.nstc-file-upload ::v-deep .cell {
   padding: 0 8px 0 16px !important;
 }
 

package/nstc-g6/components/NstcForm/CheckboxCustom/index.vue

@@ -72,7 +72,7 @@ export default {
 </script>
 
 <style scoped>
-.checkbox-group /deep/ .el-checkbox {
+.checkbox-group ::v-deep .el-checkbox {
   margin-right: 40px;
 }
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.36",
+  "version": "3.0.38",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -101,10 +101,10 @@
     "jszip": "^3.10.0",
     "md2vue-loader": "file:./md2vue-loader",
     "mockjs": "^1.1.0",
-    "node-sass": "6.0.0",
+    "sass": "^1.77.0",
     "nstc-get-i18n": "^0.0.4",
     "qiankun": "^2.5.1",
-    "sass-loader": "^10.2.0",
+    "sass-loader": "^10.5.2",
     "screenfull": "^5.1.0",
     "showdown": "^2.1.0",
     "sortablejs": "^1.15.0",

package/src/assets/css/_coreLib.scss

@@ -45,6 +45,9 @@
 @import './plain-text.scss';
 @import './date-quarter.scss';
 @import './work-card.scss';
+@import './tabs.scss';
+@import './page-header.scss';
+@import './page.scss';
+
 /* 临时引入 */
 @import '../../components/ChildRange/style.scss';
-@import '../../components/PageHeader/style.scss';

package/src/assets/css/button.scss

@@ -17,20 +17,19 @@ $--button-margin-left: 6px;
   min-width: 72px;
 }
 
-.el-button+.el-button {
+.el-button + .el-button {
   margin-left: $--button-margin-left;
 }
 
-.el-button+.el-dropdown {
+.el-button + .el-dropdown {
   margin-left: $--button-margin-left;
 }
 
-.el-button--mini+.el-button--mini {
+.el-button--mini + .el-button--mini {
   margin-left: $--button-margin-left;
 }
 
 .el-button[onlyicon] {
-
   &.el-button--default,
   &.el-button--medium,
   &.el-button--small {
@@ -41,9 +40,11 @@ $--button-margin-left: 6px;
     padding: 5px;
   }
 }
-
+.el-button--mini {
+  padding: 5px 12px;
+  font-size: 13px;
+}
 .el-button--info {
-
   &,
   &:focus {
     background-color: $--color-info;
@@ -57,7 +58,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--primary {
-
   &,
   &:focus {
     background-color: $--color-primary;
@@ -71,7 +71,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--success {
-
   &,
   &:focus {
     background-color: $--color-success;
@@ -85,7 +84,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--warning {
-
   &,
   &:focus {
     background-color: $--color-warning;
@@ -99,7 +97,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--danger {
-
   &,
   &:focus {
     background-color: $--color-danger;
@@ -113,7 +110,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button.is-plain {
-
   &,
   &:focus {
     color: $--color-text-primary;
@@ -129,7 +125,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--warning.is-plain {
-
   &,
   &:focus {
     color: $--color-warning;
@@ -145,7 +140,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--danger.is-plain {
-
   &,
   &:focus {
     color: $--color-danger;
@@ -161,7 +155,6 @@ $--button-margin-left: 6px;
 }
 
 .el-button--text {
-
   &,
   &:focus {
     color: $--color-primary;
@@ -175,7 +168,6 @@ $--button-margin-left: 6px;
 
 .el-button--default.is-plain {
   &.is-disabled {
-
     &,
     &:hover,
     &:focus,
@@ -189,7 +181,6 @@ $--button-margin-left: 6px;
 
 .el-button--danger.is-plain {
   &.is-disabled {
-
     &,
     &:hover,
     &:focus,
@@ -204,7 +195,6 @@ $--button-margin-left: 6px;
 
 .el-button.el-button--text {
   &.is-disabled {
-
     &,
     &:hover,
     &:focus,
@@ -228,7 +218,6 @@ $--button-margin-left: 6px;
   }
 
   &.is-disabled {
-
     &,
     &:hover,
     &:focus,
@@ -252,4 +241,4 @@ $--button-margin-left: 6px;
     background: $--color-white;
     border-color: $--color-primary;
   }
-}
+}

package/src/assets/css/element-variables.scss

@@ -20,7 +20,7 @@ $--color-primary: #007aff !default;
 /// color|1|Background Color|4
 $--color-white: #ffffff !default;
 /// color|1|Background Color|4
-$--color-black: #000000 !default;
+$--color-black: #1d2129 !default;
 $--color-primary-light-1: mix($--color-white, $--color-primary, 10%) !default;
 /* #1a87ff */
 $--color-primary-light-2: mix($--color-white, $--color-primary, 20%) !default;
@@ -40,13 +40,13 @@ $--color-primary-light-8: mix($--color-white, $--color-primary, 80%) !default;
 $--color-primary-light-9: mix($--color-white, $--color-primary, 90%) !default;
 /* #e6f2ff */
 /// color|1|Functional Color|1
-$--color-success: #48d2a0;
+$--color-success: #2db185;
 /// color|1|Functional Color|1
 $--color-warning: #ff9933;
 /// color|1|Functional Color|1
 $--color-danger: #ff3b30;
 /// color|1|Functional Color|1
-$--color-info: #666666;
+$--color-info: #86909c;
 
 $--color-success-light: mix($--color-white, $--color-success, 80%) !default;
 $--color-warning-light: mix($--color-white, $--color-warning, 80%) !default;
@@ -65,25 +65,25 @@ $--color-danger-hover: mix($--color-black, $--color-danger, 10%) !default;
 $--color-info-hover: mix($--color-black, $--color-info, 10%) !default;
 
 /// color|1|Font Color|2
-$--color-text-primary: #333333;
+$--color-text-primary: #1d2129;
 /// color|1|Font Color|2
-$--color-text-regular: #666666;
+$--color-text-regular: #4e5969;
 /// color|1|Font Color|2
-$--color-text-secondary: #999999;
+$--color-text-secondary: #86909c;
 /// color|1|Font Color|2
-$--color-text-placeholder: #cccccc;
+$--color-text-placeholder: #c9cdd4;
 /// color|1|Border Color|3
-$--border-color-base: #dcdfe6 !default;
+$--border-color-base: #e5e6eb !default;
 /// color|1|Border Color|3
 $--border-color-light: #e4e7ed !default;
 /// color|1|Border Color|3
-$--border-color-lighter: #ebeef5 !default;
+$--border-color-lighter: #f2f3f5 !default;
 /// color|1|Border Color|3
 $--border-color-extra-light: #f2f6fc !default;
 
 // Background
 /// color|1|Background Color|4
-$--background-color-base: #f5f5f5 !default;
+$--background-color-base: #f2f3f5 !default;
 
 /* Link
 -------------------------- */
@@ -142,7 +142,7 @@ $--font-weight-secondary: 100 !default;
 $--font-line-height-primary: 1.5;
 /// fontLineHeight|1|Line Height|2
 $--font-line-height-secondary: 1.5;
-$--font-color-disabled-base: #bbb !default;
+$--font-color-disabled-base: #c9cdd4 !default;
 /* Size
 -------------------------- */
 $--size-base: 14px !default;
@@ -161,7 +161,7 @@ $--disabled-border-base: $--border-color-light !default;
 
 /* Icon
 -------------------------- */
-$--icon-color: #666 !default;
+$--icon-color: #4e5969 !default;
 $--icon-color-base: $--color-info !default;
 
 /* Checkbox
@@ -190,7 +190,7 @@ $--checkbox-disabled-checked-input-border-color: $--border-color-base !default;
 $--checkbox-disabled-checked-icon-color: $--color-text-placeholder !default;
 
 /// color||Color|0
-$--checkbox-checked-font-color: #666666;
+$--checkbox-checked-font-color: #e5e6eb;
 $--checkbox-checked-input-border-color: $--color-primary !default;
 /// color||Color|0
 $--checkbox-checked-background-color: $--color-primary !default;
@@ -1024,23 +1024,49 @@ $--lg: 1200px !default;
 $--xl: 1920px !default;
 
 $--breakpoints: (
-  'xs': (max-width: $--sm - 1),
-  'sm': (min-width: $--sm ),
-  'md': (min-width: $--md ),
-  'lg': (min-width: $--lg ),
-  'xl': (min-width: $--xl )
+  'xs': (
+    max-width: $--sm - 1
+  ),
+  'sm': (
+    min-width: $--sm
+  ),
+  'md': (
+    min-width: $--md
+  ),
+  'lg': (
+    min-width: $--lg
+  ),
+  'xl': (
+    min-width: $--xl
+  )
 );
 
 $--breakpoints-spec: (
-  'xs-only': (max-width: $--sm - 1),
-  'sm-and-up': (min-width: $--sm ),
+  'xs-only': (
+    max-width: $--sm - 1
+  ),
+  'sm-and-up': (
+    min-width: $--sm
+  ),
   'sm-only': '(min-width: #{$--sm}) and (max-width: #{$--md - 1})',
-  'sm-and-down': (max-width: $--md - 1),
-  'md-and-up': (min-width: $--md ),
+  'sm-and-down': (
+    max-width: $--md - 1
+  ),
+  'md-and-up': (
+    min-width: $--md
+  ),
   'md-only': '(min-width: #{$--md}) and (max-width: #{$--lg - 1})',
-  'md-and-down': (max-width: $--lg - 1),
-  'lg-and-up': (min-width: $--lg ),
+  'md-and-down': (
+    max-width: $--lg - 1
+  ),
+  'lg-and-up': (
+    min-width: $--lg
+  ),
   'lg-only': '(min-width: #{$--lg}) and (max-width: #{$--xl - 1})',
-  'lg-and-down': (max-width: $--xl - 1),
-  'xl-only': (min-width: $--xl )
-);
+  'lg-and-down': (
+    max-width: $--xl - 1
+  ),
+  'xl-only': (
+    min-width: $--xl
+  )
+);