Merge remote-tracking branch 'origin/master' into KERNEL-4190

# Conflicts:
#	dist/2.0/fineui.css
#	dist/2.0/fineui.css.map
#	dist/2.0/fineui.ie.js
#	dist/2.0/fineui.ie.js.map
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.ie.min.js.map
#	dist/2.0/fineui.js
#	dist/2.0/fineui.js.map
#	dist/2.0/fineui.min.css
#	dist/2.0/fineui.min.js
#	dist/2.0/fineui.min.js.map
#	dist/2.0/fineui_without_normalize.css
#	dist/2.0/fineui_without_normalize.css.map
#	dist/2.0/fineui_without_normalize.min.css
#	dist/base.css
#	dist/base.css.map
#	dist/base.js
#	dist/base.js.map
#	dist/bundle.css
#	dist/bundle.css.map
#	dist/bundle.ie.js
#	dist/bundle.ie.js.map
#	dist/bundle.ie.min.js
#	dist/bundle.ie.min.js.map
#	dist/bundle.js
#	dist/bundle.js.map
#	dist/bundle.min.css
#	dist/bundle.min.js
#	dist/bundle.min.js.map
#	dist/bundle_without_normalize.css
#	dist/bundle_without_normalize.css.map
#	dist/case.js
#	dist/case.js.map
#	dist/config.js.map
#	dist/core.css
#	dist/core.css.map
#	dist/core.js
#	dist/core.js.map
#	dist/core_without_normalize.css
#	dist/core_without_normalize.css.map
#	dist/demo.js
#	dist/demo.js.map
#	dist/es5.fineui.js
#	dist/es5.fineui.js.map
#	dist/es5.polyfill.js
#	dist/es5.polyfill.js.map
#	dist/fineui.css
#	dist/fineui.css.map
#	dist/fineui.ie.js
#	dist/fineui.ie.js.map
#	dist/fineui.ie.min.js
#	dist/fineui.ie.min.js.map
#	dist/fineui.js
#	dist/fineui.js.map
#	dist/fineui.min.css
#	dist/fineui.min.js
#	dist/fineui.min.js.map
#	dist/fineui_without_jquery_polyfill.js
#	dist/fineui_without_jquery_polyfill.js.map
#	dist/font.css
#	dist/font.css.map
#	dist/ie.fineui.js
#	dist/ie.fineui.js.map
#	dist/ie.polyfill.js
#	dist/ie.polyfill.js.map
#	dist/polyfill.js.map
#	dist/resource.css
#	dist/resource.css.map
#	dist/router.js
#	dist/router.js.map
#	dist/utils.js
#	dist/utils.js.map
#	dist/utils.min.js
#	dist/utils.min.js.map
#	dist/widget.css
#	dist/widget.css.map
#	dist/widget.js
#	dist/widget.js.map

changelog.md

@@ -1,5 +1,17 @@
 # 更新日志
+2.0(2020-07)
+- 修复了颜色选择器设置值为null的时候,trigger和popup表现不一致的问题
+
 2.0(2020-06)
+- 修复了复选下拉树半选节点的子节点未加载的时候，点选该半选节点是取消选中的问题
+- 下拉树系列支持isNeedAdjustWidth以动态变化宽度
+- 修复了新增值的下拉控件传递valueFormatter搜索完全匹配项提示新增
+- 修复了选色控件历史记录没有选中的问题的问题
+- 修复了单选下拉框新增值的时候没有发事件的问题
+- 修复了单选标红combo类setValue为空字符串会标红的问题
+- BI.history提供与注册路由对应的卸载路由方法unRoute
+- 修复了单选标红combo类setValue为空和空数组行为不一致的问题
+- 单选列表支持新增选项
 - 增加组件shortcut未定义的错误提示
 
 2.0(2020-05)

dist/fix/fix.js

@@ -359,7 +359,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
                         uniq[name] = true;
                     }
                 }
-                //添加访问器属性
+                //添加访问器属性 
                 for (name in accessors) {
                     if (uniq[name]) {
                         continue;
@@ -1337,7 +1337,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             _classCallCheck(this, Model);
         }
 
-        Model.prototype._constructor = function _constructor(model) {
+        Model.prototype._constructor = function _constructor(model, destroyHandler) {
             if (model instanceof Observer || model instanceof Model) {
                 model = model.model;
             }
@@ -1365,6 +1365,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             initWatch(this, watch$$1);
             initMethods(this, actions);
             this.created && this.created();
+            this._destroyHandler = destroyHandler;
             if (this.$$model) {
                 return this.model;
             }
@@ -1391,6 +1392,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             this.$$model = null;
             this.$$computed = null;
             this.$$state = null;
+            this._destroyHandler && this._destroyHandler();
         };
 
         return Model;

dist/font/iconfont.svg

@@ -20,6 +20,57 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="fenxibiao_yifenxiang" unicode="&#59363;" d="M830.015481 895.99936c67.391958 0.192 124.159922-50.559968 129.535919-115.967928 5.503997-66.303959-41.599974-124.223922-109.439931-135.231915-15.61599-2.559998-31.039981-2.175999-46.207971 1.215999-6.015996 1.343999-8.255995-0.384-10.879994-4.863997-47.61597-80.63995-95.29594-161.279899-143.35991-241.727849-4.991997-8.319995 1.087999-9.599994 5.247997-12.799992 33.023979-25.599984 48.38397-59.199963 42.879973-99.967937-5.631996-42.559973-30.335981-72.319955-71.487955-87.679945a110.719931 110.719931 0 0 0-123.135923 32.319979 104.959934 104.959934 0 0 0-9.727994 124.159923c4.159997 6.783996 4.287997 9.727994-2.751999 14.719991-67.391958 48.76797-134.399916 97.919939-201.343874 147.135908-5.631996 4.095997-9.791994 4.991997-16.38399 1.919998a84.991947 84.991947 0 0 0-48.767969-7.551995c-7.231995 1.023999-10.239994-1.279999-13.503992-6.847996-20.031987-34.175979-40.127975-68.287957-60.607962-102.143936-3.839998-6.335996-3.967998-10.047994 1.088-16.447989 22.527986-28.479982 25.407984-59.519963 8.447994-91.519943-15.61599-29.439982-50.047969-47.23197-83.519948-42.879973C40.319975 256.51176 15.42399 275.839748 4.159997 309.82372599999997c-19.583988 59.199963 33.215979 117.567927 95.99994 106.175934 7.039996-1.279999 10.239994 0.64 13.567992 6.399996 18.943988 32.57598 38.079976 65.087959 57.663964 97.279939 4.287997 7.039996 4.159997 10.623993-2.367999 16.51199a91.839943 91.839943 0 0 0-23.551985 107.135933 97.535939 97.535939 0 0 0 96.38394 56.575965 95.99994 95.99994 0 0 0 85.183947-68.479958 88.319945 88.319945 0 0 0-9.599994-73.343954c-3.647998-6.079996-2.559998-8.703995 2.751998-12.607992 67.839958-49.279969 135.551915-98.751938 203.263873-148.351907 4.479997-3.327998 7.679995-4.415997 13.183992-1.407999 18.687988 10.303994 39.167976 14.399991 60.479962 12.287992 7.679995-0.704 10.751993 2.047999 14.271991 7.999995 46.975971 79.67995 94.079941 159.3599 141.567911 238.719851 4.287997 7.167996 4.479997 10.687993-2.815998 16.25599a123.839923 123.839923 0 0 0-41.727974 140.159912C726.207546 861.439382 775.423515 895.80736 830.079481 895.99936zM831.99948 223.99978l191.99988-159.9999-191.99988-159.9999V-0.00008000000002539309a192.06388 192.06388 0 0 1-181.119887-127.99992A191.99988 191.99988 0 0 0 831.99948 127.99983999999995v95.99994z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="wenziyanse1" unicode="&#59362;" d="M628.736 716.8v-110.208h-188.16v-552.832H307.968V606.592H121.6V716.8h507.136z m275.136-284.16v-62.976h-107.52v-315.904h-75.776V369.664H614.08V432.64h289.792z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal105" unicode="&#59361;" d="M547.072 110.84799999999996a166.08 166.08 0 0 1 319.552-4.8 32 32 0 0 0 61.312-18.496 230.144 230.144 0 0 0-400.192-77.376l-5.44 7.168-11.84-36.8a32 32 0 0 0-34.624-21.952l-5.632 1.28a32 32 0 0 0-21.952 34.624l1.28 5.696 36.224 112.192c9.792 30.4 53.12 29.312 61.312-1.536zM832 864a32 32 0 0 0 32-32v-352h-64v320h-704v-768h256v-64H64a32 32 0 0 0-32 32V832A32 32 0 0 0 64 864z m55.36-566.528l5.376-7.104 11.84 36.8a32 32 0 0 0 34.688 21.888l5.632-1.28a32 32 0 0 0 21.888-34.56l-1.28-5.696-36.16-112.192c-9.792-30.4-53.12-29.312-61.44 1.536a166.08 166.08 0 0 1-318.912 6.528 32 32 0 1 0-61.12 19.2 230.144 230.144 0 0 0 399.424 74.944zM416 448a32 32 0 0 0 0-64h-192a32 32 0 0 0 0 64h192z m256 192a32 32 0 1 0 0-64h-448a32 32 0 0 0 0 64h448z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="daohang_BIgongju" unicode="&#59355;" d="M153.941333 716.16a2416.341333 2416.341333 0 0 1 162.005334 39.210667 2200.192 2200.192 0 0 1 147.541333 46.805333 143.829333 143.829333 0 0 0 96.298667 0.384 2495.274667 2495.274667 0 0 1 309.802666-86.314667 60.032 60.032 0 0 0 47.146667-59.050666l0.597333-249.472v-2.986667c0-185.770667-134.954667-349.141333-405.034666-490.069333-270.122667 128.853333-405.034667 292.266667-405.034667 490.069333L106.666667 656.810667a60.074667 60.074667 0 0 0 47.274666 59.349333z m288.213334-237.397333l97.322666-318.890667c3.712-12.330667 14.592-20.864 27.050667-21.205333a29.184 29.184 0 0 1 28.074667 19.669333l64.298666 177.450667h127.36c13.056 0 25.088 7.253333 31.573334 18.986666a39.253333 39.253333 0 0 1 0 37.930667 36.224 36.224 0 0 1-31.573334 18.944h-157.610666a29.184 29.184 0 0 1-27.306667-19.712l-30.506667-84.053333-100.096 327.765333a29.312 29.312 0 0 1-27.605333 21.034667 29.269333 29.269333 0 0 1-27.818667-20.736l-68.522666-215.509334H237.738667a36.266667 36.266667 0 0 1-31.573334-18.986666 39.253333 39.253333 0 0 1 0-37.973334 36.224 36.224 0 0 1 31.573334-18.944h161.749333l42.666667 134.314667v-0.042667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fuwuqixinxi" unicode="&#59356;" d="M896 800a32 32 0 0 0 32-32v-768a32 32 0 0 0-32-32H170.666667a32 32 0 0 0-32 32V768A32 32 0 0 0 170.666667 800z m-32-565.333333H202.666667v-202.666667h661.333333V234.666667z m-74.666667-85.333334a21.333333 21.333333 0 1 0 0-42.666666h-170.666666a21.333333 21.333333 0 1 0 0 42.666666h170.666666z m-512 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z m85.333334 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z m501.333333 341.333334H202.666667v-213.333334h661.333333v213.333334z m-74.666667-85.333334a21.333333 21.333333 0 1 0 0-42.666666h-170.666666a21.333333 21.333333 0 1 0 0 42.666666h170.666666z m-512 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z m85.333334 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z m501.333333 330.666667H202.666667V533.333333h661.333333V736zM789.333333 661.333333a21.333333 21.333333 0 1 0 0-42.666666h-170.666666a21.333333 21.333333 0 1 0 0 42.666666h170.666666z m-512 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z m85.333334 0a21.333333 21.333333 0 1 0 0-42.666666 21.333333 21.333333 0 0 0 0 42.666666z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zangshujuqingli" unicode="&#59357;" d="M864-42.666667a32 32 0 1 0 0-64H160a32 32 0 1 0 0 64h704zM640 842.666667a32 32 0 0 0 31.701333-27.648L672 810.666667v-224H853.333333a32 32 0 0 0 31.701334-27.648L885.333333 554.666667v-469.333334a32 32 0 0 0-27.648-31.701333L853.333333 53.333333H170.666667a32 32 0 0 0-31.701334 27.648L138.666667 85.333333V554.666667a32 32 0 0 0 27.648 31.701333L170.666667 586.666667h181.333333V810.666667a32 32 0 0 0 27.648 31.701333L384 842.666667h256zM821.333333 298.666667H202.666667v-181.333334H298.666667V192a21.333333 21.333333 0 1 0 42.666666 0v-74.666667h149.333334V192a21.333333 21.333333 0 1 0 42.666666 0v-74.666667H682.666667V192a21.333333 21.333333 0 1 0 42.666666 0v-74.666667h96V298.666667z m-213.333333 480h-192V554.666667a32 32 0 0 0-27.648-31.701334L384 522.666667H202.666667V341.333333h618.666666V522.666667H640a32 32 0 0 0-31.701333 27.648L608 554.666667V778.666667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gengxinrenwuchakan" unicode="&#59358;" d="M661.333333 369.066667a177.066667 177.066667 0 0 0 141.312-283.776l62.122667-62.122667a32 32 0 0 0-45.226667-45.226667l-64.085333 64.042667A177.066667 177.066667 0 1 0 661.333333 369.066667z m81.066667 430.933333c53.504 0 96.554667-43.349333 100.053333-97.408l0.213334-7.125333v-242.944a32 32 0 0 0-63.701334-4.352l-0.298666 4.352V695.466667c0 21.034667-14.208 37.76-31.786667 40.234666L742.4 736H196.266667c-18.090667 0-33.706667-15.104-35.968-35.370667L160 695.466667v-580.266667c0-21.034667 14.208-37.76 31.786667-40.234667l4.48-0.298666h224.042666a32 32 0 0 0 4.352-63.701334l-4.352-0.298666H196.266667c-53.504 0-96.554667 43.349333-100.053334 97.408L96 115.2V695.466667c0 54.912 40.832 100.565333 93.354667 104.277333L196.266667 800h546.133333z m-81.066667-486.4a121.6 121.6 0 1 1 0-243.2 121.6 121.6 0 0 1 0 243.2zM405.333333 256a21.333333 21.333333 0 1 0 0-42.666667h-128a21.333333 21.333333 0 1 0 0 42.666667h128z m85.333334 170.666667a21.333333 21.333333 0 1 0 0-42.666667h-213.333334a21.333333 21.333333 0 1 0 0 42.666667h213.333334z m170.666666 170.666666a21.333333 21.333333 0 1 0 0-42.666666h-384a21.333333 21.333333 0 0 0 0 42.666666h384z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yibiaobanxingnengfenxi" unicode="&#59359;" d="M896 757.333333a32 32 0 0 0 32-32v-554.666666a32 32 0 0 0-32-32h-362.666667V42.666667h160a32 32 0 1 0 0-64h-362.666666a32 32 0 1 0 0 64H469.333333v96H128a32 32 0 0 0-31.701333 27.648L96 170.666667V725.333333A32 32 0 0 0 128 757.333333z m-32-64H160v-490.666666h704V693.333333z m-396.928-86.4l1.450667-3.754666 68.138666-238.634667 62.208 155.392a21.333333 21.333333 0 0 0 36.693334 5.12l2.176-3.498667 36.778666-73.557333H789.333333a21.333333 21.333333 0 0 0 20.992-17.493333L810.666667 426.666667a21.333333 21.333333 0 0 0-17.493334-20.992l-3.84-0.341334h-128a21.333333 21.333333 0 0 0-16.981333 8.405334l-2.133333 3.413333-21.418667 42.837333-67.669333-169.258666a21.333333 21.333333 0 0 0-38.912-1.578667l-1.408 3.669333-70.272 245.930667-60.8-121.6a21.333333 21.333333 0 0 0-15.104-11.434667L362.666667 405.333333h-128a21.333333 21.333333 0 0 0-3.84 42.325334l3.84 0.341333h114.773333l79.488 158.890667a21.333333 21.333333 0 0 0 38.144 0.042666z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gengxinrizhifenxi" unicode="&#59360;" d="M704 369.066667a219.733333 219.733333 0 1 0 0-439.466667 219.733333 219.733333 0 0 0 0 439.466667zM672 810.666667a32 32 0 0 0 32-32v-21.333334h38.4c53.504 0 96.554667-43.349333 100.053333-97.408l0.213334-7.125333v-200.277333a32 32 0 0 0-63.701334-4.352l-0.298666 4.352V652.8c0 21.034667-14.208 37.76-31.786667 40.234667L742.4 693.333333h-38.4v-21.333333a32 32 0 1 0-64 0v21.333333H362.666667v-21.333333a32 32 0 0 0-64 0v21.333333H196.266667c-18.090667 0-33.706667-15.104-35.968-35.370666L160 652.8v-580.266667c0-21.034667 14.208-37.76 31.786667-40.234666l4.48-0.298667h224.042666a32 32 0 0 0 4.352-63.701333l-4.352-0.298667H196.266667c-53.504 0-96.554667 43.349333-100.053334 97.408L96 72.533333V652.8c0 54.912 40.832 100.565333 93.354667 104.277333L196.266667 757.333333H298.666667v21.333334a32 32 0 0 0 64 0v-21.333334H640v21.333334a32 32 0 0 0 32 32z m32-497.066667a164.266667 164.266667 0 1 1 0-328.533333 164.266667 164.266667 0 0 1 0 328.533333z m0-57.6a21.333333 21.333333 0 0 0 21.333333-21.333333V170.666667h64a21.333333 21.333333 0 1 0 0-42.666667h-85.333333a21.333333 21.333333 0 0 0-21.333333 21.333333v85.333334a21.333333 21.333333 0 0 0 21.333333 21.333333z m-298.666667-42.666667a21.333333 21.333333 0 1 0 0-42.666666h-128a21.333333 21.333333 0 1 0 0 42.666666h128z m42.666667 170.666667a21.333333 21.333333 0 1 0 0-42.666667h-170.666667a21.333333 21.333333 0 1 0 0 42.666667h170.666667z m213.333333 170.666667a21.333333 21.333333 0 1 0 0-42.666667h-384a21.333333 21.333333 0 0 0 0 42.666667h384z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yincang1" unicode="&#59353;" d="M720.832 731.2a32 32 0 0 0 10.368-44.032L327.04 34.176000000000045a32 32 0 0 0-54.4 33.664l28.032 45.184c-86.912 44.48-160.192 119.04-218.752 222.08l-10.304 18.752L55.488 384l16 30.08C173.312 604.736 322.24 704 512 704c50.112 0 97.28-6.912 141.632-20.608l23.168 37.44a32 32 0 0 0 44.032 10.368zM761.6 632.96c70.4-45.44 130.752-112.448 180.544-200.064l10.304-18.752 16.064-30.144-16-30.08C850.688 163.264 701.76 64 512 64a495.168 495.168 0 0 0-96.768 9.28l36.416 58.752c19.52-2.688 39.68-4.032 60.352-4.032 164.928 0 292.928 85.312 384 256-46.4 87.04-102.4 151.808-168 194.432l33.6 54.528zM512 640C347.072 640 219.072 554.688 128 384c55.232-103.488 124.032-175.616 206.4-216.32l46.848 75.712A192 192 0 0 0 579.52 563.8399999999999l39.04 63.04A419.968 419.968 0 0 1 512 640z m160.64-150.848a192 192 0 0 0-183.168-295.808l39.616 63.808a128 128 0 0 1 104.128 168.128l39.488 63.872zM512 512a128 128 0 0 1-96.064-212.608l128.896 208.384A128.192 128.192 0 0 1 512 512z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xianshi1" unicode="&#59354;" d="M512 704c189.824 0 338.816-99.328 440.448-289.92l16.064-30.08-16-30.08C850.688 163.264 701.76 64 512 64s-338.816 99.328-440.448 289.92L55.488 384l16 30.08C173.312 604.736 322.24 704 512 704z m0-64C347.072 640 219.072 554.688 128 384c91.072-170.688 219.072-256 384-256s292.928 85.312 384 256c-91.072 170.688-219.072 256-384 256z m0-64a192 192 0 1 0 0-384 192 192 0 0 0 0 384z m0-64a128 128 0 1 1 0-256 128 128 0 0 1 0 256z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="hangliezhuanhuan" unicode="&#59351;" d="M928 832a32 32 0 0 0 32-32v-832a32 32 0 0 0-32-32h-320a32 32 0 0 0-32 32v832a32 32 0 0 0 32 32zM512 320v-64H128v-256h384v-64H96a32 32 0 0 0-31.488 26.24L64-32v320a32 32 0 0 0 26.24 31.488L96 320H512z m384 448h-256v-768h256V768zM320 832l192-128-192-128V669.76a224.064 224.064 0 0 1-191.68-209.472L128 448v-64H64V448a288 288 0 0 0 256 286.272V832z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zixunhuanlie" unicode="&#59352;" d="M486.016 305.28l19.648-44.224 5.76-11.968a224 224 0 0 1 185.728-120.704L710.4 128H800v96l192-128-192-128V64h-89.6l-14.208 0.32a288 288 0 0 0-242.944 157.888l-2.112 4.544 34.88 78.528zM800 800l192-128-192-128V640h-89.6a224 224 0 0 1-199.04-121.088l-5.696-11.968-54.656-122.88V384L416 305.28l-31.168-70.272a288 288 0 0 0-249.024-170.688L121.6 64H32v64h89.6a224 224 0 0 1 199.04 121.088l5.696 11.968L380.928 384v0.064l35.008 78.72 31.232 70.208a288 288 0 0 0 249.024 170.688L710.4 704H800V800zM121.6 704l14.208-0.32a288 288 0 0 0 248.96-170.688l-3.968 8.32-34.88-78.528-19.584 44.16-5.76 11.968a224 224 0 0 1-185.728 120.704L121.6 640H32V704h89.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ziduanfenzu" unicode="&#59350;" d="M384 352a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64z m544-256a32 32 0 1 0 0-64h-384a32 32 0 1 0 0 64h384zM384 288H128v-256h256v256z m416 0a32 32 0 1 0 0-64h-256a32 32 0 1 0 0 64h256zM384 800a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64z m544-256a32 32 0 1 0 0-64h-384a32 32 0 0 0 0 64h384zM384 736H128v-256h256v256z m416 0a32 32 0 1 0 0-64h-256a32 32 0 0 0 0 64h256z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shujujieru" unicode="&#59347;" d="M896 789.333333a21.333333 21.333333 0 0 0 20.992-17.493333L917.333333 768v-256a21.333333 21.333333 0 0 0-17.493333-20.992L896 490.666667H320v-85.333334h426.666667v-128H896a21.333333 21.333333 0 0 0 20.992-17.493333l0.341333-3.84v-256a21.333333 21.333333 0 0 0-17.493333-20.992L896-21.333333H128a21.333333 21.333333 0 0 0-20.992 17.493333L106.666667 0v256a21.333333 21.333333 0 0 0 17.493333 20.992L128 277.333333h576v85.333334h-426.666667v128H128a21.333333 21.333333 0 0 0-20.992 17.493333L106.666667 512V768a21.333333 21.333333 0 0 0 17.493333 20.992L128 789.333333h768z m-21.333333-554.666666h-725.333334v-213.333334h725.333334v213.333334z m-149.333334-85.333334a21.333333 21.333333 0 0 0 3.84-42.325333L725.333333 106.666667H298.666667a21.333333 21.333333 0 0 0-3.84 42.325333L298.666667 149.333333h426.666666z m149.333334 597.333334h-725.333334v-213.333334h725.333334v213.333334z m-149.333334-85.333334a21.333333 21.333333 0 0 0 3.84-42.325333L725.333333 618.666667H298.666667a21.333333 21.333333 0 0 0-3.84 42.325333L298.666667 661.333333h426.666666z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="yibiaobanzhizuo" unicode="&#59348;" d="M512 448a21.333333 21.333333 0 0 0 20.992-17.493333l0.341333-3.84v-426.666667a21.333333 21.333333 0 0 0-17.493333-20.992L512-21.333333H213.333333a106.666667 106.666667 0 0 0-106.453333 99.669333L106.666667 85.333333v341.333334a21.333333 21.333333 0 0 0 17.493333 20.992L128 448h384z m384-128a21.333333 21.333333 0 0 0 20.992-17.493333l0.341333-3.84v-213.333334a106.666667 106.666667 0 0 0-99.669333-106.453333L810.666667-21.333333h-213.333334a21.333333 21.333333 0 0 0-20.992 17.493333L576 0v298.666667a21.333333 21.333333 0 0 0 17.493333 20.992L597.333333 320h298.666667z m-405.333333 85.333333h-341.333334V85.333333a64 64 0 0 1 51.84-62.848l5.973334-0.853333L213.333333 21.333333h277.333334v384z m384-128h-256v-256H810.666667a64 64 0 0 1 62.848 51.84l0.853333 5.973334L874.666667 85.333333v192zM810.666667 789.333333a106.666667 106.666667 0 0 0 106.453333-99.669333L917.333333 682.666667v-298.666667a21.333333 21.333333 0 0 0-17.493333-20.992L896 362.666667h-298.666667a21.333333 21.333333 0 0 0-20.992 17.493333L576 384V768a21.333333 21.333333 0 0 0 17.493333 20.992L597.333333 789.333333h213.333334z m0-42.666666h-192v-341.333334h256V682.666667a64 64 0 0 1-51.84 62.848l-5.973334 0.853333L810.666667 746.666667z m-298.666667 42.666666a21.333333 21.333333 0 0 0 20.992-17.493333L533.333333 768v-256a21.333333 21.333333 0 0 0-17.493333-20.992L512 490.666667H128a21.333333 21.333333 0 0 0-20.992 17.493333L106.666667 512V682.666667a106.666667 106.666667 0 0 0 99.669333 106.453333L213.333333 789.333333h298.666667z m-21.333333-42.666666H213.333333a64 64 0 0 1-63.701333-57.856L149.333333 682.666667v-149.333334h341.333334v213.333334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shujuzhanshi" unicode="&#59349;" d="M810.666667 789.333333a106.666667 106.666667 0 0 0 106.453333-99.669333L917.333333 682.666667v-426.666667a106.666667 106.666667 0 0 0-99.669333-106.453333L810.666667 149.333333h-277.333334v-128H725.333333a21.333333 21.333333 0 0 0 3.84-42.325333L725.333333-21.333333H298.666667a21.333333 21.333333 0 0 0-3.84 42.325333L298.666667 21.333333h192v128H213.333333a106.666667 106.666667 0 0 0-106.453333 99.669334L106.666667 256V682.666667a106.666667 106.666667 0 0 0 99.669333 106.453333L213.333333 789.333333h597.333334z m0-42.666666H213.333333a64 64 0 0 1-63.701333-57.856L149.333333 682.666667v-426.666667a64 64 0 0 1 57.856-63.701333L213.333333 192h597.333334a64 64 0 0 1 63.701333 57.856L874.666667 256V682.666667A64 64 0 0 1 810.666667 746.666667zM341.333333 469.333333a21.333333 21.333333 0 0 0 20.992-17.493333l0.341334-3.84v-128a21.333333 21.333333 0 0 0-42.325334-3.84L320 320v128A21.333333 21.333333 0 0 0 341.333333 469.333333z m170.666667 85.333334a21.333333 21.333333 0 0 0 20.992-17.493334l0.341333-3.84v-213.333333a21.333333 21.333333 0 0 0-42.325333-3.84l-0.341333 3.84v213.333333A21.333333 21.333333 0 0 0 512 554.666667z m170.666667 85.333333a21.333333 21.333333 0 0 0 20.992-17.493333l0.341333-3.84v-298.666667a21.333333 21.333333 0 0 0-42.325333-3.84l-0.341334 3.84v298.666667A21.333333 21.333333 0 0 0 682.666667 640z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="shoujichakanerweima" unicode="&#59346;" d="M768 180.16h96V352a64 64 0 0 0 64-64v-192H704v128H608v-256a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64H768v-171.84zM160 800h256a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64h-256a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64z m0-64v-256h256v256h-256z m0-384h256a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64h-256a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64z m0-64v-256h256v256h-256z m64 384h128v-128h-128v128z m0-448h128v-128h-128v128z m448 448h128v-128h-128v128z m-64 128h256a64 64 0 0 0 64-64v-256a64 64 0 0 0-64-64h-256a64 64 0 0 0-64 64v256a64 64 0 0 0 64 64z m0-64v-256h256v256h-256z m64-704h64v-64h-64v64z m128 0h128a64 64 0 0 0-64-64h-64v64z"  horiz-adv-x="1024" />
 
     
@@ -104,7 +155,7 @@ Created by iconfont
     <glyph glyph-name="shuangxiangkeliandong" unicode="&#59325;" d="M960 320h-64V704a64 64 0 0 1-64 64H192a64 64 0 0 1-64-64v-640a64 64 0 0 1 64-64h320v-64H192a128 128 0 0 0-128 128V704a128 128 0 0 0 128 128h640a128 128 0 0 0 128-128v-384z m-536.256-39.744l294.208 294.208a32 32 0 1 0 45.248-45.248L447.232 213.12a32 32 0 0 0-46.08-0.832L265.344 348.096a32 32 0 1 0 45.312 45.248L423.68 280.32000000000005z m290.304-51.328H992a32 32 0 1 0 0-64H636.8a31.872 31.872 0 0 0-22.656 54.592l90.56 90.56a32 32 0 0 0 45.248-45.248l-35.84-35.904zM914.752 0H636.8a32 32 0 1 0 0 64h355.2a31.872 31.872 0 0 0 22.656-54.656l-90.56-90.496a32 32 0 0 0-45.248 45.248l35.84 35.904z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="zhibiaomingchengziduan" unicode="&#59324;" d="M429.056 608v-576h-76.8v576H134.4v64h512v-64H429.056z m460.416 72.32c3.392-5.12 4.16-10.752 2.176-16.96-1.856-6.144-5.12-10.112-9.856-11.776l-50.56-13.44 33.28-42.944a14.528 14.528 0 0 0 1.92-8c0-3.2-0.512-6.528-1.664-9.856a34.88 34.88 0 0 0-4.416-9.344 17.28 17.28 0 0 0-7.296-6.08 24.064 24.064 0 0 0-18.304 3.2 25.6 25.6 0 0 0-10.56 11.52V576l-25.6 42.88-34.56-49.216c-0.896-2.176-2.752-3.776-5.76-4.864a24 24 0 0 0-7.04-1.6 41.536 41.536 0 0 0-10.56 1.28 11.328 11.328 0 0 0-7.296 6.4v-0.64a27.328 27.328 0 0 0 0 30.08l29.44 37.12h-0.64c-0.512 0-0.896 0.256-1.408 0.704h-2.56a172.544 172.544 0 0 0-16.64 4.416 1833.92 1833.92 0 0 1-21.12 6.464c-4.608 1.664-7.744 6.336-9.152 14.016a29.44 29.44 0 0 0 1.472 19.2 16.256 16.256 0 0 0 12.224 6.4 22.784 22.784 0 0 0 14.72-3.84h-0.64l19.84-7.04c6.784-2.944 13.44-5.12 19.84-6.4v10.88a15.872 15.872 0 0 1-0.256 2.88 12.032 12.032 0 0 0-0.32 2.88V716.8c0 6.016 1.92 10.688 5.952 14.08a22.528 22.528 0 0 0 15.104 5.12 23.04 23.04 0 0 0 13.44-5.12 16.384 16.384 0 0 0 7.04-14.08l-3.2-45.44 39.68 15.424a32.896 32.896 0 0 0 17.6 1.856 21.44 21.44 0 0 0 15.68-8.32z"  horiz-adv-x="1024" />
+    <glyph glyph-name="zhibiaomingchengziduan" unicode="&#59324;" d="M947.008 712.3199999999999a21.44 21.44 0 0 1-15.616 8.32 32.896 32.896 0 0 1-17.664-1.856l-39.68-15.424 3.2 45.44a16.384 16.384 0 0 1-6.976 14.08 23.04 23.04 0 0 1-13.44 5.12 22.528 22.528 0 0 1-15.104-5.12 17.344 17.344 0 0 1-5.952-14.08v-28.8c0-0.896 0-1.792 0.32-2.88a15.872 15.872 0 0 0 0.32-2.88v-10.88c-6.4 1.28-13.12 3.456-19.968 6.4l-19.84 7.04h0.64a22.784 22.784 0 0 1-14.656 3.84 16.256 16.256 0 0 1-12.16-6.4 29.44 29.44 0 0 1-1.536-19.2c1.408-7.68 4.48-12.352 9.216-14.016l21.12-6.464c6.848-2.112 12.416-3.584 16.64-4.416h2.56c0.384-0.448 0.896-0.704 1.28-0.704h0.64l-29.44-37.12a27.328 27.328 0 0 1 0-30.08v0.64a11.328 11.328 0 0 1 7.36-6.4c3.2-0.832 6.656-1.28 10.56-1.28a24 24 0 0 1 7.04 1.6c2.944 1.088 4.928 2.688 5.76 4.864l34.56 49.216 25.6-42.88v0.64a25.6 25.6 0 0 1 10.56-11.52c5.376-3.456 11.392-4.48 18.304-3.2a17.28 17.28 0 0 1 7.36 6.08 34.88 34.88 0 0 1 4.416 9.344 31.872 31.872 0 0 1 1.6 9.856 14.528 14.528 0 0 1-1.92 8l-33.28 42.944 50.56 13.44c4.672 1.664 8 5.632 9.856 11.776a18.88 18.88 0 0 1-2.24 16.96M704 704v-70.4H448V0H384V633.6H128V704h576z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="youhuazhanshicengjibeifen-copy" unicode="&#59323;" d="M480 0V768h-384v-128h-64V800A32 32 0 0 0 64 832h896a32 32 0 0 0 32-32v-159.872h-64V768h-384v-768h384v128.064h64V-32a32 32 0 0 0-32-32H64a32 32 0 0 0-32 32V128h64v-128h384zM274.752 416L193.6 497.152a32 32 0 1 0 45.248 45.248l135.808-135.744a32 32 0 0 0 0-45.312l-135.808-135.68a32 32 0 1 0-45.248 45.184L274.752 352H96a32 32 0 0 0 0 64h178.752z m474.816 0.128H928a32 32 0 1 0 0-64h-179.008l81.408-81.408a32 32 0 1 0-45.248-45.312l-135.808 135.808A31.872 31.872 0 0 0 640 384.128a32 32 0 0 0 12.096 25.024l133.056 133.12a32 32 0 1 0 45.248-45.312l-80.832-80.832z"  horiz-adv-x="1170" />
@@ -392,19 +443,19 @@ Created by iconfont
     <glyph glyph-name="yunxu" unicode="&#59014;" d="M512 28.799999999999955a355.2 355.2 0 1 0 0 710.4 355.2 355.2 0 0 0 0-710.4z m0 70.4a284.8 284.8 0 1 1 0 569.6 284.8 284.8 0 0 1 0-569.6z m160 428.8l32-32-256-256-128 160 32 32 96-64 224 160z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="fuzhidejilushu" unicode="&#59007;" d="M521.92 90.88l5.056 24.832 11.52 57.024 11.648 57.088 5.12 24.768H421.888l-33.28-163.712H330.88l32.896 163.712H268.8l11.392 58.56h96.256l29.696 147.84H305.792l11.776 58.112H417.92l32.896 158.016h57.664L476.8 519.04h132.48l32.832 158.08h58.112l-32.512-158.08h101.184l-11.392-58.048h-101.952l-30.464-147.84h106.048l-11.392-58.56H613.312l-33.28-163.712h-58.112zM433.28 311.87199999999996h134.08l30.464 149.952H463.808L433.28 311.87199999999996zM44.8 474.88v64h192v-64h-192z m0-128v64h192v-64h-192z m934.272 264.32c3.456-5.12 4.16-10.752 2.24-16.96-1.92-6.144-5.184-10.112-9.856-11.776l-50.56-13.44 33.216-42.944a14.528 14.528 0 0 0 1.92-8 34.88 34.88 0 0 0-6.08-19.2 17.28 17.28 0 0 0-7.296-6.08 24.064 24.064 0 0 0-18.24 3.2 25.6 25.6 0 0 0-10.624 11.52v-0.64l-25.6 42.88-34.56-49.216c-0.832-2.176-2.752-3.776-5.76-4.864a24 24 0 0 0-7.04-1.6 41.536 41.536 0 0 0-10.496 1.28 11.328 11.328 0 0 0-7.36 6.4v-0.64a27.328 27.328 0 0 0 0 30.08l29.44 37.12h-0.64c-0.448 0-0.896 0.256-1.344 0.704h-2.56a172.544 172.544 0 0 0-16.64 4.416 1833.92 1833.92 0 0 1-21.12 6.464c-4.672 1.664-7.808 6.336-9.216 14.016a29.44 29.44 0 0 0 1.536 19.2 16.256 16.256 0 0 0 12.16 6.4 22.784 22.784 0 0 0 14.72-3.84h-0.64l19.84-7.04c6.848-2.944 13.44-5.12 19.84-6.4v10.88a15.872 15.872 0 0 1-0.256 2.88 12.032 12.032 0 0 0-0.32 2.88v28.8c0 6.016 1.92 10.688 6.016 14.08a22.528 22.528 0 0 0 15.104 5.12 23.04 23.04 0 0 0 13.44-5.12 16.384 16.384 0 0 0 6.976-14.08l-3.2-45.44 39.68 15.424a32.896 32.896 0 0 0 17.664 1.856 21.44 21.44 0 0 0 15.616-8.32z"  horiz-adv-x="1024" />
+    <glyph glyph-name="fuzhidejilushu" unicode="&#59007;" d="M0 512V576h192v-64zM0 384V448h192v-64zM1011.008 712.3199999999999a21.44 21.44 0 0 1-15.616 8.32 32.896 32.896 0 0 1-17.664-1.856l-39.68-15.424 3.2 45.44a16.384 16.384 0 0 1-6.976 14.08 23.04 23.04 0 0 1-13.44 5.12 22.528 22.528 0 0 1-15.104-5.12 17.344 17.344 0 0 1-5.952-14.08v-28.8c0-0.896 0-1.792 0.32-2.88a15.872 15.872 0 0 0 0.32-2.88v-10.88c-6.4 1.28-13.12 3.456-19.968 6.4l-19.84 7.04h0.64a22.784 22.784 0 0 1-14.656 3.84 16.256 16.256 0 0 1-12.16-6.4 29.44 29.44 0 0 1-1.536-19.2c1.408-7.68 4.48-12.352 9.216-14.016l21.12-6.464c6.848-2.112 12.416-3.584 16.64-4.416h2.56c0.384-0.448 0.896-0.704 1.28-0.704h0.64l-29.44-37.12a27.328 27.328 0 0 1 0-30.08v0.64a11.328 11.328 0 0 1 7.36-6.4c3.2-0.832 6.656-1.28 10.56-1.28a24 24 0 0 1 7.04 1.6c2.944 1.088 4.928 2.688 5.76 4.864l34.56 49.216 25.6-42.88v0.64a25.6 25.6 0 0 1 10.56-11.52c5.376-3.456 11.392-4.48 18.304-3.2a17.28 17.28 0 0 1 7.36 6.08 34.88 34.88 0 0 1 4.416 9.344 31.872 31.872 0 0 1 1.6 9.856 14.528 14.528 0 0 1-1.92 8l-33.28 42.944 50.56 13.44c4.672 1.664 8 5.632 9.856 11.776a18.88 18.88 0 0 1-2.24 16.96M448 704l-23.296-128h256L704 704h64l-23.296-128H832v-64h-98.88l-46.528-256H768v-64h-93.056L640 0H576l34.944 192h-256L320 0H256l34.944 192H192v64h110.592l46.528 256H256V576h104.704L384 704h64z m221.12-192h-256l-46.528-256h256l46.528 256z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="jisuanzhibiaofuzhi" unicode="&#59008;" d="M677.568 701.184c-64.448 0-134.4 33.28-171.904-104.128l-17.408-86.4h88.64a29.44 29.44 0 1 0 0-58.88H475.648l-79.616-391.232s-7.68-62.848-46.272-60.48c-44.224 2.752-24.064 65.728-24.064 65.728l79.04 385.92H284.864A29.12 29.12 0 0 0 256 478.72c1.216 27.52 13.568 32 28.928 32h132.544l18.496 88.128c13.056 62.336 40.128 114.56 87.168 145.152 46.976 30.464 124.416 24.896 161.408 20.608h-0.064c15.616-1.664 49.856-4.8 46.272-39.04-2.752-27.2-42.56-24.384-53.184-24.384z m264.64-276.608a32 32 0 0 0 3.968-45.056l-115.328-137.472 115.328-137.408a32 32 0 0 0-49.024-41.152l-108.16 128.832-108.032-128.832a31.808 31.808 0 0 0-45.056-3.904 32 32 0 0 0-3.968 45.056l115.328 137.408L631.936 379.52a32 32 0 1 0 49.024 41.088l108.096-128.768 108.096 128.768a31.936 31.936 0 0 0 45.056 3.968zM64 384V448h192v-64H64z m0-128V320h192v-64H64z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="jilushu" unicode="&#59009;" d="M495.68 677.12L464 519.04h132.48l32.832 158.08h58.112l-32.512-158.08h101.184l-11.392-58.048h-101.952l-30.464-147.84h106.048l-11.392-58.56H600.512l-33.28-163.712h-58.112l5.056 24.832 11.52 57.024 11.648 57.088 5.12 24.768H409.088l-33.28-163.712H318.08l32.896 163.712H256l11.392 58.56h96.256l29.696 147.84H292.992l11.776 58.112H405.12l32.896 158.016h57.664z m89.408-215.296H451.008L420.48 311.87199999999996h134.08l30.464 149.952z m335.808 215.296a23.04 23.04 0 0 0 13.44-5.12 16.384 16.384 0 0 0 6.912-14.08l-3.2-45.44 39.68 15.424a32.896 32.896 0 0 0 17.728 1.856 21.44 21.44 0 0 0 15.552-8.32c3.456-5.12 4.224-10.752 2.24-16.96-1.856-6.144-5.12-10.112-9.856-11.776l-50.56-13.44 33.28-42.944a14.528 14.528 0 0 0 1.92-8c0-3.2-0.512-6.528-1.664-9.856a34.88 34.88 0 0 0-4.416-9.344 17.28 17.28 0 0 0-7.296-6.08 24.064 24.064 0 0 0-18.24 3.2 25.6 25.6 0 0 0-10.688 11.52v-0.64l-25.6 42.88-34.56-49.216c-0.768-2.176-2.752-3.776-5.76-4.864a24 24 0 0 0-6.912-1.6 41.536 41.536 0 0 0-10.56 1.28 11.328 11.328 0 0 0-7.424 6.4v-0.64a27.328 27.328 0 0 0 0 30.08l29.44 37.12h-0.64c-0.384 0-0.896 0.256-1.28 0.704h-2.56a172.544 172.544 0 0 0-16.64 4.416 1833.92 1833.92 0 0 1-21.12 6.464c-4.672 1.664-7.808 6.336-9.216 14.016a29.44 29.44 0 0 0 1.536 19.2 16.256 16.256 0 0 0 12.16 6.4 22.784 22.784 0 0 0 14.72-3.84h-0.64l19.84-7.04c6.848-2.944 13.44-5.12 19.84-6.4v10.88a15.872 15.872 0 0 1-0.32 2.88 12.032 12.032 0 0 0-0.32 2.88v28.8c0 6.016 1.984 10.688 6.08 14.08a22.528 22.528 0 0 0 15.104 5.12z"  horiz-adv-x="1024" />
+    <glyph glyph-name="jilushu" unicode="&#59009;" d="M1011.008 712.3199999999999a21.44 21.44 0 0 1-15.616 8.32 32.896 32.896 0 0 1-17.664-1.856l-39.68-15.424 3.2 45.44a16.384 16.384 0 0 1-6.976 14.08 23.04 23.04 0 0 1-13.44 5.12 22.528 22.528 0 0 1-15.104-5.12 17.344 17.344 0 0 1-5.952-14.08v-28.8c0-0.896 0-1.792 0.32-2.88a15.872 15.872 0 0 0 0.32-2.88v-10.88c-6.4 1.28-13.12 3.456-19.968 6.4l-19.84 7.04h0.64a22.784 22.784 0 0 1-14.656 3.84 16.256 16.256 0 0 1-12.16-6.4 29.44 29.44 0 0 1-1.536-19.2c1.408-7.68 4.48-12.352 9.216-14.016l21.12-6.464c6.848-2.112 12.416-3.584 16.64-4.416h2.56c0.384-0.448 0.896-0.704 1.28-0.704h0.64l-29.44-37.12a27.328 27.328 0 0 1 0-30.08v0.64a11.328 11.328 0 0 1 7.36-6.4c3.2-0.832 6.656-1.28 10.56-1.28a24 24 0 0 1 7.04 1.6c2.944 1.088 4.928 2.688 5.76 4.864l34.56 49.216 25.6-42.88v0.64a25.6 25.6 0 0 1 10.56-11.52c5.376-3.456 11.392-4.48 18.304-3.2a17.28 17.28 0 0 1 7.36 6.08 34.88 34.88 0 0 1 4.416 9.344 31.872 31.872 0 0 1 1.6 9.856 14.528 14.528 0 0 1-1.92 8l-33.28 42.944 50.56 13.44c4.672 1.664 8 5.632 9.856 11.776a18.88 18.88 0 0 1-2.24 16.96M384 704l-23.296-128h256L640 704h64l-23.296-128H768v-64h-98.88l-46.528-256H704v-64H610.944L576 0H512l34.944 192h-256L256 0H192l34.944 192H128v64h110.592l46.528 256H192V576h104.704L320 704h64z m221.12-192h-256l-46.528-256h256l46.528 256z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="juhejisuanzhibiaofuzhi" unicode="&#59010;" d="M980.224 602.24a21.44 21.44 0 0 1-15.616 8.32 32.896 32.896 0 0 1-17.664-1.92l-39.68-15.36 3.2 45.44a16.384 16.384 0 0 1-7.04 14.08 23.04 23.04 0 0 1-13.44 5.12 22.528 22.528 0 0 1-15.04-5.12 17.344 17.344 0 0 1-6.016-14.08v-28.8c0-0.96 0-1.856 0.32-2.944a15.872 15.872 0 0 0 0.32-2.88v-10.88c-6.4 1.28-13.056 3.456-19.904 6.4l-19.84 7.04h0.64a22.784 22.784 0 0 1-14.72 3.84 16.256 16.256 0 0 1-12.16-6.4 29.44 29.44 0 0 1-1.536-19.2c1.408-7.68 4.48-12.352 9.216-14.016l21.12-6.4c6.848-2.176 12.416-3.648 16.64-4.48h2.56c0.448-0.448 0.896-0.64 1.28-0.64h0.64l-29.44-37.12a27.328 27.328 0 0 1 0-30.08V492.8a11.328 11.328 0 0 1 7.424-6.4c3.2-0.896 6.656-1.28 10.56-1.28a24 24 0 0 1 6.976 1.536c3.008 1.088 4.928 2.688 5.76 4.864l34.56 49.28 25.6-42.88v0.64a25.6 25.6 0 0 1 10.624-11.52c5.312-3.52 11.328-4.48 18.24-3.2a17.28 17.28 0 0 1 7.36 6.016 34.88 34.88 0 0 1 4.416 9.344 31.872 31.872 0 0 1 1.664 9.856 14.528 14.528 0 0 1-1.984 8l-33.28 42.944 50.56 13.44c4.736 1.664 8.064 5.632 9.92 11.776a18.88 18.88 0 0 1-2.24 16.96M613.568 701.184c-64.448 0-134.4 33.28-171.904-104.128l-17.408-86.4h88.64a29.44 29.44 0 1 0 0-58.88H411.648l-79.616-391.232s-7.68-62.848-46.272-60.48c-44.224 2.752-24.064 65.728-24.064 65.728l79.04 385.92H220.864A29.12 29.12 0 0 0 192 478.72c1.216 27.52 13.568 32 28.928 32h132.544l18.496 88.128c13.056 62.336 40.128 114.56 87.168 145.152 46.976 30.464 124.416 24.896 161.408 20.608h-0.064c15.616-1.664 49.856-4.8 46.272-39.04-2.752-27.2-42.56-24.384-53.184-24.384z m264.64-276.608a32 32 0 0 0 3.968-45.056l-115.328-137.472 115.328-137.408a32 32 0 0 0-49.024-41.152l-108.16 128.832-108.032-128.832a31.808 31.808 0 0 0-45.056-3.904 32 32 0 0 0-3.968 45.056l115.328 137.408L567.936 379.52a32 32 0 1 0 49.024 41.088l108.096-128.768 108.096 128.768a31.936 31.936 0 0 0 45.056 3.968zM0 384V448h192v-64H0z m0-128V320h192v-64H0z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="shijianziduanfuzhi" unicode="&#59011;" d="M640 64a320 320 0 1 0 0 640 320 320 0 0 0 0-640z m0 64a256 256 0 1 1 0 512 256 256 0 0 1 0-512z m26.688 261.12l81.6-81.6a26.688 26.688 0 0 0-37.76-37.76L621.12 359.296a26.624 26.624 0 0 0-7.808 18.88V544a26.688 26.688 0 1 0 53.376 0v-154.88zM64 448V512h192v-64H64z m0-128V384h192v-64H64z"  horiz-adv-x="1024" />
+    <glyph glyph-name="shijianziduanfuzhi" unicode="&#59011;" d="M640 768a384 384 0 1 0 0-768 384 384 0 0 0 0 768z m0-64a320 320 0 1 1 0-640 320 320 0 0 1 0 640z m0.064-96a32 32 0 0 0 32-32v-178.688l103.808-103.808a32 32 0 0 0-45.248-45.248L617.472 361.34400000000005l-0.704 0.768-1.28 1.408-0.256 0.384 1.6-1.792-2.176 2.496-1.408 1.92a26.304 26.304 0 0 0-1.6 2.816l-0.64 1.28-0.512 1.152a23.04 23.04 0 0 0-1.664 5.312 22.336 22.336 0 0 0-0.64 5.44L608 383.36V576a32 32 0 0 0 32 32zM192 384v-64H0V384h192z m0 128v-64H0V512h192z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="queding-lan" unicode="&#59006;" d="M375.872 158.20799999999997l520.384 520.448a32 32 0 1 0 45.248-45.312l-543.04-543.04a32 32 0 0 0-45.248 0L81.664 361.856a32 32 0 0 0 45.312 45.248l248.896-248.96z"  horiz-adv-x="1024" />
@@ -1025,7 +1076,7 @@ Created by iconfont
     <glyph glyph-name="normal90" unicode="&#58908;" d="M832 273.728c11.328 0 22.08-4.48 30.016-12.416a42.56 42.56 0 0 0-30.592-72.064H272.96l183.104-181.312a41.344 41.344 0 0 0 0-59.456 42.304 42.304 0 0 0-60.032 0l-255.68 253.248a41.6 41.6 0 0 0-9.024 45.824 42.432 42.432 0 0 0 39.68 26.176H832zM171.008 535.936a43.072 43.072 0 0 0-42.624 42.752 42.56 42.56 0 0 0 42.624 42.24h558.464L588.928 760.064a41.344 41.344 0 0 0 0 59.456 42.24 42.24 0 0 0 60.032 0l213.12-211.712c8.128-7.744 12.672-18.56 12.544-29.696a38.72 38.72 0 0 0-2.944-16 42.432 42.432 0 0 0-39.68-26.24H171.008z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal79" unicode="&#58888;" d="M512-64A448 448 0 1 0 512 832a448 448 0 0 0 0-896z m0 64A384 384 0 1 1 512 768a384 384 0 0 1 0-768z m32.128 364.224l127.68-127.68a32 32 0 0 0-45.248-45.248L490.88 327.03999999999996a32 32 0 0 0-5.952 8.256 31.872 31.872 0 0 0-4.736 16.704v256a32 32 0 0 0 64 0v-243.776z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal79" unicode="&#58888;" d="M512 768a384 384 0 1 0 0-768A384 384 0 0 0 512 768z m0-64a320 320 0 1 1 0-640A320 320 0 0 1 512 704z m0.064-96a32 32 0 0 0 32-32v-178.688l103.808-103.808a32 32 0 0 0-45.248-45.248L489.472 361.34400000000005l-0.704 0.768-1.28 1.408-0.256 0.384 1.6-1.792-2.176 2.496-1.408 1.92a26.304 26.304 0 0 0-1.6 2.816l-0.64 1.28-0.512 1.152a23.04 23.04 0 0 0-1.664 5.312 22.336 22.336 0 0 0-0.64 5.44L480 383.36V576a32 32 0 0 0 32 32z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="normal80" unicode="&#58889;" d="M128 832h768a64 64 0 0 0 64-64v-768a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64z m0-64v-768h768V768H128z m160-160v64a32 32 0 0 0 64 0v-64h64a32 32 0 0 0 0-64h-64v-64a32 32 0 0 0-64 0v64h-64a32 32 0 0 0 0 64h64z m320-64a32 32 0 0 0 0 64h192a32 32 0 1 0 0-64h-192z m0-288a32 32 0 0 0 0 64h192a32 32 0 1 0 0-64h-192z m0-128a32 32 0 1 0 0 64h192a32 32 0 1 0 0-64h-192z m-329.344 92.16l-45.312 45.184a32 32 0 1 0 45.312 45.312l45.248-45.312 45.248 45.312a32 32 0 1 0 45.248-45.312l-45.248-45.248 45.248-45.248a32 32 0 1 0-45.248-45.248l-45.248 45.248-45.248-45.248a32 32 0 1 0-45.312 45.248l45.312 45.248z"  horiz-adv-x="1024" />
@@ -1049,13 +1100,13 @@ Created by iconfont
     <glyph glyph-name="normal86" unicode="&#58895;" d="M512 429.248l105.344 105.408a32 32 0 1 0 45.312-45.312L557.248 384l105.408-105.344a32 32 0 1 0-45.312-45.312L512 338.75199999999995l-105.344-105.408a32 32 0 1 0-45.312 45.312L466.752 384 361.344 489.344a32 32 0 1 0 45.312 45.312L512 429.248z m436.544-210.176l-1.344-4.032C884.032 48 715.072-64 524.864-64 277.824-64 76.8 123.51999999999998 76.8 354.17600000000004c0 11.008 6.464 21.12 16.896 26.24a34.112 34.112 0 0 0 32.832-1.408l110.144-68.544a29.12 29.12 0 0 0 12.608-23.936c0-16.448-14.272-29.824-32-29.824a33.792 33.792 0 0 0-16.128 4.032l-55.168 34.368c30.272-169.6 188.672-299.392 378.88-299.392 164.352 0 310.4 97.472 363.52 242.56a32.128 32.128 0 0 0 30.016 19.328c17.664 0 32-13.44 32-29.888 0-3.136-0.96-5.824-1.856-8.64zM78.656 528.768l1.344 4.288A447.744 447.744 0 0 0 502.272 832c247.04 0 448-200.896 448-448a31.872 31.872 0 0 0-49.728-26.624L790.4 430.848a32 32 0 1 0 35.52 53.248l55.168-36.8A384.64 384.64 0 0 1 502.272 768a383.872 383.872 0 0 1-363.456-259.776 32.128 32.128 0 0 0-62.016 11.264c0 3.328 0.96 6.272 1.856 9.28z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal87" unicode="&#58896;" d="M263.104 352v-248.896h99.584v-49.792H213.312V600.96h49.792v-199.104h99.584V352H263.04z m435.52 279.36l28.8-28.8c-28.352-23.936-69.76-61.184-78.336-67.84-21.696-17.088-40.96-22.592-40.96-22.592s5.504 19.2 22.528 40.96c6.72 8.576 43.968 49.92 67.968 78.272zM921.728 748.8a20.864 20.864 0 0 0-29.504-29.44l-6.144 6.08-79.36-112.448 24.768-24.896a20.864 20.864 0 0 0-29.44-29.504l-147.584 147.52a20.864 20.864 0 1 0 29.568 29.44l24.896-24.832 112.448 79.424-6.144 6.144a20.864 20.864 0 1 0 29.504 29.504l76.992-76.992z m-445.312-595.84h369.792a64 64 0 1 0 0-128H476.416a64 64 0 1 0 0 128z m0 298.688h369.792a64 64 0 1 0 0-128H476.416a64 64 0 1 0 0 128zM177.792 750.208h320a64 64 0 1 0 0-128h-320a64 64 0 1 0 0 128z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal87" unicode="&#58896;" d="M860.416 89.024a64 64 0 1 0 0-128H490.688a64 64 0 0 0 0 128h369.728z m-583.04 448l-0.064-199.04h99.584v-49.856l-99.584 0.064v-248.96H376.96v-49.728H227.584V536.96h49.728z m583.04-149.312a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m-147.584 179.84l28.8-28.8c-28.352-24-69.76-61.248-78.272-67.904-21.76-17.088-40.96-22.528-40.96-22.528s5.44 19.2 22.528 40.96c6.656 8.512 43.904 49.92 67.904 78.272z m125.952 199.68a20.864 20.864 0 0 0 20.16-5.376l76.992-76.992a20.864 20.864 0 0 0-29.44-29.44l-6.208 6.144-79.36-112.512 24.832-24.832a20.864 20.864 0 0 0-29.504-29.568l-147.52 147.52a20.864 20.864 0 0 0 29.44 29.504l24.96-24.896 112.448 79.424-6.144 6.144a20.864 20.864 0 0 0 9.344 34.944zM512 686.4639999999999a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128h320z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="normal88" unicode="&#58897;" d="M120.448 0c-42.24 0-70.4 41.6-49.28 75.136l392.32 665.28c21.12 36.8 77.44 36.8 98.56 0l390.784-665.28c21.12-33.664-7.04-75.136-49.28-75.136H120.448z m335.168 311.232c0-72.896 112.64-72.896 112.64 0V538.752c0 74.624-112.64 74.624-112.64 0v-227.52zM512 64a64 64 0 1 1 0 128 64 64 0 0 1 0-128z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal89" unicode="&#58898;" d="M512-64A448 448 0 1 0 512 832a448 448 0 0 0 0-896z m0 64A384 384 0 1 1 512 768a384 384 0 0 1 0-768zM410.88 289.408l-52.736-137.472a32 32 0 1 0-59.776 22.912L481.856 652.8a32 32 0 0 0 37.248 19.648 32 32 0 0 0 23.424-19.84l183.488-478.08a32 32 0 0 0-59.712-22.912l-52.864 137.728H410.88z m24.576 64h153.408L512.192 553.216 435.456 353.408z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal89" unicode="&#58898;" d="M512 832a448 448 0 1 0 0-896A448 448 0 0 0 512 832z m0-64a384 384 0 1 1 0-768A384 384 0 0 1 512 768z m47.168-115.2l171.776-518.144h-86.592l-43.648 147.84H420.48l-44.352-147.84H293.056L464.832 652.8h94.336z m-47.872-64.064h-2.816a3544 3544 0 0 0-35.328-130.112l-12.544-42.368-21.12-69.696h141.504l-20.416 69.696c-17.6 56.32-33.088 114.048-49.28 172.48z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="qiehuanweidu" unicode="&#59176;" d="M677.504 594.1759999999999l131.776-132.992a32 32 0 1 1 45.44 45.056l-186.496 188.16a32 32 0 0 1-54.72-22.464v-574.08a32 32 0 1 1 64 0V594.1759999999999zM220.16 308.736a32 32 0 1 1-45.44-45.12l186.496-188.16a32 32 0 0 1 54.72 22.464V672a32 32 0 0 1-64 0v-496.32L220.224 308.672z"  horiz-adv-x="1024" />
@@ -1184,7 +1235,7 @@ Created by iconfont
     <glyph glyph-name="shuxingtubiao_xingzhuang" unicode="&#59127;" d="M64 832h448v-448H64V832z m64-384h320V768H128v-320z m608-64c123.52 0 224-100.48 224-224S859.52-64 736-64 512 36.48 512 160 612.48 384 736 384z m0-64a160 160 0 1 1 0-320 160 160 0 0 1 0 320z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="chuangjianzuanqumulu" unicode="&#59128;" d="M263.104 401.792v199.04h-49.792v-497.728h49.792V352h99.584v49.792H263.04z m213.312-248.96h369.792a64 64 0 1 0 0-128H476.416a64 64 0 0 0 0 128z m0 298.752h369.792a64 64 0 1 0 0-128H476.416a64 64 0 1 0 0 128zM177.792 750.208h320a64 64 0 1 0 0-128h-320a64 64 0 1 0 0 128z m35.52-647.04h149.376v-49.856H213.312v49.792z"  horiz-adv-x="1024" />
+    <glyph glyph-name="chuangjianzuanqumulu" unicode="&#59128;" d="M860.416 106.68799999999999a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m-583.04 448l-0.064-199.104h99.584v-49.792H277.312v-248.96H376.96v-49.728H227.584V554.688h49.728z m583.04-149.376a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728zM512 704a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128h320z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="shuxingtubiao_xzhou" unicode="&#59129;" d="M566.912 511.68l143.36 197.376a32 32 0 1 0 51.84-37.632L606.464 457.28l155.648-214.208a32 32 0 0 0-51.84-37.632l-143.36 197.376-143.36-197.376a32 32 0 0 0-51.84 37.632L527.36 457.28 371.84 671.36a32 32 0 0 0 51.776 37.632l143.36-197.376z m-374.848-448h736a32 32 0 0 0 0-64h-768a32 32 0 0 0-32 32v704a32 32 0 1 0 64 0v-672z"  horiz-adv-x="1024" />
@@ -1199,28 +1250,28 @@ Created by iconfont
     <glyph glyph-name="shuxingtubiao_yzhou" unicode="&#59132;" d="M192.064 63.67999999999995h736a32 32 0 0 0 0-64h-768a32 32 0 0 0-32 32v704a32 32 0 1 0 64 0v-672zM395.968 721.472a32 32 0 0 0 43.52-12.48l155.136-279.872a32 32 0 1 0-56-31.04L383.552 677.952a32 32 0 0 0 12.48 43.52zM742.336 719.488a32 32 0 0 1-43.52-12.416L543.68 427.136a32 32 0 1 1 56-31.04l155.136 279.936a32 32 0 0 1-12.48 43.52zM537.984 447.744h64v-224a32 32 0 1 0-64 0v224z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="zuanqumulu_tiaozhengshunxu" unicode="&#59133;" d="M256 362.688V533.312h-42.688v-426.624H256V320h85.312v42.688H256z m192-213.376h298.688a64 64 0 0 0 0-128H448a64 64 0 0 0 0 128z m0 256h298.688a64 64 0 0 0 0-128H448a64 64 0 1 0 0 128z m-256 256h256a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128z m21.312-554.624h128V64h-128v42.688z m369.792 495.936l46.208-30.848V704a32 32 0 0 0 64 0v-192a32 32 0 0 0-49.728-26.624l-96 64a32 32 0 0 0 35.52 53.248z m252.48 10.688l-46.272 30.848v-132.224a32 32 0 1 0-64 0V704a32 32 0 0 0 49.792 26.624l96-64a32 32 0 0 0-35.52-53.248z"  horiz-adv-x="1024" />
+    <glyph glyph-name="zuanqumulu_tiaozhengshunxu" unicode="&#59133;" d="M860.416 106.68799999999999a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m-583.04 448l-0.064-199.104h99.584v-49.792H277.312v-248.96H376.96v-49.728H227.584V554.688h49.728z m583.04-149.376a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728zM768 768a32 32 0 0 0 32-32v-192a32 32 0 0 0-49.728-26.624l-96 64a32 32 0 0 0 35.456 53.248l46.272-30.848V736A32 32 0 0 0 768 768z m64-32a32 32 0 0 0 49.728 26.56l96-64a32 32 0 0 0-35.456-53.248L896 676.16v-132.224a32 32 0 1 0-64 0zM512 704a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128h320z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="tianjiahebingyiju_normal" unicode="&#59134;" d="M336.448 208.44799999999998a307.264 307.264 0 1 0 351.104 351.104 307.264 307.264 0 1 0-351.104-351.104z m-3.136 65.664a307.2 307.2 0 0 0 288.64 288.576 243.264 243.264 0 1 1-288.64-288.64z m68.8-68.8a243.264 243.264 0 1 1 288.576 288.64 307.2 307.2 0 0 0-288.64-288.64z m-4.992 63.808a243.2 243.2 0 0 1 229.76 229.76 243.2 243.2 0 0 1-229.76-229.76z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="zuanqumulu_jiaru" unicode="&#59135;" d="M725.312 643.2h-96v-64h96V480h64V579.2h96v64h-96V736h-64v-92.8zM256 365.888h85.312v-42.688H256v-213.312h-42.688V536.512H256v-170.624z m192-213.376h298.688a64 64 0 0 0 0-128H448a64 64 0 0 0 0 128z m0 256h298.688a64 64 0 0 0 0-128H448a64 64 0 1 0 0 128z m-256 256h256a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128z m21.312-554.624h128v-42.688h-128v42.688z"  horiz-adv-x="1024" />
+    <glyph glyph-name="zuanqumulu_jiaru" unicode="&#59135;" d="M860.416 88.89599999999996a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m-583.04 448l-0.064-199.104h99.584V288H277.312v-248.896H376.96v-49.792H227.584V536.96h49.728z m583.04-149.312a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728zM782.208 704a32 32 0 0 0 32-32v-64h64a32 32 0 1 0 0-64h-64v-64a32 32 0 1 0-64 0v64h-64a32 32 0 1 0 0 64h64v64a32 32 0 0 0 32 32zM512 686.208a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128h320z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="zuanqumulu_yichu" unicode="&#59136;" d="M256 405.312V576h-42.688v-426.688H256V362.688h85.312v42.624H256zM448 192h298.688a64 64 0 0 0 0-128H448a64 64 0 0 0 0 128z m0 256h298.688a64 64 0 0 0 0-128H448a64 64 0 1 0 0 128zM192 704h256a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128z m21.312-554.688h128v-42.624h-128v42.624z m416 469.376v64h256v-64h-256z"  horiz-adv-x="1024" />
+    <glyph glyph-name="zuanqumulu_yichu" unicode="&#59136;" d="M860.416 106.68799999999999a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m-583.04 448l-0.064-199.104h99.584v-49.792H277.312v-248.96H376.96v-49.728H227.584V554.688h49.728z m583.04-149.376a64 64 0 1 0 0-128H490.688a64 64 0 1 0 0 128h369.728z m17.792 220.48a32 32 0 1 0 0-64h-192a32 32 0 1 0 0 64h192zM512 704a64 64 0 1 0 0-128H192a64 64 0 1 0 0 128h320z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="weidudiliziduan" unicode="&#59137;" d="M874.112 257.472h-177.92a1015.296 1015.296 0 0 1 0 253.12h177.92C888.064 470.848 896 428.416 896 384s-7.936-86.848-21.888-126.528zM621.44 16.128c27.2 44.032 49.088 104.128 63.616 174.4h158.208a385.408 385.408 0 0 0-221.824-174.464z m-440.576 174.4h158.208c14.464-70.272 36.48-130.368 63.616-174.464a385.152 385.152 0 0 0-221.824 174.464z m-30.912 320h177.984a1015.04 1015.04 0 0 1 0-253.056h-177.92A380.672 380.672 0 0 0 128 384c0 44.288 7.936 86.784 21.888 126.464z m252.8 241.408c-27.264-44.16-49.216-104.256-63.68-174.528H180.8A385.536 385.536 0 0 0 402.624 752z m2.432-174.528C432.704 697.856 480.96 768 512 768c30.976 0 79.36-70.08 106.88-190.592H405.12zM512 0.128c-31.04 0-79.296 70.08-106.88 190.464h213.76c-27.52-120.448-75.904-190.464-106.88-190.464z m128 384c0-46.272-3.84-87.808-9.216-126.592H393.152A910.848 910.848 0 0 0 384 384c0 46.08 3.84 87.68 9.152 126.464h237.632C636.16 471.68 640 430.144 640 384z m203.2 193.344h-158.208c-14.528 70.272-36.416 130.368-63.616 174.528a385.728 385.728 0 0 0 221.824-174.528zM512 832a448 448 0 1 1 0-896A448 448 0 0 1 512 832z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="fuzhi" unicode="&#59138;" d="M527.68 677.12L496 519.04h132.48l32.832 158.08h58.112l-32.512-158.08h101.184l-11.392-58.048h-101.952l-30.464-147.84h106.048l-11.392-58.56H632.512l-33.28-163.712h-58.112l5.056 24.832 11.52 57.024 11.648 57.088 5.12 24.768H441.088l-33.28-163.712H350.08l32.896 163.712H288l11.392 58.56h96.256l29.696 147.84H324.992l11.776 58.112H437.12l32.896 158.016h57.664z m89.408-215.296H483.008L452.48 311.87199999999996h134.08l30.464 149.952zM256 410.88v-64H64v64h192z m0 128v-64H64v64h192z"  horiz-adv-x="1024" />
+    <glyph glyph-name="fuzhi" unicode="&#59138;" d="M64 512V576h192v-64zM64 384V448h192v-64zM512 704l-23.296-128h256L768 704h64l-23.296-128H896v-64h-98.88l-46.528-256H832v-64h-93.056L704 0h-64l34.944 192h-256L384 0H320l34.944 192H256v64h110.592l46.528 256H320V576h104.704L448 704h64z m221.12-192h-256l-46.528-256h256l46.528 256z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="genggaibiao" unicode="&#59139;" d="M212.032 191.74400000000003c12.608-111.36 101.952-191.872 203.904-191.872a32 32 0 1 0 0-64c-136.896 0-255.168 108.672-268.224 255.872h-46.4a12.8 12.8 0 0 0-10.368 20.288l77.312 106.24a12.8 12.8 0 0 0 20.672 0l77.248-106.24a12.8 12.8 0 0 0-10.304-20.288h-43.84z m599.872 384.448C799.296 687.552 709.952 768 608 768a32 32 0 0 0 0 64c136.896 0 255.168-108.672 268.224-255.808h46.4a12.8 12.8 0 0 0 10.368-20.352l-77.248-106.24a12.8 12.8 0 0 0-20.736 0l-77.248 106.24a12.8 12.8 0 0 0 10.368 20.352h43.776zM96 832h384a32 32 0 0 0 32-32V448a32 32 0 0 0-32-32h-384A32 32 0 0 0 64 448V800a32 32 0 0 0 32 32zM128 768v-288h320V768H128z m416-416.64h384a32 32 0 0 0 32-32v-352a32 32 0 0 0-32-32h-384a32 32 0 0 0-32 32v352a32 32 0 0 0 32 32z m32-64v-288h320v288H576z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="ABCfuzhi" unicode="&#59140;" d="M256 640V704h512v-64H550.656v-576h-76.8V640H256zM256 410.88v-64H64v64h192z m0 128v-64H64v64h192z"  horiz-adv-x="1024" />
+    <glyph glyph-name="ABCfuzhi" unicode="&#59140;" d="M320 384v-64H128V384h192z m0 128v-64H128V512h192zM896 704v-70.4h-256V0H576V633.6H320V704h576z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="xinzenglie_normal" unicode="&#59109;" d="M96 832h192a32 32 0 0 0 32-32v-768a32 32 0 0 0-32-32h-192a32 32 0 0 0-32 32v768a32 32 0 0 0 32 32zM128 768v-704h128V768H128z m716.608 55.232l98.304-85.568a19.2 19.2 0 0 0-12.608-33.664h-196.608a19.2 19.2 0 0 0-12.608 33.664l98.304 85.568a19.2 19.2 0 0 0 25.216 0zM416 832h192a32 32 0 0 0 32-32v-768a32 32 0 0 0-32-32h-192a32 32 0 0 0-32 32v768a32 32 0 0 0 32 32zM448 768v-704h128V768H448z m288-128h192a32 32 0 0 0 32-32v-640a32 32 0 0 0-32-32h-192a32 32 0 0 0-32 32v640a32 32 0 0 0 32 32z m32-64v-576h128V576h-128z"  horiz-adv-x="1024" />
@@ -1310,16 +1361,16 @@ Created by iconfont
     <glyph glyph-name="normal27" unicode="&#59093;" d="M512 0A384 384 0 1 0 512 768a384 384 0 0 0 0-768z m0 429.248L376.256 564.992a32 32 0 1 1-45.248-45.248L466.688 384l-135.68-135.744a32 32 0 0 1 45.248-45.248L512 338.688l135.744-135.68a32 32 0 1 1 45.248 45.248L557.312 384l135.68 135.744a32 32 0 1 1-45.248 45.248L512 429.312z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal28" unicode="&#59094;" d="M333.248 256a32 32 0 0 0-22.592 54.656l178.688 178.688a32 32 0 0 0 45.312 0l178.688-178.688a32 32 0 0 0-22.592-54.656H333.248z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal28" unicode="&#59094;" d="M514.176 548.736l231.04-299.008a24.896 24.896 0 0 0-19.712-40.192H263.296a24.96 24.96 0 0 0-19.648 40.192l231.04 299.008a24.96 24.96 0 0 0 39.424 0"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal29" unicode="&#59095;" d="M333.248 512h357.504a32 32 0 0 0 22.592-54.656L534.656 278.65599999999995a32 32 0 0 0-45.312 0L310.656 457.344A32 32 0 0 0 333.248 512z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal29" unicode="&#59095;" d="M514.176 219.264l231.04 299.008a24.896 24.896 0 0 1-19.712 40.192H263.296a24.96 24.96 0 0 1-19.648-40.192l231.04-299.008a24.96 24.96 0 0 1 39.424 0"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal30" unicode="&#59096;" d="M384 205.24800000000005V562.752a32 32 0 0 0 54.656 22.592l178.688-178.688a32 32 0 0 0 0-45.312l-178.688-178.688A32 32 0 0 0 384 205.24800000000005z"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal30" unicode="&#59096;" d="M659.2 403.712l-299.072 231.04A24.896 24.896 0 0 1 320 615.04v-462.144a24.96 24.96 0 0 1 40.128-19.712l299.072 231.04a24.96 24.96 0 0 1 0 39.488"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal31" unicode="&#59097;" d="M342.464 403.712l299.072 231.04a24.896 24.896 0 0 0 40.128-19.712v-462.144a24.96 24.96 0 0 0-40.128-19.712L342.4 364.22400000000005a24.96 24.96 0 0 0 0 39.488"  horiz-adv-x="1024" />
+    <glyph glyph-name="normal31" unicode="&#59097;" d="M329.664 364.288l299.072-231.04a24.896 24.896 0 0 1 40.128 19.712V615.04a24.96 24.96 0 0 1-40.128 19.712L329.6 403.776a24.96 24.96 0 0 1 0-39.488"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="normal32" unicode="&#59098;" d="M618.944 369.664l-180.992-180.992a32 32 0 0 0-45.248 45.248L551.04 392.32 392.704 550.72a32 32 0 1 0 45.248 45.248l180.992-180.992a32 32 0 0 0 0-45.312z"  horiz-adv-x="1024" />
@@ -1394,10 +1445,10 @@ Created by iconfont
     <glyph glyph-name="fanhui" unicode="&#59054;" d="M448 588.0319999999999h192c158.592 0 288-121.344 288-272 0-150.72-129.408-272-288-272H223.872a32 32 0 0 0 0 64H640c124.16 0 224 93.568 224 208 0 114.368-99.84 208-224 208H448V396.8L128 556.8l320 160v-128.768z"  horiz-adv-x="1088" />
 
     
-    <glyph glyph-name="icon-test" unicode="&#59056;" d="M807.488 512.256h-104l-43.904-264.896h125.12v-55.232h-134.848l-25.984-135.68h-63.36l25.984 135.68H368.64l-29.248-135.68H277.76l29.248 135.68H217.6v55.232h100.736l48.768 264.896H245.248v55.232h131.584L402.88 704h61.696l-25.984-136.512h211.2L674.304 704h63.36l-22.72-136.512h92.608v-55.232z m-211.264-264.896l45.504 264.896h-211.2l-50.432-264.896h216.128z"  horiz-adv-x="1024" />
+    <glyph glyph-name="icon-test" unicode="&#59056;" d="M448 704l-23.296-128h256L704 704h64l-23.296-128H832v-64h-98.88l-46.528-256H768v-64h-93.056L640 0H576l34.944 192h-256L320 0H256l34.944 192H192v64h110.592l46.528 256H256V576h104.704L384 704h64z m221.12-192h-256l-46.528-256h256l46.528 256z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="shijian" unicode="&#59057;" d="M512-64A448 448 0 1 0 512 832a448 448 0 0 0 0-896z m0 64A384 384 0 1 1 512 768a384 384 0 0 1 0-768z m32.128 364.224l127.68-127.68a32 32 0 0 0-45.248-45.248L490.88 327.03999999999996a32 32 0 0 0-5.952 8.256 31.872 31.872 0 0 0-4.736 16.704v256a32 32 0 0 0 64 0v-243.776z"  horiz-adv-x="1024" />
+    <glyph glyph-name="shijian" unicode="&#59057;" d="M512 768a384 384 0 1 0 0-768A384 384 0 0 0 512 768z m0-64a320 320 0 1 1 0-640A320 320 0 0 1 512 704z m0.064-96a32 32 0 0 0 32-32v-178.688l103.808-103.808a32 32 0 0 0-45.248-45.248L489.472 361.34400000000005l-0.704 0.768-1.28 1.408-0.256 0.384 1.6-1.792-2.176 2.496-1.408 1.92a26.304 26.304 0 0 0-1.6 2.816l-0.64 1.28-0.512 1.152a23.04 23.04 0 0 0-1.664 5.312 22.336 22.336 0 0 0-0.64 5.44L480 383.36V576a32 32 0 0 0 32 32z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="fenxibiao" unicode="&#59059;" d="M885.312 768c71.936 0.192 132.48-53.76 138.24-123.2 5.76-70.464-44.416-132.032-116.8-143.68-16.64-2.688-33.024-2.368-49.28 1.28-6.4 1.408-8.768-0.448-11.52-5.12-50.88-85.76-101.696-171.52-152.96-256.896-5.376-8.832 1.152-10.24 5.568-13.632 35.2-27.2 51.584-62.912 45.824-106.24-6.08-45.184-32.384-76.864-76.352-93.184a118.4 118.4 0 0 0-131.328 34.368c-32 37.76-36.416 89.856-10.368 131.968 4.48 7.168 4.544 10.24-2.944 15.68a32231.424 32231.424 0 0 0-214.784 156.288c-5.952 4.352-10.432 5.312-17.472 1.92-16.32-7.616-34.048-10.496-51.968-7.936-7.744 1.152-10.944-1.344-14.464-7.232a8896 8896 0 0 0-64.64-108.608c-4.032-6.656-4.224-10.624 1.152-17.408 24.064-30.272 27.136-63.36 9.024-97.28a89.6 89.6 0 0 0-89.024-45.568c-38.272 4.992-64.768 25.536-76.8 61.632-20.864 62.912 35.456 124.928 102.4 112.832 7.488-1.408 10.944 0.64 14.528 6.784 20.16 34.56 40.576 69.12 61.44 103.36 4.608 7.424 4.48 11.328-2.56 17.536a97.28 97.28 0 0 0-24.96 113.856c17.472 39.104 58.24 62.976 102.72 60.096 42.112-2.752 78.912-32 90.88-72.768 8.064-27.328 4.608-53.504-10.24-77.888-3.904-6.4-2.752-9.28 2.944-13.44 72.32-52.352 144.64-104.96 216.768-157.632 4.736-3.456 8.256-4.672 14.08-1.472a110.08 110.08 0 0 0 64.512 13.056c8.128-0.768 11.52 2.176 15.232 8.448 50.112 84.736 100.416 169.344 151.04 253.76 4.48 7.616 4.736 11.328-3.008 17.216a131.2 131.2 0 0 0-44.544 148.864c18.944 53.568 71.488 90.112 129.664 90.24z"  horiz-adv-x="1024" />
@@ -1412,7 +1463,7 @@ Created by iconfont
     <glyph glyph-name="tianjiabiao" unicode="&#59063;" d="M480 320V442.88c0 20.48 14.336 37.12 32 37.12s32-16.64 32-37.12V320h122.88c20.48 0 37.12-14.336 37.12-32s-16.64-32-37.12-32H544v-122.88c0-20.48-14.336-37.12-32-37.12s-32 16.64-32 37.12V256H357.12C336.64 256 320 270.336 320 288s16.64 32 37.12 32H480z m128 448h-448v-756.992h704V493.76h-166.4a89.6 89.6 0 0 0-89.6 89.6V768z m64-48.192v-130.048a32 32 0 0 1 32-32h116.736L672 719.808z m-2.24 95.808l244.608-264.064a51.2 51.2 0 0 0 13.632-34.752v-505.792a64 64 0 0 0-64-64h-704a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h472.192a51.2 51.2 0 0 0 37.568-16.384z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="ABC" unicode="&#59064;" d="M550.656 640v-576h-76.8V640H256V704h512v-64H550.656z"  horiz-adv-x="1024" />
+    <glyph glyph-name="ABC" unicode="&#59064;" d="M800 704v-70.4h-256V0h-64V633.6h-256V704h576z"  horiz-adv-x="1024" />
 
     
     <glyph glyph-name="Sqlbiao" unicode="&#59065;" d="M832 482.816V64h-64v134.4c-11.456-4.096-23.872-6.4-36.928-6.4H568.96c-55.68 0-100.928 41.728-100.928 93.184V482.816C468.032 534.2719999999999 513.28 576 568.96 576h162.112C786.816 576 832 534.2719999999999 832 482.816zM896 704h64v-640h-64V704zM566.592 512c-19.072 0-34.56-13.696-34.56-30.656V286.72c0-16.96 15.488-30.656 34.56-30.656h166.912c19.008 0 34.496 13.696 34.496 30.656V481.28c0 16.96-15.488 30.656-34.56 30.656H566.656zM419.008 576v-61.952h-250.88c-19.2 0-34.752-13.888-34.752-30.976v-33.6c0-17.152 15.552-30.976 34.752-30.976H314.88c57.536 0 104.128-41.6 104.128-92.928v-40.64C419.008 233.60000000000002 372.416 192 314.88 192H64v61.952h250.88c19.2 0 34.688 13.888 34.688 30.976v40.64c0 17.088-15.488 30.976-34.688 30.976H168.128C110.592 356.48 64 398.08 64 449.472v33.6C64 534.4 110.592 576 168.128 576h250.88z"  horiz-adv-x="1024" />

src/base/list/virtuallist.js

@@ -114,7 +114,8 @@ BI.VirtualList = BI.inherit(BI.Widget, {
                 this.cache[i].destroyed = true;
             }
         }
-        var firstFragment = BI.Widget._renderEngine.createFragment(), lastFragment = BI.Widget._renderEngine.createFragment();
+        var firstFragment = BI.Widget._renderEngine.createFragment(),
+            lastFragment = BI.Widget._renderEngine.createFragment();
         var currentFragment = firstFragment;
         for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
             var index = this.cache[i].index;
@@ -131,9 +132,8 @@ BI.VirtualList = BI.inherit(BI.Widget, {
         }
         this.container.element.prepend(firstFragment);
         this.container.element.append(lastFragment);
-        this.topBlank.setHeight(this.cache[start < 0 ? 0 : start].scrollTop);
-        var lastCache = this.cache[Math.min(end, this.renderedIndex)];
-        this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - lastCache.scrollTop - lastCache.height);
+        this.topBlank.setHeight(this.tree.sumTo(Math.max(-1, start - 1)));
+        this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)));
         BI.each(needDestroyed, function (i, child) {
             child && child._destroy();
         });
@@ -146,7 +146,10 @@ BI.VirtualList = BI.inherit(BI.Widget, {
         }
         this.tree = BI.PrefixIntervalTree.empty(Math.ceil(o.items.length / o.blockSize));
         this._calculateBlocksToRender();
-        this.element.scrollTop(o.scrollTop);
+        try {
+            this.element.scrollTop(o.scrollTop);
+        } catch (e) {
+        }
     },
 
     _clearChildren: function () {

src/base/single/single.js

@@ -162,6 +162,10 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    setTipType: function (type) {
+        this.options.tipType = type;
+    },
+
     getTipType: function () {
         return this.options.tipType;
     },

src/base/tree/ztree/asynctree.js

@@ -68,6 +68,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
         }
 
         function beforeCheck (treeId, treeNode) {
+            // 下面主动修改了node的halfCheck属性, 节点属性的判断依赖halfCheck，改之前就获取一下
+            var status = treeNode.getCheckStatus();
             treeNode.halfCheck = false;
             if (treeNode.checked === true) {
                 // 将展开的节点halfCheck设为false，解决展开节点存在halfCheck=true的情况 guy
@@ -87,7 +89,6 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                     node.halfCheck = false;
                 });
             }
-            var status = treeNode.getCheckStatus();
             // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
             if (status.half === true && status.checked === true) {
                 treeNode.checked = false;

src/base/tree/ztree/treeview.js

@@ -181,6 +181,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
         }
 
         function beforeCheck (treeId, treeNode) {
+            // 下面主动修改了node的halfCheck属性, 节点属性的判断依赖halfCheck，改之前就获取一下
+            var status = treeNode.getCheckStatus();
             treeNode.halfCheck = false;
             if (treeNode.checked === true) {
                 // 将展开的节点halfCheck设为false，解决展开节点存在halfCheck=true的情况 guy
@@ -201,7 +203,6 @@ BI.TreeView = BI.inherit(BI.Pane, {
                     node.halfCheck = false;
                 });
             }
-            var status = treeNode.getCheckStatus();
             // 当前点击节点的状态是半选，且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
             if(status.half === true && status.checked === true) {
                 treeNode.checked = false;

src/case/button/node/node.multilayer.icon.arrow.js

@@ -46,10 +46,10 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 15),
-            items: [items]
+            items: items
         });
     },
 

src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@@ -48,10 +48,10 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         items.push(this.item);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 15),
-            items: [items]
+            items: items
         });
     },
 

src/case/colorchooser/colorchooser.js

@@ -19,6 +19,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
         BI.ColorChooser.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
 
+        o.value = o.value || "";
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
@@ -89,7 +90,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
     },
 
     setValue: function (color) {
-        this.combo.setValue(color);
+        this.combo.setValue(color || "");
     },
 
     getValue: function () {

src/case/colorchooser/colorchooser.popup.js

@@ -216,6 +216,8 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
     setStoreColors: function (colors) {
         if (BI.isArray(colors)) {
             this.storeColors.populate([this._digestStoreColors(colors)]);
+            // BI-66973 选中颜色的同时选中历史
+            this.storeColors.setValue(this.getValue());
         }
     },
 

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -67,7 +67,10 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     },
 
     _checkError: function (v) {
-        if(BI.isNotNull(v)) {
+        if(BI.isNull(v) || BI.isEmptyArray(v) || BI.isEmptyString(v)) {
+            this.trigger.options.tipType = "success";
+            this.element.removeClass("combo-error");
+        } else {
             v = BI.isArray(v) ? v : [v];
             var result = BI.find(this.options.items, function (idx, item) {
                 return BI.contains(v, item.value);

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -124,7 +124,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
     },
 
     _checkError: function (v) {
-        if(BI.isNotNull(v)) {
+        if(BI.isNull(v) || BI.isEmptyArray(v) || BI.isEmptyString(v)) {
+            this.trigger.options.tipType = "success";
+            this.element.removeClass("combo-error");
+        } else {
             v = BI.isArray(v) ? v : [v];
             var result = BI.find(this.options.items, function (idx, item) {
                 return BI.contains(v, item.value);

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -62,7 +62,10 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
     },
 
     _checkError: function (v) {
-        if(BI.isNotNull(v)) {
+        if(BI.isNull(v) || BI.isEmptyArray(v) || BI.isEmptyString(v)) {
+            this.trigger.options.tipType = "success";
+            this.element.removeClass("combo-error");
+        } else {
             v = BI.isArray(v) ? v : [v];
             var result = BI.find(this.options.items, function (idx, item) {
                 return BI.contains(v, item.value);

src/component/allvaluechooser/combo.allvaluechooser.js

@@ -62,7 +62,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
     populate: function (items) {
         // 直接用combo的populate不会作用到AbstractValueChooser上
         this.items = items;
-        this.combo.populate.apply(this, arguments);
+        this.combo.populate.apply(this.combo, arguments);
     }
 });
 BI.AllValueChooserCombo.EVENT_CONFIRM = "EVENT_CONFIRM";

src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js

@@ -51,7 +51,7 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, {
 
     populate: function (items) {
         this.options.items = items;
-        this.combo.populate.apply(this, arguments);
+        this.combo.populate.apply(this.combo, arguments);
     },
 
     _digestValue: function (v) {

src/component/treevaluechooser/combo.listtreevaluechooser.js

@@ -13,7 +13,8 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
             width: 200,
             height: 24,
             items: null,
-            itemsCreator: BI.emptyFn
+            itemsCreator: BI.emptyFn,
+            isNeedAdjustWidth: true,
         });
     },
 
@@ -25,6 +26,7 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
         }
         this.combo = BI.createWidget({
             type: "bi.multi_tree_list_combo",
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             element: this,
             text: o.text,
             value: o.value,

src/component/treevaluechooser/combo.treevaluechooser.insert.js

@@ -13,7 +13,8 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
             width: 200,
             height: 24,
             items: null,
-            itemsCreator: BI.emptyFn
+            itemsCreator: BI.emptyFn,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -25,6 +26,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_tree_insert_combo",
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             allowEdit: o.allowEdit,
             text: o.text,
             value: o.value,

src/component/treevaluechooser/combo.treevaluechooser.js

@@ -13,7 +13,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
             width: 200,
             height: 24,
             items: null,
-            itemsCreator: BI.emptyFn
+            itemsCreator: BI.emptyFn,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -34,6 +35,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
             valueFormatter: BI.bind(this._valueFormatter, this),
             width: o.width,
             height: o.height,
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             listeners: [{
                 eventName: BI.MultiTreeCombo.EVENT_FOCUS,
                 action: function () {

src/component/valuechooser/combo.valuechooser.insert.js

@@ -80,7 +80,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, {
     populate: function (items) {
         // 直接用combo的populate不会作用到AbstractValueChooser上
         this.items = items;
-        this.combo.populate.apply(this, arguments);
+        this.combo.populate.apply(this.combo, arguments);
     }
 });
 

src/component/valuechooser/combo.valuechooser.js

@@ -84,7 +84,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
     populate: function (items) {
         // 直接用combo的populate不会作用到AbstractValueChooser上
         this.items = items;
-        this.combo.populate.apply(this, arguments);
+        this.combo.populate.apply(this.combo, arguments);
     }
 });
 

src/core/base.js

@@ -459,6 +459,9 @@ if (!_global.BI) {
             while (BI.prepares && BI.prepares.length > 0) {
                 BI.prepares.shift()();
             }
+            while (_global.___fineuiExposedFunction && _global.___fineuiExposedFunction.length > 0) {
+                _global.___fineuiExposedFunction.shift()();
+            }
             BI.initialized = true;
         },
 

src/core/func/__test__/string.test.js

@@ -0,0 +1,19 @@
+/**
+ * @author windy
+ * @version 2.0
+ * Created by windy on 2020/6/5
+ */
+describe("dateFunctionTest", function () {
+
+    before(function () {
+
+    });
+
+    /**
+     * test_author_windy
+     */
+    it("getWeekNumber", function () {
+        expect(BI.replaceAll(null, "A", "b")).to.equal(null);
+        expect(BI.replaceAll("A", "A", "b")).to.equal("b");
+    });
+});

src/core/func/string.js

@@ -81,7 +81,7 @@ _.extend(BI, {
      * @returns {String} 替换后的字符串
      */
     replaceAll: function (str, s1, s2) {
-        return str.replace(new RegExp(s1, "gm"), s2);
+        return BI.isString(str) ? str.replace(new RegExp(s1, "gm"), s2) : str;
     },
     /**
      * 总是让字符串以指定的字符开头

src/core/inject.js

@@ -57,6 +57,10 @@
                 if (!providers[type]) {
                     providers[type] = new providerInjection[type]();
                 }
+                // 如果config被重新配置的话，需要删除掉之前的实例
+                if (providerInstance[type]) {
+                    delete providerInstance[type];
+                }
                 return configFn(providers[type]);
             }
             return BI.Plugin.configWidget(type, configFn);
@@ -74,6 +78,9 @@
                         if (!providers[type]) {
                             providers[type] = new providerInjection[type]();
                         }
+                        if (providerInstance[type]) {
+                            delete providerInstance[type];
+                        }
                         queue[i](providers[type]);
                         continue;
                     }
@@ -199,7 +206,9 @@
                 return stores[type];
             }
             var inst = stores[type] = new storeInjection[type](config);
-            inst._constructor && inst._constructor(config);
+            inst._constructor && inst._constructor(config, function () {
+                delete stores[type];
+            });
             callPoint(inst, type);
             return inst;
         }

src/core/plugin.js

@@ -3,13 +3,18 @@ BI.Plugin = BI.Plugin || {};
     var _WidgetsPlugin = {};
     var _ObjectPlugin = {};
     var _ConfigPlugin = {};
-    var _GlobalWidgetConfigFn, _GlobalObjectConfigFn;
+    var _GlobalWidgetConfigFns = [];
+    var __GlobalObjectConfigFns = [];
     BI.extend(BI.Plugin, {
 
         getWidget: function (type, options) {
-            if (_GlobalWidgetConfigFn) {
-                _GlobalWidgetConfigFn(type, options);
+            if (_GlobalWidgetConfigFns.length > 0) {
+                var fns = _GlobalWidgetConfigFns.slice(0);
+                for (var i = fns.length - 1; i >= 0; i--) {
+                    fns[i](type, options);
+                }
             }
+
             var res;
             if (_ConfigPlugin[type]) {
                 for (var i = _ConfigPlugin[type].length - 1; i >= 0; i--) {
@@ -30,8 +35,8 @@ BI.Plugin = BI.Plugin || {};
         },
 
         config: function (widgetConfigFn, objectConfigFn) {
-            _GlobalWidgetConfigFn = widgetConfigFn;
-            _GlobalObjectConfigFn = objectConfigFn;
+            _GlobalWidgetConfigFns = _GlobalWidgetConfigFns.concat(_.isArray(widgetConfigFn) ? widgetConfigFn : [widgetConfigFn]);
+            __GlobalObjectConfigFns = __GlobalObjectConfigFns.concat(_.isArray(objectConfigFn) ? objectConfigFn : [objectConfigFn]);
         },
 
         configWidget: function (type, fn) {
@@ -56,15 +61,19 @@ BI.Plugin = BI.Plugin || {};
         },
 
         getObject: function (type, object) {
-            if (_GlobalObjectConfigFn) {
-                _GlobalObjectConfigFn(type, object);
+            if (__GlobalObjectConfigFns.length > 0) {
+                var fns = __GlobalObjectConfigFns.slice(0);
+                for (var i = fns.length - 1; i >= 0; i--) {
+                    fns[i](type, object);
+                }
             }
+
             if (_ObjectPlugin[type]) {
                 var res;
                 for (var i = 0, len = _ObjectPlugin[type].length; i < len; i++) {
                     if (res = _ObjectPlugin[type][i](object)) {
                         object = res;
-                    };
+                    }
                 }
             }
             return res || object;
@@ -84,4 +93,4 @@ BI.Plugin = BI.Plugin || {};
             delete _ObjectPlugin[type];
         }
     });
-})();
+})();

src/less/lib/icon.less

@@ -54,4 +54,8 @@
 @icon-auto-disable: "icon/auto_disable.png";
 @icon-trans-normal: "icon/trans_normal.png";
 @icon-trans-select: "icon/trans_select.png";
-@icon-trans-disable: "icon/trans_disable.png";
+@icon-trans-disable: "icon/trans_disable.png";
+
+@icon-trans-normal-dark: "icon/dark/trans_normal.png";
+@icon-trans-select-dark: "icon/dark/trans_select.png";
+@icon-trans-disable-dark: "icon/dark/trans_disable.png";

src/less/resource/icon.less

@@ -14,50 +14,6 @@
 .icon(tree-vertical-line-type3, @icon-tree-vertical-line-3);
 .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4);
 
-.bi-theme-dark {
-  .icon(tree-collapse-icon-type1, @icon-tree-collapse-type1-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-collapse-icon-type2, @icon-tree-collapse-type2-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-collapse-icon-type3, @icon-tree-collapse-type3-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-collapse-icon-type4, @icon-tree-collapse-type4-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-expand-icon-type1, @icon-tree-expand-type1-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-expand-icon-type2, @icon-tree-expand-type2-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-expand-icon-type3, @icon-tree-expand-type3-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-expand-icon-type4, @icon-tree-expand-type4-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-vertical-line-type2, @icon-tree-vertical-line-2-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-vertical-line-type3, @icon-tree-vertical-line-3-theme-dark);
-}
-
-.bi-theme-dark {
-  .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4-theme-dark);
-}
-
 //CheckBox
 .icon_custom(check-box-icon, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-active, @icon-checkbox-disable, @icon-checkbox-active-disable);
 //Radio
@@ -72,3 +28,19 @@
 //颜色自动、透明
 .icon_select(auto-color-icon, @icon-auto-normal, @icon-auto-select, @icon-auto-disable);
 .icon_select(trans-color-icon, @icon-trans-normal, @icon-trans-select, @icon-trans-disable);
+
+.bi-theme-dark {
+  .icon(tree-collapse-icon-type1, @icon-tree-collapse-type1-theme-dark);
+  .icon(tree-collapse-icon-type2, @icon-tree-collapse-type2-theme-dark);
+  .icon(tree-collapse-icon-type3, @icon-tree-collapse-type3-theme-dark);
+  .icon(tree-collapse-icon-type4, @icon-tree-collapse-type4-theme-dark);
+  .icon(tree-expand-icon-type1, @icon-tree-expand-type1-theme-dark);
+  .icon(tree-expand-icon-type2, @icon-tree-expand-type2-theme-dark);
+  .icon(tree-expand-icon-type3, @icon-tree-expand-type3-theme-dark);
+  .icon(tree-expand-icon-type4, @icon-tree-expand-type4-theme-dark);
+  .icon(tree-vertical-line-type2, @icon-tree-vertical-line-2-theme-dark);
+  .icon(tree-vertical-line-type3, @icon-tree-vertical-line-3-theme-dark);
+  .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4-theme-dark);
+
+  .icon_select(trans-color-icon, @icon-trans-normal-dark, @icon-trans-select-dark, @icon-trans-disable-dark);
+}

src/router/router.js

@@ -486,6 +486,16 @@
             this.handlers.unshift({route: route, callback: callback});
         },
 
+        // remove a route match in routes
+        unRoute: function (route) {
+            var index = _.findIndex(this.handlers, function (handler) {
+                return handler.route.test(route);
+            });
+            if (index > -1) {
+                this.handlers.splice(index, 1);
+            }
+        },
+
         // Checks the current URL to see if it has changed, and if it has,
         // calls `loadUrl`, normalizing across the hidden iframe.
         checkUrl: function (e) {

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -18,7 +18,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             },
             allowEdit: false,
             allowSearchValue: false,
-            allowInsertValue: false
+            allowInsertValue: false,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -95,8 +96,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 },
                 value: o.value,
                 maxHeight: 400,
+                maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
                 minHeight: 240
             },
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             listeners: [{
                 eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                 action: function () {

src/widget/multilayerselecttree/node/node.first.plus.js

@@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayerselecttree/node/node.last.plus.js

@@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayerselecttree/node/node.mid.plus.js

@@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayerselecttree/node/node.plus.js

@@ -63,10 +63,10 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -21,7 +21,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             },
             allowEdit: false,
             allowSearchValue: false,
-            allowInsertValue: false
+            allowInsertValue: false,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -98,8 +99,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 },
                 value: o.value,
                 maxHeight: 400,
+                maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
                 minHeight: 240
             },
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             listeners: [{
                 eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                 action: function () {

src/widget/multilayersingletree/node/node.first.plus.js

@@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/node/node.last.plus.js

@@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/node/node.mid.plus.js

@@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/node/node.plus.js

@@ -40,10 +40,10 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         items.push(this.node);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/treeitem/item.first.treeleaf.js

@@ -63,10 +63,10 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         items.push(this.item);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/treeitem/item.last.treeleaf.js

@@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         items.push(this.item);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js

@@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         items.push(this.item);
         BI.createWidget({
-            type: "bi.td",
+            type: "bi.horizontal_adapt",
             element: this,
             columnSize: BI.makeArray(o.layer, 12),
-            items: [items]
+            items: items
         });
     },
 

src/widget/multiselect/search/multiselect.search.insert.pane.js

@@ -76,8 +76,9 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
     },
 
     setKeyword: function (keyword) {
+        var o = this.options;
         var hasSameValue = BI.some(this.loader.getAllButtons(), function (idx, btn) {
-            return keyword === btn.getValue();
+            return keyword === (o.valueFormatter(btn.getValue()) || btn.getValue());
         });
         var isMatchTipVisible = this.loader.getAllButtons().length > 0 && hasSameValue;
         this.tooltipClick.setVisible(isMatchTipVisible);

src/widget/multiselect/search/multiselect.search.pane.js

@@ -64,8 +64,8 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
     },
 
     setKeyword: function (keyword) {
-        var btn;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
+        var btn, o = this.options;
+        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === (o.valueFormatter(btn.getValue()) || btn.getValue()));
         if (isVisible !== this.tooltipClick.isVisible()) {
             this.tooltipClick.setVisible(isVisible);
             this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);

src/widget/multitree/multi.tree.combo.js

@@ -21,7 +21,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
             height: 24,
-            allowEdit: true
+            allowEdit: true,
+            isNeedAdjustWidth: true,
         });
     },
 
@@ -106,8 +107,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                         self.numberCounter.adjustView();
                         self.trigger.getSearcher().adjustView();
                     });
-                }
+                },
+                maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
             },
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             value: {value: o.value || {}},
             hideChecker: function (e) {
                 return triggerBtn.element.find(e.target).length === 0 &&

src/widget/multitree/multi.tree.insert.combo.js

@@ -21,7 +21,8 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
             height: 24,
-            allowEdit: true
+            allowEdit: true,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -121,8 +122,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
                         self.numberCounter.adjustView();
                         self.trigger.getSearcher().adjustView();
                     });
-                }
+                },
+                maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
             },
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             value: {value: o.value || {}},
             hideChecker: function (e) {
                 return triggerBtn.element.find(e.target).length === 0 &&

src/widget/multitree/multi.tree.list.combo.js

@@ -22,7 +22,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             valueFormatter: BI.emptyFn,
             height: 24,
             allowEdit: true,
-            allowInsertValue: true
+            allowInsertValue: true,
+            isNeedAdjustWidth: true
         });
     },
 
@@ -140,8 +141,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
                         self.numberCounter.adjustView();
                         self.trigger.getSearcher().adjustView();
                     });
-                }
+                },
+                maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
             },
+            isNeedAdjustWidth: o.isNeedAdjustWidth,
             value: {value: o.value || {}},
             hideChecker: function (e) {
                 return triggerBtn.element.find(e.target).length === 0 &&

src/widget/singleselect/search/singleselect.search.pane.insert.js

@@ -78,8 +78,9 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
     },
 
     setKeyword: function (keyword) {
+        var o = this.options;
         var hasSameValue = BI.some(this.loader.getAllButtons(), function (idx, btn) {
-            return keyword === btn.getValue();
+            return keyword === (o.valueFormatter(btn.getValue()) || btn.getValue());
         });
         var isMatchTipVisible = this.loader.getAllButtons().length > 0 && hasSameValue;
         this.tooltipClick.setVisible(isMatchTipVisible);

src/widget/singleselect/search/singleselect.search.pane.js

@@ -66,8 +66,8 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
     },
 
     setKeyword: function (keyword) {
-        var btn;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
+        var btn, o = this.options;
+        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === (o.valueFormatter(btn.getValue()) || btn.getValue()));
         if (isVisible !== this.tooltipClick.isVisible()) {
             this.tooltipClick.setVisible(isVisible);
             this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);

src/widget/singleselect/singleselectlist.insert.js

@@ -43,7 +43,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
         });
 
         this.searcherPane = BI.createWidget({
-            type: "bi.single_select_search_pane",
+            type: "bi.single_select_search_insert_pane",
             allowNoSelect: o.allowNoSelect,
             cls: "bi-border-left bi-border-right bi-border-bottom",
             valueFormatter: o.valueFormatter,
@@ -54,7 +54,20 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
                 op.keywords = [self.trigger.getKeyword()];
                 this.setKeyword(op.keywords[0]);
                 o.itemsCreator(op, callback);
-            }
+            },
+            listeners: [{
+                eventName: BI.SingleSelectSearchInsertPane.EVENT_ADD_ITEM,
+                action: function () {
+                    var keyword = self.trigger.getKeyword();
+                    if (!self.trigger.hasMatched()) {
+                        self.storeValue = keyword;
+                        self._showAdapter();
+                        self.adapter.setValue(self.storeValue);
+                        self.adapter.populate();
+                        self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE);
+                    }
+                }
+            }]
         });
         this.searcherPane.setVisible(false);
 
@@ -91,14 +104,19 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
                 eventName: BI.Searcher.EVENT_PAUSE,
                 action: function () {
                     var keyword = this.getKeyword();
-                    self.storeValue = keyword;
-                    self._showAdapter();
-                    self.adapter.setValue(self.storeValue);
-                    self._setStartValue(keyword);
-                    assertShowValue();
-                    self.adapter.populate();
-                    self._setStartValue();
-                    self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE);
+                    if (this.hasMatched()) {
+                        self.storeValue = keyword;
+                        self._showAdapter();
+                        self.adapter.setValue(self.storeValue);
+                        self._setStartValue(keyword);
+                        assertShowValue();
+                        self.adapter.populate();
+                        self._setStartValue();
+                        self.fireEvent(BI.SingleSelectInsertList.EVENT_CHANGE);
+                    } else {
+                        self._showAdapter();
+                    }
+
                 }
             }, {
                 eventName: BI.Searcher.EVENT_SEARCHING,
@@ -191,7 +209,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
             var selectedMap = self._makeMap(items);
             BI.each(keywords, function (i, val) {
                 if (BI.isNotNull(selectedMap[val])) {
-                    self.storeValue.type === BI.Selection.Single ? BI.pushDistinct(self.storeValue.value, val) : BI.remove(self.storeValue.value, val);
+                    BI.pushDistinct(self.storeValue.value, val)
                 }
             });
             callback();

src/widget/year/combo.year.js

@@ -1,7 +1,7 @@
 BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border bi-focus-shadow",
+        baseCls: "bi-year-combo bi-border bi-border-radius bi-focus-shadow",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期