Merge pull request #281150 in DEC/fineui from feature/x to bugfix/11.0

* commit '1c7689361d6f67d8a9664f4291cc1bb7dde69d2f':
  BI-147036 feat: 更新图标
  BI-143733 fix: 深色预览样式调整
  REPORT-122294 lodash 低版本安全漏洞

packages/fineui/bi.lessconfig.json

@@ -23,8 +23,8 @@
   "@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
   "@color-bi-background-active-radio-content": "#2C60DB",
   "@color-bi-border-checkbox-theme-dark": "rgba(255, 255, 255, 0.37)",
-  "@color-bi-border-hover-active-radio-theme-dark": "#3869DC",
-  "@color-bi-background-active-radio-content-theme-dark": "#3869DC",
+  "@color-bi-border-hover-active-radio-theme-dark": "#497FFD",
+  "@color-bi-background-active-radio-content-theme-dark": "#497FFD",
   "@color-bi-background-disabled-active-radio-content": "#FFFFFF",
   "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
   "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
@@ -48,5 +48,17 @@
   "@font-solid-bottom": "e905",
   "@font-solid-right": "e906",
   "@font-dot": "e762",
-  "@font-down-triangle": "e70b"
+  "@font-down-triangle": "e70b",
+  "@color-bi-background-theme-dark": "#1B1F31",
+  "@border-color-light-line-theme-dark": "#30364B",
+  "@color-bi-background-header-background": "#F8F9FC",
+  "@color-bi-background-header-background-theme-dark": "#1B1F31",
+  "@color-bi-background-common-light-button": "#E5EFFF",
+  "@color-bi-background-common-light-button-theme-dark": "#0F2A62",
+  "@color-bi-text-highlight-theme-dark": "#497FFD",
+  "@color-bi-border-active-chooser-show-button-theme-dark": "#497FFD",
+  "@color-bi-background-button-theme-dark": "#497FFD",
+  "@color-bi-background-active-switch-theme-dark": "#497FFD",
+  "@color-bi-text-common-light-button-theme-dark": "#497FFD",
+  "@color-bi-text-common-light-button": "#2c60db"
 }

packages/fineui/dist/font/iconfont.svg

@@ -14,6 +14,26 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="geshishua" unicode="&#60143;" d="M168 480h504V712H168v-232zM96 776a8 8 0 0 0 8 8h632a8 8 0 0 0 8-8v-128h140c24.3 0 44-19.7 44-44v-281.704a44 44 0 0 0-33.656-42.768L498 183.668V-42a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8v247.704a44 44 0 0 0 33.656 42.768L856 344.332V576h-112v-160a8 8 0 0 0-8-8H104a8 8 0 0 0-8 8V776z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-61-guolvzujianleixingnianzhoushu" unicode="&#60142;" d="M506.248 361.89599999999996a8 8 0 0 0 11.504 0.004l148.212-153.36c4.996-5.168 13.744-1.64 13.752 5.552l0.276 273.916a8 8 0 0 0 8 7.992h56a8 8 0 0 0 8-8.008l-0.352-407.924a8 8 0 0 0-8-7.996h-60.448c-2.264 0-4.424 0.96-5.94 2.644l-159.32 176.584a8 8 0 0 1-11.872 0.008l-159.72-176.672c-1.52-1.68-3.672-2.636-5.932-2.636H280.36a8 8 0 0 0-8 7.992l-0.352 407.928a8 8 0 0 0 8 8.008h56a8 8 0 0 0 8-7.992l0.276-273.912c0.008-7.192 8.76-10.72 13.752-5.552l148.212 153.424zM376 808a8 8 0 0 0 8-8v-88h256V800a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-88h176a16 16 0 0 0 16-16v-720a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V696a16 16 0 0 0 16 16h176V800a8 8 0 0 0 8 8h64z m472-264H176v-520h672V544z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shangjiantou" unicode="&#60140;" d="M517.632 778.386286a8.045714 8.045714 0 0 1-11.264 0L173.714286 446.610286a8.045714 8.045714 0 0 1 0-11.337143l35.328-35.254857a8.045714 8.045714 0 0 1 11.337143 0L474.697143 653.750857v-661.723428c0-4.388571 3.657143-8.045714 8.045714-8.045715h58.294857a8.045714 8.045714 0 0 1 8.045715 8.045715V653.824l254.537142-253.805714a8.045714 8.045714 0 0 1 11.264 0l35.401143 35.254857a8.045714 8.045714 0 0 1 0 11.337143L517.632 778.386286z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="xiajiantou" unicode="&#60141;" d="M517.632-10.386286a8.045714 8.045714 0 0 0-11.264 0L173.714286 321.389714a8.045714 8.045714 0 0 0 0 11.337143l35.328 35.254857a8.045714 8.045714 0 0 0 11.337143 0l254.390857-253.732571V776.045714c0 4.388571 3.657143 8.045714 8.045714 8.045715h58.294857c4.388571 0 8.045714-3.657143 8.045714-8.045715v-661.796571l254.537143 253.805714a8.045714 8.045714 0 0 0 11.264 0l35.401143-35.254857a8.045714 8.045714 0 0 0 0-11.337143l-332.726857-331.776z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tianjiawenjianjia" unicode="&#60139;" d="M452.708 752.104A24 24 0 0 1 434.912 760H136a24 24 0 0 1-24-24v-704a24 24 0 0 1 24-24h752a24 24 0 0 1 24 24V624a24 24 0 0 1-24 24h-326.612l-108.68 104.104zM184.564 688h236.58l116.412-108H840V80H184L184.56 688zM476 496a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-140h148a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-148v-140a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8v140H328a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h148v140z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shijianfenzu" unicode="&#60138;" d="M936-48a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-304a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h304zM936 132a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-304a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h304zM525.736 384.008h177.14a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-241.14a8 8 0 0 0-8 8V576a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-191.992zM510.3 800c-229.752 0-416-186.248-416-416 0-229.748 186.248-416 416-416 5.928 0 11.832 0.124 17.7 0.372v80.088a337.296 337.296 0 0 0-17.7-0.46c-185.568 0-336 150.432-336 336s150.432 336 336 336 336-150.432 336-336a337.28 337.28 0 0 0-7.732-72h81.524a418.696 418.696 0 0 1 6.208 72c0 229.752-186.252 416-416 416z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="dandianshijianfanwei" unicode="&#60137;" d="M525.736 384.008h177.14a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-241.14a8 8 0 0 0-8 8V576a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-191.992zM508 800c229.752 0 416-186.248 416-416 0-212.916-159.96-388.476-366.26-413.056v80.712C719.72 75.69200000000001 844 215.332 844 384c0 185.568-150.432 336-336 336-170.652 0-311.592-127.224-333.144-292h-80.56C116.28 637.068 293.116 800 508 800zM96 338.668c3.928-36.4 12.644-71.864 25.688-105.528l74.6 28.9a335.56 335.56 0 0 0-20.748 85.208L96 338.668zM173.736 137.812a415.5 415.5 0 0 1 74.88-78.664l50.228 62.268a335.58 335.58 0 0 0-60.464 63.528l-64.644-47.132zM341.372 2.6760000000000446a419.828 419.828 0 0 1 51.14-18.684 419.86 419.86 0 0 1 53.124-11.936l12.424 79.032a339.584 339.584 0 0 0-43.008 9.664 339.976 339.976 0 0 0-41.4 15.12l-32.28-73.196z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="wenda-quanbushouqi" unicode="&#60136;" d="M112 726.612C112 731.8 115.58 736 120 736h64c4.42 0 8-4.2 8-9.388v-685.224c0-5.184-3.58-9.388-8-9.388H120c-4.42 0-8 4.204-8 9.388V726.612zM568.196 659.972c11.204 9.548 27.804 1.048 27.804-14.236V432h372c4.42 0 8-3.94 8-8.8v-78.4c0-4.86-3.58-8.8-8-8.8h-372v-213.736c0-15.284-16.6-23.784-27.804-14.236l-305.772 261.736c-8.564 7.3-8.564 21.172 0 28.472l305.772 261.736z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tuijiantishi" unicode="&#60135;" d="M430.496 212.94l-39.112 16.512c-34.892 14.728-66.92 35.94-94.748 63.264C239.28 349.048 208 423.388 208 502.596s31.28 153.548 88.64 209.88C354.032 768.848 430.28 800 512 800c81.708 0 157.944-31.144 215.34-87.5C784.752 656.012 816 581.768 816 502.596c0-79.192-31.264-153.516-88.6-209.844-27.924-27.312-59.988-48.616-94.784-63.3l-39.112-16.512V96h-163.008v116.94z m341.712 545.2C702.728 826.372 610.336 864 512 864c-98.336 0-190.728-37.628-260.208-105.86C182.312 689.908 144 599.172 144 502.596c0-96.572 38.316-187.308 107.792-255.54 33.588-32.984 72.388-58.708 114.704-76.568V32h291.008v138.488c42.316 17.86 81.116 43.7 114.704 76.568C841.684 315.288 880 406.024 880 502.596c0 96.576-38.316 187.192-107.792 255.544zM372 0h276v-64H372zM547.284 522.132l-0.204 144.696c-0.008 4.92-6.196 7.048-9.2 3.168l-160.788-207.784c-2.628-3.396-0.22-8.344 4.056-8.344h95.568l0.204-144.696c0.008-4.916 6.196-7.048 9.2-3.168l160.788 207.784c2.628 3.4 0.22 8.344-4.06 8.344h-95.564z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="piliangdaochu" unicode="&#60134;" d="M256 328a16 16 0 0 0 16 16h229.424l-94.108 94.108a16 16 0 0 0 0 22.628l28.284 28.284a16 16 0 0 0 22.628 0l169.708-169.708a16 16 0 0 0 0-22.624l-169.708-169.708a16 16 0 0 0-22.628 0l-28.284 28.284a16 16 0 0 0 0 22.628L501.424 272H272a16 16 0 0 0-16 16v40zM768 0a16 16 0 0 0-16-16H136a16 16 0 0 0-16 16V616a16 16 0 0 0 16 16h120V768a16 16 0 0 0 16 16h616a16 16 0 0 0 16-16v-616a16 16 0 0 0-16-16h-120v-136z m0 208h64V712H328v-80h424a16 16 0 0 0 16-16v-408z m-72-152V560H192v-504h504z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="peizhizhuangtai" unicode="&#60133;" d="M512 832C264.576 832 64 631.424 64 384s200.576-448 448-448 448 200.576 448 448S759.424 832 512 832z m-68-192a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-247.46l176.056-123.276a16 16 0 0 0 3.928-22.284l-36.708-52.428a16 16 0 0 0-22.284-3.928l-210.056 147.084a15.976 15.976 0 0 0-6.796 12.16A16.268 16.268 0 0 0 444 352V640z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="a-leixingziduanquanxian" unicode="&#60132;" d="M960 384c0-247.424-200.576-448-448-448S64 136.57600000000002 64 384 264.576 832 512 832s448-200.576 448-448zM256 588a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h172v-392a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V516h172a8 8 0 0 1 8 8V580a8 8 0 0 1-8 8H256z m336-192v-56a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8z m0-152v-56a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8z"  horiz-adv-x="1024" />

packages/fineui/src/less/base/colorchooser/colorpicker/button.colorshow.less

@@ -5,3 +5,11 @@
     border-color: @color-bi-border-active-chooser-show-button;
   }
 }
+
+.bi-theme-dark {
+  .bi-color-chooser-show-button {
+    &.active, &:active {
+      border-color: @color-bi-border-active-chooser-show-button-theme-dark;
+    }
+  }
+}

packages/fineui/src/less/base/single/button/button.less

@@ -578,6 +578,8 @@ body .bi-button, #body .bi-button {
 
 .bi-theme-dark, #body .bi-theme-dark {
   .bi-button {
+    background-color: @color-bi-background-button-theme-dark;
+
     &.button-ignore {
       background-color: @color-bi-background-ignore-button-theme-dark;
 
@@ -643,5 +645,15 @@ body .bi-button, #body .bi-button {
         }
       }
     }
+
+    &.button-common {
+      &.light {
+        background-color: @color-bi-background-common-light-button-theme-dark;
+
+        &, & .b-font:before {
+          color: @color-bi-text-common-light-button-theme-dark;
+        }
+      }
+    }
   }
 }

packages/fineui/src/less/base/single/button/switch.less

@@ -25,7 +25,7 @@
   .bi-switch {
     background-color: @color-bi-background-switch-theme-dark;
     &.active {
-      background-color: @color-bi-background-active-switch;
+      background-color: @color-bi-background-active-switch-theme-dark;
     }
   }
 }

packages/fineui/src/less/core/utils/common.less

@@ -104,6 +104,10 @@
 
 .bi-theme-dark {
   .bi-focus-shadow {
+    &:focus, &:hover {
+      border-color: @color-bi-border-highlight-theme-dark;
+    }
+
     &.disabled {
       &:hover {
         border-color: @border-color-line-theme-dark;
@@ -142,7 +146,7 @@
 
 .bi-theme-dark {
   .bi-background {
-    background-color: @color-bi-background-normal-theme-dark;
+    background-color: @color-bi-background-theme-dark;
     color: @color-bi-text-background-theme-dark;
 
     & .bi-input {

packages/fineui/src/less/core/utils/list-item.less

@@ -161,12 +161,12 @@
       }
     }
     &.active, &:active {
-      color: @color-bi-text-highlight;
+      color: @color-bi-text-highlight-theme-dark;
       & .bi-input {
-        color: @color-bi-text-highlight;
+        color: @color-bi-text-highlight-theme-dark;
       }
       & .bi-textarea {
-        color: @color-bi-text-highlight;
+        color: @color-bi-text-highlight-theme-dark;
       }
     }
     &.disabled {

packages/fineui/src/less/lib/colors.less

@@ -38,6 +38,7 @@
 
 //基本提亮颜色
 @color-bi-text-highlight: @font-color-highlight;
+@color-bi-text-highlight-theme-dark: @font-color-highlight;
 //标红色
 @color-bi-text-redmark: @font-color-warning;
 
@@ -50,6 +51,7 @@
 @color-bi-background-normal: @background-color-normal;
 //深色主题普通背景
 @color-bi-background-normal-theme-dark: @background-color-normal-theme-dark;
+@color-bi-background-theme-dark: @background-color-normal-theme-dark;
 //默认背景
 @color-bi-background-default: @background-color-default;
 //深色主题默认背景
@@ -132,5 +134,6 @@
 @color-bi-border-warning: @border-color-warning;
 //边框提亮
 @color-bi-border-highlight: @border-color-highlight;
+@color-bi-border-highlight-theme-dark: @border-color-highlight;
 
 @color-bi-alert-warning: @color-bi-orange;

packages/fineui/src/less/lib/theme.less

@@ -62,6 +62,7 @@
 // 按钮
 @color-bi-border-button: @color-bi-border-highlight;
 @color-bi-background-button: @color-bi-background-highlight;
+@color-bi-background-button-theme-dark: @color-bi-background-highlight;
 @color-bi-text-common-button: @color-bi-text;
 @color-bi-text-common-clear-button: @color-bi-text-highlight;
 @color-bi-text-common-plain-button: @color-bi-text-highlight;
@@ -75,7 +76,9 @@
 @color-bi-background-hover-common-ghost-button-theme-dark: @color-bi-background-default;
 
 @color-bi-text-common-light-button: @color-bi-text-highlight;
+@color-bi-text-common-light-button-theme-dark: @color-bi-text-highlight;
 @color-bi-background-common-light-button: @color-bi-background-light-blue;
+@color-bi-background-common-light-button-theme-dark: @color-bi-background-light-blue;
 @color-bi-background-hover-common-light-button: @color-bi-background-light-blue;
 @color-bi-background-active-common-light-button: @color-bi-background-light-blue;
 @color-bi-background-hover-plain-button: @color-black-5;
@@ -202,6 +205,7 @@
 @color-bi-border-picker-button-mask: @color-bi-border-black;
 @color-bi-border-picker-button-mask-theme-dark: @color-bi-border-default;
 @color-bi-border-active-chooser-show-button: @color-bi-border-highlight;
+@color-bi-border-active-chooser-show-button-theme-dark: @color-bi-border-highlight;
 @color-bi-background-disabled-chooser-popup-mask: @color-bi-background-default;
 // combo
 @color-bi-border-hover-combo: @color-bi-border-highlight;