Merge pull request #271518 in DEC/fineui from release/11.0 to final/11.0

* commit '5ba3d21384456e042a44609368257c98fb404b06': REPORT-114436 fix: 同步Dep回收优化到release Revert "BI-145126 fix: DownListCombo的isDefaultInit默认值设置为false" BI-145829 fix: DownListCombo,getValue方法在popupView未创建时,取options.value BI-145126 fix: DownListCombo的isDefaultInit默认值设置为false 无JIRA任务 scrollbar-width、scrollbar-color只在Firefox下生效 REPORT-114436 fix: 编译报错修复 BI-145169 fix: 【V6发散】数据集编辑界面，表头下拉，内容显示全了但是还是出现滚动条，导致删除按钮等看不见 BI-143833 fix: 全选时数据变化，点击确定组件不会刷新 BI-143833 fix: 全选时数据变化，点击确定组件不会刷新 REPORT-114436 fix: tab设置single时内存泄露问题 BI-144837 feat: 更新图标 BI-139784 fix: 【来源内测BUG】数据编辑过滤 BI-144444 fix: 【v5】过滤组件向下展示不下，向上弹出的时候会挡住仪表板的tab栏，体验不好，看下能不能优化 JSY-38096 fix: TreeValueChooserPane的搜索中item支持显示图标 JSY-38096 fix: TreeValueChooserPane中item支持显示图标 BI-144276 fix: 【来源POC项目】增量更新开始时间无JIRA任务，增加返回所选tab id列表无JIRA bubble中提供拓展popper的额外modifier 无jira任务 fix: 更新图标 REPORT-101548 fix: 复选下拉树this指向问题
8 months ago · 5a7d85e730
20 changed files with 103 additions and 28 deletions
--- a/packages/fineui/dist/font/iconfont.eot
+++ b/packages/fineui/dist/font/iconfont.eot
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@ -14,6 +14,20 @@
    />
      <missing-glyph />
      
+      <glyph glyph-name="tiaozhengcengji" unicode="&#60088;" d="M240 424H136a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h104v80zM352 344h536a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8H352v-80zM536 160H136a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h400v80zM648 80h240a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-240v-80zM624 688H136a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h488V688zM736 608h152a8 8 0 0 1 8 8V680a8 8 0 0 1-8 8h-152v-80zM552 216a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-192a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8v192zM256 480a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-192a8 8 0 0 0-8-8H264a8 8 0 0 0-8 8v192zM640 744a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-192a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8V744z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="kuabiaoziduan-chouqu" unicode="&#60087;" d="M600 260a8 8 0 0 0 8 8h128a8 8 0 0 0 8-8v-40a8 8 0 0 0-8-8h-128a8 8 0 0 0-8 8v40zM600 356a8 8 0 0 0 8 8h128a8 8 0 0 0 8-8v-40a8 8 0 0 0-8-8h-128a8 8 0 0 0-8 8v40zM568 476H264v-64h120v-224h64v224h120v64zM120 788c0 4.856 2.164 9.208 5.58 12.14A15.92 15.92 0 0 0 136 804h553.46a15.988 15.988 0 0 0 11.204-4.58l198.54-194.72A16 16 0 0 0 904 593.28V-20a16 16 0 0 0-16-16H136a15.932 15.932 0 0 0-10.492 3.916A16.036 16.036 0 0 0 120-20V788z m552-188V748H176v-728h672V584h-160a16 16 0 0 0-16 16z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="kuabiaoziduan-zhilian" unicode="&#60086;" d="M120 788c0 4.856 2.164 9.208 5.58 12.14A15.92 15.92 0 0 0 136 804h553.46a15.988 15.988 0 0 0 11.204-4.58l198.54-194.72A16 16 0 0 0 904 593.28V-20a16 16 0 0 0-16-16H136a15.932 15.932 0 0 0-10.492 3.916A16.036 16.036 0 0 0 120-20V788z m552-188V748H176v-728h672V584h-160a16 16 0 0 0-16 16zM248 148a8 8 0 0 0 8 8h512a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H256a8 8 0 0 0-8 8v48zM600 304a8 8 0 0 0 8 8h128a8 8 0 0 0 8-8v-40a8 8 0 0 0-8-8h-128a8 8 0 0 0-8 8v40zM600 400a8 8 0 0 0 8 8h128a8 8 0 0 0 8-8v-40a8 8 0 0 0-8-8h-128a8 8 0 0 0-8 8v40zM568 524H264v-64h120v-224h64v224h120V524z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1yincang" unicode="&#60085;" d="M561.724 11.26h0.004l-5.712-21.38a8 8 0 0 0-9.808-5.66l-42.708 11.492a7.748 7.748 0 0 0-0.004 0l42.712-11.492a8 8 0 0 1 0 0.004l-42.712 11.492a7.996 7.996 0 0 0-5.648 9.788l21.644 81.072a330.812 330.812 0 0 0-97.496 56.556v-0.004h0.004l-23.72-23.804h-0.004l-35.456-35.58a8 8 0 0 0-11.332 0l-31.32 31.412a8 8 0 0 0 0 11.296l59.24 59.396a331.452 331.452 0 0 0-69.896 145.336c-0.888 4.32 1.996 8.476 6.332 9.272l15.9 2.924a8.068 8.068 0 0 0 6.14-1.376 508.62 508.62 0 0 1 296.116-94.556c110.336 0 212.512 35.02 296.12 94.564a8.068 8.068 0 0 0 6.128 1.376l15.9-2.908c4.34-0.792 7.228-4.952 6.34-9.272a333.16 333.16 0 0 0-3.796-16.384l-0.004-0.016a331.932 331.932 0 0 0-19.9-55.8 331.132 331.132 0 0 0-46.168-73.16l59.212-59.396c3.116-3.12 3.116-8.172 0-11.296l-31.32-31.412a8 8 0 0 0-11.332 0l-59.176 59.388-0.004-0.004h0.004a356.944 356.944 0 0 0-9.124-7.364 330.692 330.692 0 0 0-88.368-49.188l18.868-70.708 2.772-10.392a8 8 0 0 0-5.652-9.788l-42.708-11.472a8 8 0 0 0-9.804 5.664l-21.668 81.08a332.4 332.4 0 0 0-112.64 0l-15.956-59.7z m186.784 75.316zM512 760c202.244 0 367.196-159.68 375.66-359.84l0.696 0.496a80.072 80.072 0 0 0 60.84 13.556l9.92-1.816C944.464 646.592 749.884 832 512 832 264.576 832 64 631.424 64 384c0-229.076 171.936-417.996 393.796-444.756-23.828 17.748-36.492 47.964-30.944 78.44a372.004 372.004 0 0 0-23.624 6.288c-31.252-22.068-74.788-19.092-102.732 8.932l-31.32 31.416a79.724 79.724 0 0 0-23.304 54.064C177.98 186.408 136 280.3 136 384c0 207.66 168.34 376 376 376z m288-376c0-11.096-0.628-22.044-1.848-32.816A434.968 434.968 0 0 0 720.668 328 216.16 216.16 0 0 1 728 384c0 119.292-96.708 216-216 216-110.456 0-201.544-82.908-214.44-189.884-40.072-10.2-67.428-50.34-58.576-93.424a403.72 403.72 0 0 1 24.94-79.08C238.56 280.508 224 330.556 224 384c0 159.056 128.944 288 288 288s288-128.944 288-288z m-184.888-436.076c11.048 2.6 21.936 5.612 32.652 9.016a80.124 80.124 0 0 0-5.336 14.348l-6.112 22.868c-1.544-0.008-3.088-0.008-4.632 0l-6.108-22.864a79.952 79.952 0 0 0-10.464-23.368z m-121.152 149.332l1.724-0.8-1.724 0.8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1xianshi" unicode="&#60084;" d="M512 760c197.316 0 359.132-151.988 374.764-345.28a491.04 491.04 0 0 0 51.036-46.312 532.804 532.804 0 0 0 20.584-22.74c1.068 12.636 1.616 25.42 1.616 38.332 0 247.424-200.576 448-448 448S64 631.424 64 384s200.576-448 448-448c11.064 0 22.036 0.4 32.9 1.188-87.444 18.96-155.116 64.628-204.472 112.152C219.04 111.692 136 238.148 136 384c0 207.66 168.34 376 376 376z m-288-376c0-41.948 8.968-81.8 25.092-117.748 1.86 3.18 3.868 6.536 6.028 10.048a556.588 556.588 0 0 0 45.436 63.356A216.94 216.94 0 0 0 296 384c0 119.292 96.708 216 216 216 76.892 0 144.404-40.18 182.676-100.688a395.492 395.492 0 0 0 90.948-25.208C747.8 589.032 639.588 672 512 672c-159.056 0-288-128.944-288-288z m728.288-155.484l5.924-12.516-5.924-12.516-0.016-0.028-0.032-0.072-0.096-0.196-0.08-0.164-0.208-0.432a235.32 235.32 0 0 0-4.592-8.732 354.36 354.36 0 0 0-14-23.088 418.708 418.708 0 0 0-56.988-69.08C824.6 51.316 743.964 0 631.108 0c-112.86 0-193.496 51.316-245.172 101.692a418.428 418.428 0 0 0-56.984 69.08 353.828 353.828 0 0 0-14.004 23.088 231.904 231.904 0 0 0-4.592 8.732l-0.288 0.596-0.092 0.196-0.04 0.072-0.012 0.028L304 216l5.924 12.516 0.016 0.028 0.032 0.072 0.096 0.196 0.108 0.224 0.18 0.372c0.24 0.48 0.564 1.136 0.984 1.956 0.836 1.64 2.036 3.928 3.608 6.776a353.828 353.828 0 0 0 14 23.088c12.4 18.852 31.2 43.94 56.988 69.08C437.612 380.684 518.248 432 631.108 432c112.856 0 193.492-51.316 245.168-101.692a418.708 418.708 0 0 0 56.988-69.08 354.36 354.36 0 0 0 14-23.088 235.32 235.32 0 0 0 4.592-8.732l0.18-0.372 0.108-0.224 0.096-0.196 0.032-0.072 0.016-0.028z m-321.368 130.512c-78.992 0-143.028-64.036-143.028-143.028 0-78.992 64.036-143.028 143.028-143.028 78.992 0 143.024 64.036 143.024 143.028 0 78.992-64.032 143.028-143.024 143.028z m0-55.456c-48.364 0-87.568-39.208-87.568-87.568 0-48.364 39.204-87.568 87.568-87.568 48.36 0 87.568 39.204 87.568 87.568 0 48.36-39.208 87.568-87.568 87.568z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-dameng8DM8" unicode="&#60083;" d="M252.08832 455.51616c0.36864-44.94848 15.4112-111.33952 96.80384-134.10816v-0.01536c8.45824-2.37568 16.768-4.52096 24.85248-6.60992 63.84128-16.4864 113.8688-29.40416 114.944-123.25888 0.23552-25.32352-2.90816-46.03392-7.2704-62.39232-138.22976-41.17504-262.66624-22.64576-308.41856 56.3456-42.05056 72.32512-7.16288 176.63488 79.08864 270.03904z m279.72608 176.26624c142.93504 45.79328 273.18784 28.58496 320.32768-52.69504h-0.01024c46.1568-79.60064-0.60928-197.95968-106.61376-297.78944-0.95744 121.78432-77.57824 135.64416-110.29504 141.56288l-1.03424 0.18432c-118.12352 21.44256-113.75616 143.20128-102.3744 208.73728z m-187.06432-93.9008c-36.68992-12.22656-60.43648-41.66656-60.43648-41.66656-7.38816-144.64 91.93472-173.7216 149.3504-175.7952 107.69408-3.6352 89.86624-134.29248 84.18304-175.96928v-0.00512c-0.56832-4.1728-1.01888-7.4496-1.2032-9.62048 26.5472 8.96 55.5008 22.1696 55.5008 22.1696s-0.24064 31.84128-0.24064 67.84512c6.30272 110.7968-86.15936 124.14976-132.25472 130.80064-7.936 1.14688-14.4896 2.09408-18.944 3.3024-89.04704 34.62144-79.5648 137.23648-76.55936 169.8304 0.41472 4.47488 0.70656 7.6288 0.60416 9.10848z m16.97792 6.912s19.0208 24.23296 55.84896 36.46464c0.1024-1.47456-0.18944-4.62848-0.60416-9.10336-3.01056-32.5888-12.4928-135.20896 76.56448-169.82016 1.73568-0.47616 3.76832-1.00352 6.06208-1.60256 37.72416-9.80992 145.46944-37.84192 145.1264-132.51584l0.24064-75.22304s-28.83072-15.74912-54.26688-25.3184c0.09216 1.09568 0.22528 2.4832 0.38912 4.13696v0.00512c3.31264 34.28352 17.57184 181.82144-84.5824 191.98976-57.31328 5.68832-153.50784 27.82208-144.77824 180.992z m188.13952-148.28032C404.49536 409.63072 442.04544 599.1936 442.04544 599.1936s35.7376 12.35968 60.9536 22.89664c-17.24928-189.5936 67.2256-208.37376 96.65536-213.6832 137.37472-34.64192 121.01632-149.10464 120.17664-154.82368-0.7424-5.06368-31.01696-22.4-48.67584-32.512-2.25792-1.29536-4.31616-2.46784-6.07232-3.48672 7.18848 168.54528-84.47488 176.31744-112.98304 178.7392a452.10112 452.10112 0 0 0-2.23232 0.18944z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shujuzhiliang" unicode="&#60082;" d="M157.688 679.384A32 32 0 0 1 136 649.092V233.88a79.996 79.996 0 0 1 39.6-69.048l328.32-192.104a16 16 0 0 1 16.16 0l328.32 192.104a79.992 79.992 0 0 1 39.6 69.048V649.092a32 32 0 0 1-21.688 30.292l-344 117.108a31.996 31.996 0 0 1-20.624 0l-344-117.108zM738 496.532l-245.448-251.712a4.788 4.788 0 0 0-6.792 0l-168.344 168.976a4.88 4.88 0 0 0 0 6.876l47 47.176a4.784 4.784 0 0 0 6.8 0l114.544-114.976a4.788 4.788 0 0 1 6.792 0l191.652 197.716a4.784 4.784 0 0 0 6.792 0L738 503.408a4.88 4.88 0 0 0 0-6.876z"  horiz-adv-x="1024" />
+      
      <glyph glyph-name="shujulie" unicode="&#60080;" d="M128 800a64 64 0 0 1-64-64v-704a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64v704a64 64 0 0 1-64 64H128z m768-64v-192H128v192h768z m-768-448v192h768v-192H128z m0-64h768v-192H128v192zM352 640a32 32 0 0 0 32 32h256a32 32 0 0 0 0-64H384a32 32 0 0 0-32 32zM352 384a32 32 0 0 0 32 32h256a32 32 0 0 0 0-64H384a32 32 0 0 0-32 32zM352 128a32 32 0 0 0 32 32h256a32 32 0 0 0 0-64H384a32 32 0 0 0-32 32zM224 640a32 32 0 1 0 64 0 32 32 0 0 0-64 0zM224 384a32 32 0 1 0 64 0 32 32 0 0 0-64 0zM224 128a32 32 0 1 0 64 0 32 32 0 0 0-64 0z"  horiz-adv-x="1024" />
      
      <glyph glyph-name="canshu" unicode="&#60081;" d="M896 768v-768H128V768h768zM128 832a64 64 0 0 1-64-64v-768a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64V768a64 64 0 0 1-64 64H128zM320 608a64 64 0 0 0 64 64h160a192 192 0 1 0 0-384H384V128a32 32 0 0 0-64 0V608z m64 0v-256h160a128 128 0 1 1 0 256H384z"  horiz-adv-x="1024" />
@ -186,9 +200,9 @@
      
      <glyph glyph-name="remensousuo_zhiding" unicode="&#60004;" d="M160 768a16 16 0 0 0 16 16h672a16 16 0 0 0 16-16v-48a16 16 0 0 0-16-16H176a16 16 0 0 0-16 16v48z m392-298.896L759.744 261.36a15.996 15.996 0 0 1 22.628 0l33.94 33.94a16 16 0 0 1 0 22.628L524.984 609.256a16 16 0 0 1-22.628 0L211.028 317.928a16 16 0 0 1 0-22.628l33.944-33.94a15.992 15.992 0 0 1 22.628 0L472 465.76V0a16 16 0 0 1 16-16h48a16 16 0 0 1 16 16V469.104z"  horiz-adv-x="1024" />
      
-      <glyph glyph-name="guolvtiaojian" unicode="&#59994;" d="M680 728a8 8 0 0 1-8 8H152a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h47.768l163.18-286.156c0.688-1.208 1.052-2.576 1.052-3.964v-340.352c0-6.084 6.52-9.944 11.852-7.012l80.004 43.98a8 8 0 0 1 4.144 7.012V381.88c0 1.388 0.364 2.756 1.052 3.964L624.232 672H672a8 8 0 0 1 8 8V728zM600 332a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-264a8 8 0 0 0-8 8v64zM608 180a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h264a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-264z"  horiz-adv-x="1024" />
+      <glyph glyph-name="guolvtiaojian" unicode="&#59994;" d="M700 792a8 8 0 0 1-8 8H132a8 8 0 0 1-8-8v-60a8 8 0 0 1 8-8h47.768l163.18-286.156c0.688-1.208 1.052-2.576 1.052-3.964v-460.352c0-6.084 6.52-9.944 11.852-7.012l120.004 43.98a8 8 0 0 1 4.144 7.012V433.88c0 1.388 0.364 2.756 1.052 3.964L644.232 724H692a8 8 0 0 1 8 8V792zM620 304a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-264a8 8 0 0 0-8 8v64zM628 152a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h264a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-264z"  horiz-adv-x="1024" />
      
-      <glyph glyph-name="guolvtiaojian-1" unicode="&#59996;" d="M488.3 111.64a8.012 8.012 0 0 1 3.7 6.748V396l132.232 288H672a8 8 0 0 1 8 8V740a8 8 0 0 1-8 8H152a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h47.768L332 396v-369.412c0-6.316 6.976-10.14 12.3-6.748l144 91.8zM263.956 688h296.088L432 409.116v-262.212l-40-25.5v287.712L263.956 688zM600 340a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-264a8 8 0 0 0-8 8v64zM600 180a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-264a8 8 0 0 0-8 8v64z"  horiz-adv-x="1024" />
+      <glyph glyph-name="guolvtiaojian-1" unicode="&#59996;" d="M488.3 47.639999999999986a8.012 8.012 0 0 1 3.7 6.748V452l132.232 288H672a8 8 0 0 1 8 8V804a8 8 0 0 1-8 8H72a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h47.768L252 452v-489.412c0-6.316 6.976-10.14 12.3-6.748l224 91.8zM195.956 744h352.088L420 465.116v-374.212l-96-41.5V465.116L195.956 744zM600 316a8 8 0 0 0 8 8h344a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-344a8 8 0 0 0-8 8v64zM600 156a8 8 0 0 0 8 8h344a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-344a8 8 0 0 0-8 8v64z"  horiz-adv-x="1024" />
      
      <glyph glyph-name="shiyongxiangmu" unicode="&#59992;" d="M506.244 819.116a8.4 8.4 0 0 0 7.512 0l429.6-214.712c6.192-3.092 6.192-11.92 0-15.016l-429.6-214.708a8.412 8.412 0 0 0-7.512 0l-429.6 214.708c-6.192 3.092-6.192 11.92 0 15.016l429.6 214.712zM221.028 596.896L510 454.48l288.972 142.42L510 739.32 221.028 596.896zM88.912 439.12c0 6.204 6.496 10.264 12.076 7.548L510 247.512l409.012 199.156c5.58 2.716 12.076-1.344 12.076-7.548v-64.36a8.4 8.4 0 0 0-4.688-7.532l-416.4-204.876-416.4 204.876a8.392 8.392 0 0 0-4.688 7.532v64.36zM100.992 233.832c-5.576 2.724-12.08-1.34-12.08-7.544v-62.908a8.4 8.4 0 0 1 4.648-7.512L510-52l416.44 207.868a8.4 8.4 0 0 1 4.648 7.512v62.908c0 6.204-6.504 10.268-12.084 7.544L510 34.28 100.996 233.832z"  horiz-adv-x="1024" />
      
--- a/packages/fineui/dist/font/iconfont.ttf
+++ b/packages/fineui/dist/font/iconfont.ttf
--- a/packages/fineui/dist/font/iconfont.woff
+++ b/packages/fineui/dist/font/iconfont.woff
--- a/packages/fineui/dist/font/iconfont.woff2
+++ b/packages/fineui/dist/font/iconfont.woff2
--- a/packages/fineui/src/base/combination/tab.js
+++ b/packages/fineui/src/base/combination/tab.js
@ -158,6 +158,10 @@ export class Tab extends Widget {
        return this.layout.isCardExisted(cardName);
    }

+    getAllCardIds() {
+        return Object.keys(this.cardMap);
+    }
+
    getSelect() {
        return this.curr;
    }
--- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js
@ -169,6 +169,7 @@ export class AbstractTreeValueChooser extends Widget {
                value: node.value,
                open: true,
                disabled: node.disabled,
+                iconCls: node.iconCls,
            });
        }
    }
@ -531,6 +532,7 @@ export class AbstractTreeValueChooser extends Widget {
                halfCheck: half,
                flag,
                disabled: node.disabled,
+                iconCls: node.iconCls,
            });
        }

@ -702,6 +704,7 @@ export class AbstractTreeValueChooser extends Widget {
                    disabled: nodes[i].disabled,
                    title: nodes[i].title || nodes[i].text,
                    warningTitle: nodes[i].warningTitle,
+                    iconCls: nodes[i].iconCls,
                });
                if (openState) {
                    getResult(parentValues.concat([nodes[i].value]), { checked: state[0], half: state[1] });
--- a/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js
+++ b/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js
@ -15,6 +15,7 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser {
            items: null,
            itemsCreator: emptyFn,
            showLine: true,
+            showIcon: false,
            //searcherPaneAutoShrink和searcherPaneIsSelectedAny同时为false时，返回值和非搜索状态下的树逻辑一致
            searcherPaneAutoShrink: true,//其搜索树是否会判别子结点全选则取父结点的值
            searcherPaneIsSelectedAny: true, //其搜索树是否返回所有被checked的结点(包括被checked的结点的子结点)
@ -28,6 +29,7 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser {
            type: o.hideSearch ? MultiSelectTreePopup.xtype : MultiSelectTree.xtype,
            element: this,
            showLine: o.showLine,
+            showIcon: o.showIcon,
            searcherPaneIsSelectedAny: o.hideSearch || o.searcherPaneIsSelectedAny,
            itemsCreator: (options, callback) => {
                options.searcherPaneAutoShrink = o.hideSearch || o.searcherPaneAutoShrink;
--- a/packages/fineui/src/core/2.base.js
+++ b/packages/fineui/src/core/2.base.js
@ -1518,7 +1518,7 @@ export function getTime() {
    }
    if (isNotNull(BI.timeZone)) {
        // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间，都以整的0800这样的为基准
-        return dt.getTime() - BI.timeZone - new Date().getTimezoneOffset() * 60000;
+        return dt.getTime() + BI.timeZone + new Date().getTimezoneOffset() * 60000;
    }

    return dt.getTime();
--- a/packages/fineui/src/core/utils/dom.js
+++ b/packages/fineui/src/core/utils/dom.js
@ -66,10 +66,10 @@ export function preloadImages(srcArray, onload) {
    each(srcArray, (i, src) => {
        images[i] = new Image();
        images[i].src = src;
-        images[i].onload = function() {
+        images[i].onload = function () {
            complete();
        };
-        images[i].onerror = function() {
+        images[i].onerror = function () {
            complete();
        };
    });
@ -741,8 +741,14 @@ export function getComboPosition(combo, popup, extraWidth, extraHeight, needAdap
        default:
            break;
    }
-    if (needAdaptHeight === true) {
-        popup.resetHeight && popup.resetHeight(Math.min(viewportBounds.height - position.top - (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
+    if (needAdaptHeight === true && popup.resetHeight) {
+        const comboRect = combo.element[0].getBoundingClientRect();
+        const relativeOffset = positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0;
+        if (position.top < comboRect.top) {
+            popup.resetHeight(Math.min(viewportBounds.height - position.top - relativeOffset, comboRect.top, maxHeight));
+        } else if (position.top >= comboRect.bottom) {
+            popup.resetHeight(Math.min(viewportBounds.height - position.top - relativeOffset, viewportBounds.height - comboRect.bottom, maxHeight));
+        }
    }

    return position;
--- a/packages/fineui/src/core/wrapper/layout/layout.card.js
+++ b/packages/fineui/src/core/wrapper/layout/layout.card.js
@ -107,9 +107,12 @@ export class CardLayout extends Layout {
            throw new Error("cardName not exist", cardName);
        }

-        const child = this._children[this._getChildName(cardName)];
+        let child = this._children[this._getChildName(cardName)];
        this._deleteCardByName(cardName);
-        child && child._destroy();
+        if (child) {
+            child._destroy();
+            child = null;
+        }
    }

    addCardByName(cardName, cardItem) {
--- a/packages/fineui/src/fix/fix.compact.js
+++ b/packages/fineui/src/fix/fix.compact.js
@ -76,7 +76,7 @@ function popTarget() {
 export const Model = Fix.Model;

 const oldWatch = Fix.watch;
-Fix.watch = function(model, expOrFn, cb, options) {
+Fix.watch = function (model, expOrFn, cb, options) {
    if (isPlainObject(cb)) {
        options = cb;
        cb = cb.handler;
@ -89,7 +89,7 @@ Fix.watch = function(model, expOrFn, cb, options) {
        this,
        model,
        expOrFn,
-        function() {
+        function () {
            options && options.store && pushTarget(options.store);
            let res;
            try {
@ -167,7 +167,7 @@ export function createStore() {
 }

 const _init = Widget.prototype._init;
-Widget.prototype._init = function() {
+Widget.prototype._init = function () {
    const needPop = createStore.call(this);
    try {
        _init.apply(this, arguments);
@ -178,7 +178,7 @@ Widget.prototype._init = function() {
 };

 const __initWatch = Widget.prototype.__initWatch;
-Widget.prototype.__initWatch = function() {
+Widget.prototype.__initWatch = function () {
    __initWatch.apply(this, arguments);
    const workerMode =
        Providers.getProvider("bi.provider.system").getWorkerMode();
@ -191,7 +191,7 @@ Widget.prototype.__initWatch = function() {
 };

 const unMount = Widget.prototype.__destroy;
-Widget.prototype.__destroy = function() {
+Widget.prototype.__destroy = function () {
    try {
        unMount.apply(this, arguments);
    } catch (e) {
@ -204,6 +204,7 @@ Widget.prototype.__destroy = function() {
            unwatch();
        });
    });
+    Fix.cleanupDeps();
    this._watchers && (this._watchers = []);
    if (this.store) {
        this.store._parent && (this.store._parent = null);
@ -213,7 +214,7 @@ Widget.prototype.__destroy = function() {
    delete this.__cacheStore;
 };

-Widget.prototype.__watch = function(getter, handler, options) {
+Widget.prototype.__watch = function (getter, handler, options) {
    this._watchers = this._watchers || [];
    const watcher = new Fix.Watcher(
        null,
@ -235,7 +236,7 @@ Widget.prototype.__watch = function(getter, handler, options) {
 _.each(["_render", "__afterRender", "_mount", "__afterMount"], (name) => {
    const old = Widget.prototype[name];
    old &&
-    (Widget.prototype[name] = function() {
+    (Widget.prototype[name] = function () {
        this.store && pushTarget(this.store);
        let res;
        try {
--- a/packages/fineui/src/fix/fix.js
+++ b/packages/fineui/src/fix/fix.js
@ -110,7 +110,15 @@ function isExtensible(obj) {


 function remove(arr, item) {
-    if (arr && arr.length) {
+    if (!arr) {
+        return;
+    }
+    const len = arr.length;
+    if (len) {
+        if (item === arr[len - 1]) {
+            arr.length = len - 1;
+            return;
+        }
        const index = arr.indexOf(item);
        if (index > -1) {
            return arr.splice(index, 1);
--- a/packages/fineui/src/less/resource/app.less
+++ b/packages/fineui/src/less/resource/app.less
@ -25,10 +25,20 @@ body {
  outline: 0 none;
 }

-div, textarea {
+@-moz-document url-prefix() {
+  div, textarea {
    scrollbar-color: fade(@scroll-color, 10%) fade(@scroll-color, 5%);
    scrollbar-width: thin;
+  }
+
+  .bi-theme-dark {
+    div, textarea {
+      scrollbar-color: fade(@scroll-color-theme-dark, 10%) fade(@scroll-color-theme-dark, 5%);
+    }
+  }
+}

+div, textarea {
  &::-webkit-scrollbar {
    -webkit-appearance: none;
    width: 10px;
@ -63,8 +73,6 @@ div, textarea {

 .bi-theme-dark {
  div, textarea {
-    scrollbar-color: fade(@scroll-color-theme-dark, 10%) fade(@scroll-color-theme-dark, 5%);
-
    &::-webkit-scrollbar {
      -webkit-appearance: none;
    }
--- a/packages/fineui/src/widget/downlist/combo.downlist.js
+++ b/packages/fineui/src/widget/downlist/combo.downlist.js
@ -1,4 +1,4 @@
-import { shortcut, Widget, extend, createWidget, cloneDeep, some, isArray, each } from "@/core";
+import { cloneDeep, createWidget, each, extend, isArray, isNull, shortcut, some, Widget } from "@/core";
 import { DownListPopup } from "./popup.downlist";
 import { Combo } from "@/base";
 import { IconTrigger } from "@/case";
@ -102,7 +102,7 @@ export class DownListCombo extends Widget {
                                this.fireEvent(DownListCombo.EVENT_SON_VALUE_CHANGE, value, fatherValue);
                                this.downlistcombo.hideView();
                            },
-                        }
+                        },
                    ],
                },
                stopPropagation: o.stopPropagation,
@ -134,8 +134,12 @@ export class DownListCombo extends Widget {
    }

    getValue() {
+        if (isNull(this.popupView)) {
+            return this.options.value;
+        } else {
            return this.popupView.getValue();
        }
+    }

    adjustWidth() {
        this.downlistcombo.adjustWidth();
--- a/packages/fineui/src/widget/multiselect/trigger/editor.multiselect.js
+++ b/packages/fineui/src/widget/multiselect/trigger/editor.multiselect.js
@ -1,4 +1,15 @@
-import { shortcut, Widget, extend, i18nText, createWidget, Controller, isEmptyString, isEmptyArray, BlankSplitChar } from "@/core";
+import {
+    shortcut,
+    Widget,
+    extend,
+    i18nText,
+    createWidget,
+    Controller,
+    isEmptyString,
+    isEmptyArray,
+    BlankSplitChar,
+    first, last, isNotEmptyString
+} from "@/core";
 import { StateEditor } from "@/case";
 import { SelectPatchEditor } from "./editor/editor.patch";

@ -77,8 +88,13 @@ export class MultiSelectEditor extends Widget {
    getKeywords() {
        const val = this.editor.getValue();
        let keywords = val.split(/\u200b\s\u200b/);
-        if (isEmptyString(keywords[keywords.length - 1])) {
-            keywords = keywords.slice(0, keywords.length - 1);
+        if (isEmptyString(first(keywords)) || isEmptyString(last(keywords))) {
+            keywords = keywords.filter((word, index) => {
+                if (index === 0 || index === keywords.length - 1) {
+                    return isNotEmptyString(word);
+                }
+                return true;
+            });
        }
        if (/\u200b\s\u200b$/.test(val)) {
            return keywords.concat([BlankSplitChar]);
--- a/packages/fineui/src/widget/multiselecttree/multiselecttree.js
+++ b/packages/fineui/src/widget/multiselecttree/multiselecttree.js
@ -30,6 +30,7 @@ export class MultiSelectTree extends Single {
            type: MultiSelectTreePopup.xtype,
            itemsCreator: o.itemsCreator,
            showLine: o.showLine,
+            showIcon: o.showIcon,
        });
        this.adapter.on(MultiSelectTreePopup.EVENT_CHANGE, () => {
            if (self.searcher.isSearching()) {
@ -45,6 +46,7 @@ export class MultiSelectTree extends Single {
        this.searcherPane = createWidget({
            type: MultiTreeSearchPane.xtype,
            cls: "bi-border-left bi-border-right bi-border-bottom",
+            showIcon: o.showIcon,
            isSelectedAny: o.searcherPaneIsSelectedAny,
            keywordGetter() {
                return self.searcher.getKeyword();
--- a/packages/fineui/src/widget/multiselecttree/multiselecttree.popup.js
+++ b/packages/fineui/src/widget/multiselecttree/multiselecttree.popup.js
@ -22,6 +22,7 @@ export class MultiSelectTreePopup extends Widget {
        this.popup = createWidget({
            type: AsyncTree.xtype,
            showLine: o.showLine,
+            showIcon: o.showIcon,
            element: this,
            itemsCreator: o.itemsCreator,
        });
--- a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js
+++ b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js
@ -31,6 +31,7 @@ export class MultiTreeSearchPane extends Pane {
                    opts.itemsCreator(op, callback);
                },
                value: opts.value,
+                showIcon: opts.showIcon,
                listeners: [
                    {
                        eventName: Controller.EVENT_CHANGE,
--- a/packages/fineui/typescript/base/combination/tab.ts
+++ b/packages/fineui/typescript/base/combination/tab.ts
@ -31,4 +31,6 @@ export declare class Tab extends Widget {
    populate(): void;

    isCardExisted(cardName: string): boolean;
+
+    getAllCardIds(): string[];
 }