n20-common-lib 3.3.26 → 3.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.3.26",
+  "version": "3.3.28",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -42,13 +42,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: #2db185;
+$--color-success: #2db185 !default;
 /// color|1|Functional Color|1
-$--color-warning: #ff9933;
+$--color-warning: #ff9933 !default;
 /// color|1|Functional Color|1
-$--color-danger: #ff3b30;
+$--color-danger: #ff3b30 !default;
 /// color|1|Functional Color|1
-$--color-info: #86909c;
+$--color-info: #86909c !default;
 
 $--color-success-light: mix($--color-white, $--color-success, 80%) !default;
 $--color-warning-light: mix($--color-white, $--color-warning, 80%) !default;
@@ -67,13 +67,13 @@ $--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: #1d2129;
+$--color-text-primary: #1d2129 !default;
 /// color|1|Font Color|2
-$--color-text-regular: #4e5969;
+$--color-text-regular: #4e5969 !default;
 /// color|1|Font Color|2
-$--color-text-secondary: #86909c;
+$--color-text-secondary: #86909c !default;
 /// color|1|Font Color|2
-$--color-text-placeholder: #c9cdd4;
+$--color-text-placeholder: #c9cdd4 !default;
 /// color|1|Border Color|3
 $--border-color-base: #e5e6eb !default;
 /// color|1|Border Color|3
@@ -193,7 +193,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: #1d2129;
+$--checkbox-checked-font-color: #1d2129 !default;
 $--checkbox-checked-input-border-color: $--color-primary !default;
 /// color||Color|0
 $--checkbox-checked-background-color: $--color-primary !default;
@@ -568,14 +568,14 @@ $--button-default-font-color: #333333;
 /// color||Color|0
 $--button-default-background-color: #ffffff;
 /// color||Color|0
-$--button-default-border-color: #dddddd;
+$--button-default-border-color: #dddddd !default;
 
 /// color||Color|0
 $--button-disabled-font-color: #cccccc;
 /// color||Color|0
 $--button-disabled-background-color: #eeeeee;
 /// color||Color|0
-$--button-disabled-border-color: #dddddd;
+$--button-disabled-border-color: #dddddd !default;
 
 /// color||Color|0
 $--button-primary-border-color: $--color-primary !default;
@@ -596,11 +596,11 @@ $--button-warning-font-color: $--color-white !default;
 /// color||Color|0
 $--button-warning-background-color: $--color-warning !default;
 /// color||Color|0
-$--button-danger-border-color: #ff3b30;
+$--button-danger-border-color: #ff3b30 !default;
 /// color||Color|0
 $--button-danger-font-color: $--color-white !default;
 /// color||Color|0
-$--button-danger-background-color: #ff3b30;
+$--button-danger-background-color: #ff3b30 !default;
 /// color||Color|0
 $--button-info-border-color: $--color-info !default;
 /// color||Color|0

package/src/components/DatePicker/por.vue

@@ -73,8 +73,9 @@ let shortcuts_1 = [
     text: $lc('最近一周'),
     onClick(picker) {
       const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const start = new Date(end.getTime())
+      // 最近一周包含今天，按自然日回退 6 天，避免首尾合计 8 天。
+      start.setDate(start.getDate() - 6)
       picker.$emit('pick', [start, end])
     }
   },

package/src/utils/theme.config.js

@@ -1,5 +1,33 @@
 const themeList = [
   { label: '科技蓝', value: 'blue', color: '#007aff', aD: `$--color-primary: #007aff;` },
+  {
+    label: '商飞蓝',
+    value: 'comacBlue',
+    color: '#1B7AFF',
+    // 复用组件库已有的颜色参数，仅覆盖商飞蓝所需的主色、文字色、辅助色和边框色。
+    aD: `
+      $--color-primary: #1B7AFF;
+      $--color-black: #000000;
+      $--color-text-primary: #000000;
+      $--color-text-regular: #333333;
+      $--color-text-secondary: #666666;
+      $--color-text-placeholder: #999999;
+      $--color-success: #47C908;
+      $--color-warning: #FF9705;
+      $--color-danger: #F33B50;
+      $--color-info: #3375DC;
+      $--border-color-base: #CCCCCC;
+      $--border-color-light: rgba(0, 0, 0, 0.08);
+      $--border-color-lighter: rgba(0, 0, 0, 0.08);
+      $--border-color-extra-light: rgba(0, 0, 0, 0.08);
+      $--button-default-border-color: #CCCCCC;
+      $--button-disabled-border-color: #CCCCCC;
+      $--font-color-disabled-base: #CCCCCC;
+      $--checkbox-checked-font-color: $--color-text-primary;
+      $--button-danger-border-color: $--color-danger;
+      $--button-danger-background-color: $--color-danger;
+    `
+  },
   { label: '中国红', value: 'red', color: '#f5222d', aD: `$--color-primary: #f5222d;` },
   { label: '阳光橘', value: 'orange', color: '#fa541c', aD: `$--color-primary: #fa541c;` },
   { label: '金融金', value: 'yellow', color: '#fadb14', aD: `$--color-primary: #fadb14;` },