Merge pull request #38245 in DEC/fineui from final/11.0 to persist/11.0

* commit '73b6cbed612a716353df4da0632badd82a948986': (120 commits)
  Pull request #2666: REPORT-70807 修复年份日期控件水印只显示无限制
  auto upgrade version to 2.0.20220505161347
  auto upgrade version to 2.0.20220505160323
  无JIRA任务 style: less引用不省略后缀，避免codesandbox中找不到
  auto upgrade version to 2.0.20220429160420
  auto upgrade version to 2.0.20220429155425
  feature: 布局
  feature: 布局
  feature: 布局
  auto upgrade version to 2.0.20220428190402
  auto upgrade version to 2.0.20220428185416
  无JIRA任务 路由支持base参数
  auto upgrade version to 2.0.20220427103402
  无JIRA 更新一下BI.broadcasts.remove 的写法. 因为on方法return了一个remove方法. 所以不能把fn作为predicate
  无JIRA 自动填充布局,flex fill 特性的补充
  auto upgrade version to 2.0.20220425223434
  无JIRA bi.search_editor 有初始值的时候显示清除按钮
  无JIRA bi.search_editor 有初始值的时候显示清除按钮
  无JIRA bi.search_editor 有初始值的时候显示清除按钮
  auto upgrade version to 2.0.20220425165306
  ...

bi.lessconfig.json

@@ -15,7 +15,7 @@
   "@color-bi-background-active-radio-content": "#2C60DB",
   "@color-bi-background-disabled-active-radio-content": "#D0D4DA",
   "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
-  "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA",
+  "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
   "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
   "@color-bi-background-tooltip-success": "#2E3A4D",
   "@color-bi-text-header-background": "#647185",

demo/js/config/widget.js

@@ -194,4 +194,12 @@ Demo.WIDGET_CONFIG = [{
     id: 420,
     text: "滚动sliders",
     value: "demo.slider"
+}, {
+    pId: 4,
+    id: 414,
+    text: "折叠面板"
+}, {
+    pId: 414,
+    text: "bi.collapse",
+    value: "demo.collapse"
 }];

demo/js/widget/collapase/API.md

@@ -0,0 +1,12 @@
+## API
+
+### bi.collapse
+
+| 参数       | 说明       | 类型    | 默认值               |
+| ---------- | ---------- | ------- | -------------------- |
+| accordion  | 手风琴模式 | boolean | false                |
+| bordered | 带边框风格的折叠面板 | boolean | true |
+| ghost | 使折叠面板透明且无边框 | boolean | false |
+| openMotion | 展开动画   | object  | { animation: "bi-slide-up", animationDuring: 100}
+| value | 初始化选中面板的 key | string\[] <br/> number\[] | - |
+| listeners | 监听切换面板事件 | [{eventName: "EVENT_EXPAND", action:(activeKey) => void}] | - |

demo/js/widget/collapase/demo.collapse.js

@@ -0,0 +1,59 @@
+Demo.Collapse = BI.inherit(BI.Widget, {
+  props: {
+    baseCls: "demo-collapse"
+  },
+
+  render: function () {
+    var self = this;
+    
+    var items = [{
+      value: "test",
+      popup: {
+          cls: "mvc-border",
+          items: BI.createItems([{
+              text: "项目1",
+              value: 1
+          }, {
+              text: "项目2",
+              value: 2
+          }, {
+              text: "项目3",
+              value: 3
+          }, {
+              text: "项目4",
+              value: 4
+          }], {
+              type: "bi.single_select_item",
+              height: 25
+          })
+      }
+    }, {
+      value: 2,
+      popup: {
+          type: "bi.label",
+          value: "给岁月以文明，而不是给文明以岁月"
+      }
+    }, {
+      value: 3,
+      popup: {
+          type: "bi.label",
+          value: "漂流瓶隐没于黑暗里，在一千米见方的宇宙中，只有生态球里的小太阳发出一点光芒。在这个小小的生命世界中，几只清澈的水球在零重力环境中静静地飘浮着，有一条小鱼从一只水球中蹦出，跃入另一只水球，轻盈地穿游于绿藻之间。"
+      }
+    }];
+    
+    return {
+      type: "bi.vertical",
+      items: [{
+        type: "bi.collapse",
+        accordion: true,
+        items: items,
+        value: [2],
+      }],
+      width: '60%',
+      tgap: 100,
+      hgap: 100
+    };
+  }
+});
+
+BI.shortcut("demo.collapse", Demo.Collapse);

demo/less/face.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 
 .demo-face {
   .face-config {

demo/less/index.less

@@ -1 +1 @@
-@import "../../src/less/index";
+@import "../../src/less/index.less";

demo/less/main.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 .layout-bg-white {
   background-color: #ffffff;
 }

demo/less/north.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 
 .demo-north {
   background-color: #3c8dbc;

demo/less/preview.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 
 .demo-preview {
 }

demo/less/vm.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 
 .mvc-button {
   &:hover, &.hover {

demo/less/west.less

@@ -1,4 +1,4 @@
-@import "index";
+@import "index.less";
 
 .demo-west {
 }

dist/font/iconfont.svg

@@ -14,6 +14,74 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="xiazaimoban" unicode="&#59581;" d="M896 294.4a38.4 38.4 0 0 0 38.4-38.4v-256a38.4 38.4 0 0 0-38.4-38.4H128a38.4 38.4 0 0 0-38.4 38.4v256a38.4 38.4 0 1 0 76.8 0v-217.6h691.2V256a38.4 38.4 0 0 0 38.4 38.4zM512 768a38.4 38.4 0 0 0 38.4-38.4v-472.32l115.52 115.456a38.4 38.4 0 0 0 54.4-54.272l-181.12-181.056a38.4 38.4 0 0 0-54.4 0l-181.12 181.056a38.4 38.4 0 1 0 54.4 54.272L473.6 257.28V729.6A38.4 38.4 0 0 0 512 768z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="xuqiufankui" unicode="&#59582;" d="M879.552 405.504l52.416-36.672a64 64 0 0 0 15.68-89.152l-208-297.088a64 64 0 0 0-32.512-24.064l-91.2-29.888a32 32 0 0 0-41.984 29.376l-3.136 95.936a64 64 0 0 0 11.52 38.784l208 297.088a64 64 0 0 0 89.216 15.68zM864 832a64 64 0 0 0 64-64v-288a32 32 0 1 0-64 0V768h-704v-768H512a32 32 0 1 0 0-64H160a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h704z m-21.184-478.912l-208-297.088 1.728-53.248 50.688 16.576 208 297.088-52.416 36.672zM416 256a32 32 0 1 0 0-64h-128a32 32 0 1 0 0 64h128z m128 192a32 32 0 0 0 0-64h-256a32 32 0 0 0 0 64h256z m192 192a32 32 0 1 0 0-64h-448a32 32 0 0 0 0 64h448z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="guanlianneirong" unicode="&#59583;" d="M896 576a64 64 0 0 0 64-64v-512a64 64 0 0 0-64-64H384a64 64 0 0 0-64 64v96a32 32 0 1 0 64 0V0h512V512H384v-160a32 32 0 0 0-64 0V512a64 64 0 0 0 64 64h512zM128 192a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h512a64 64 0 0 0 64-64v-96a32 32 0 1 0-64 0V768H128v-512h512V416a32 32 0 1 0 64 0V256a64 64 0 0 0-64-64H128z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="quxiaoshoucang" unicode="&#59584;" d="M340.736 1.792a96 96 0 0 0-139.328 101.184l32.768 190.72L95.552 428.8a96 96 0 0 0 53.248 163.84l191.488 27.776 85.632 173.504a96 96 0 0 0 172.16 0l85.632-173.44 191.488-27.904a96 96 0 0 0 53.248-163.712L789.76 293.76l32.768-190.72a96 96 0 0 0-139.328-101.248L512 91.84l-171.264-90.048z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shoucang1" unicode="&#59585;" d="M512 164.16l201.024-105.728a32 32 0 0 1 46.464 33.728l-38.4 223.872 162.624 158.592a32 32 0 0 1-17.728 54.592l-224.768 32.64-100.48 203.712a32 32 0 0 1-57.408 0L382.72 561.856l-224.768-32.64a32 32 0 0 1-17.728-54.592l162.624-158.592-38.4-223.872a32 32 0 0 1 46.464-33.728L512 164.16z m-171.264-162.368a96 96 0 0 0-139.328 101.184l32.768 190.72L95.552 428.8a96 96 0 0 0 53.248 163.84l191.488 27.776 85.632 173.504a96 96 0 0 0 172.16 0l85.632-173.44 191.488-27.904a96 96 0 0 0 53.248-163.712L789.76 293.76l32.768-190.72a96 96 0 0 0-139.328-101.248L512 91.84l-171.264-90.048z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shuaxin2" unicode="&#59586;" d="M196.352 355.52a320 320 0 0 1 521.472-217.92l-29.44 36.352a32 32 0 0 0 19.712 51.776l144.96 23.616a32 32 0 0 0 34.944-43.2l-53.248-136.896a32 32 0 0 0-54.656-8.512l-22.08 27.2-5.12-4.352a384 384 0 0 0-620.224 266.112 32 32 0 1 0 63.68 5.824zM509.888 768a384 384 0 0 0 375.68-348.544 32 32 0 1 0-63.744-5.76 320 320 0 0 1-521.472 217.92l29.44-36.48a32 32 0 0 0-19.712-51.648l-144.96-23.68a32 32 0 0 0-34.944 43.2l53.248 136.896a32 32 0 0 0 54.656 8.512l22.08-27.136 5.12 4.288a382.528 382.528 0 0 0 244.608 82.432z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="ruhezhizuo" unicode="&#59587;" 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 m-0.384-576c18.112 0 33.856-5.952 46.208-17.792 11.52-11.904 18.176-27.136 18.176-45.76A62.784 62.784 0 0 0 511.616 64a63.488 63.488 0 0 0-45.44 18.624C453.76 94.528 448 109.76 448 128.448c0 18.624 5.76 33.92 18.176 45.76a62.72 62.72 0 0 0 45.44 17.792z m8.064 448c45.44 0 82.432-12.352 110.4-38.528 27.968-25.472 41.92-60.352 41.92-104.768 0-36.352-9.088-66.176-25.856-89.408a142.08 142.08 0 0 0-5.44-5.888l-8.768-8.704c-10.432-10.176-25.728-24.576-45.888-42.88-12.544-10.88-21.632-23.296-27.904-36.352a106.24 106.24 0 0 1-10.496-47.296V256H467.2v10.24c0 27.52 4.224 51.584 14.016 71.232 9.088 19.648 36.288 50.176 81.728 92.352l8.32 10.176c12.608 16 18.944 33.472 18.944 51.648 0 24-7.04 42.88-19.584 56.704-13.248 13.824-32.128 20.352-55.872 20.352-30.72 0-52.48-9.408-65.728-29.824-11.84-16.64-17.408-40.704-17.408-71.232H352c0 53.76 14.72 96 45.44 126.528C427.456 624.704 467.968 640 519.68 640z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="binghangqushu" unicode="&#59580;" d="M576 832a64 64 0 0 0 64-64v-96a32 32 0 0 0-64 0V768H128v-768h448v96a32 32 0 1 0 64 0V0a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h448z m221.12-472.32a12.8 12.8 0 0 0 6.592-1.792l154.24-92.16a12.8 12.8 0 0 0 0-22.016l-154.24-92.16a12.8 12.8 0 0 0-19.392 10.88v60.288h-384.64a32 32 0 1 0 0 64h384.64v60.16c0 7.04 5.76 12.8 12.8 12.8z m0 258.56a12.8 12.8 0 0 0 6.592-1.792l154.24-92.16a12.8 12.8 0 0 0 0-22.016l-154.24-92.16a12.8 12.8 0 0 0-19.392 10.944v60.288h-384.64a32 32 0 0 0 0 64h384.64v60.16c0 7.04 5.76 12.8 12.8 12.8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="xiayi" unicode="&#59569;" d="M864 832A96 96 0 0 0 960 736v-704a96 96 0 0 0-96-96h-704A96 96 0 0 0 64 32v704A96 96 0 0 0 160 832z m0-64h-704a32 32 0 0 1-32-32v-704a32 32 0 0 1 32-32h704a32 32 0 0 1 32 32v704a32 32 0 0 1-32 32zM512 640.32a32 32 0 0 0 32-32v-394.688l169.92 161.536 4.544 3.584a32 32 0 0 0 39.616-49.92l-190.08-180.672-3.2-2.56c-32.832-25.344-81.92-23.104-111.872 5.312l-187.008 177.92-3.84 4.352a32 32 0 0 0 48 41.984L480 213.44v394.88a32 32 0 0 0 32 32z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shangyi" unicode="&#59568;" d="M864 832A96 96 0 0 0 960 736v-704a96 96 0 0 0-96-96h-704A96 96 0 0 0 64 32v704A96 96 0 0 0 160 832z m0-64h-704a32 32 0 0 1-32-32v-704a32 32 0 0 1 32-32h704a32 32 0 0 1 32 32v704a32 32 0 0 1-32 32zM564.8 622.72l3.2-2.56 190.08-180.672a32 32 0 0 0-39.616-49.92l-4.48 3.584L544 554.688V160a32 32 0 1 0-64 0V554.88L310.08 393.152a32 32 0 0 0-48 42.048l3.84 4.288 187.008 177.92c29.888 28.416 79.04 30.656 111.872 5.312z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="ziduanshezhi1" unicode="&#59567;" d="M618.816 839.168a269.632 269.632 0 0 1-30.976-56.96H113.792v-284.416h528.256c21.76-23.232 47.616-42.56 76.416-56.96l-92.8 0.064v-113.792h227.648v85.76c19.648 0.96 38.72 4.096 56.96 9.024v-436.096c0-31.424-25.536-56.96-56.96-56.96H113.792a56.896 56.896 0 0 0-56.96 56.96V782.208c0 31.424 25.536 56.96 56.96 56.96h505.024zM341.312 99.584H113.792v-113.792h227.52v113.792z m512 0H625.728v-113.792h227.584v113.792z m-512 170.688H113.792v-113.856l227.52 0.064V270.272z m284.416 0v-113.792h227.584V270.144l-227.584 0.064zM341.312 440.96H113.728v-113.792h227.584V440.96z m538.88 397.184l1.28-0.576c2.752-1.088 9.6-4.16 21.632-10.944 15.936-9.088 21.632-13.824 21.632-13.824a24.32 24.32 0 0 0 7.04-23.68l-1.92-5.632a58.368 58.368 0 0 1 6.336-43.392 59.776 59.776 0 0 1 34.688-27.072l5.952-1.28a24.448 24.448 0 0 0 17.28-17.856h0.128s1.28-7.104 1.28-25.408c0-18.176-1.28-25.28-1.28-25.28a24.448 24.448 0 0 0-17.28-17.792l-5.568-1.408a59.712 59.712 0 0 1-35.008-27.136 58.176 58.176 0 0 1-6.4-43.2l1.792-5.76a24.32 24.32 0 0 0-7.04-23.68s-5.568-4.672-21.568-13.76c-15.872-9.024-22.912-11.52-22.912-11.52a24.768 24.768 0 0 0-24.256 5.76l-3.904 4.224a60.544 60.544 0 0 1-82.688 0l-4.032-4.096a24.896 24.896 0 0 0-24.256-5.888s-6.848 2.496-22.848 11.584a153.6 153.6 0 0 0-21.568 13.824 24.128 24.128 0 0 0-7.04 23.68l1.664 5.44a58.368 58.368 0 0 1-6.4 43.456 59.456 59.456 0 0 1-34.88 27.2l-5.76 1.28A24.32 24.32 0 0 0 627.2 643.2s-1.024 5.44-1.28 19.008l-0.064 6.272c0 18.24 1.28 25.344 1.28 25.344a24.448 24.448 0 0 0 17.28 17.792l5.76 1.344a58.624 58.624 0 0 1 41.28 70.4l-1.728 5.76a23.872 23.872 0 0 0 7.04 23.552s5.568 4.736 21.504 13.888c16 8.96 22.912 11.52 22.912 11.52a24.768 24.768 0 0 0 24.32-5.76l4.032-4.352a60.16 60.16 0 0 1 41.216-16.192 59.904 59.904 0 0 1 41.088 16l4.16 4.48a24.768 24.768 0 0 0 24.256 5.76zM810.688 741.12c-40.768 0-73.728-32.512-73.728-72.704 0-40.192 33.024-72.704 73.728-72.704 40.64 0 73.6 32.512 73.6 72.704 0 40.192-32.96 72.704-73.6 72.704z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhizuojuzhong" unicode="&#59559;" d="M321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512zM64 272v224a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-224a8 8 0 0 0-8-8H72a8 8 0 0 0-8 8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhidingbujuzhong" unicode="&#59560;" d="M624 752h-224a8 8 0 0 0-8 8V824a8 8 0 0 0 8 8h224a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8zM321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhiyoujuzhong" unicode="&#59561;" d="M321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512zM880 272v224a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-224a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhiyoujushang" unicode="&#59562;" d="M321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512zM880 472V696a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-224a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhidibujuzhong" unicode="&#59563;" d="M321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512zM624-64h-224a8 8 0 0 0-8 8v64a8 8 0 0 0 8 8h224a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhizuojushang" unicode="&#59564;" d="M64 472V696a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-224a8 8 0 0 0-8-8H72a8 8 0 0 0-8 8zM321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhidingbujuzuo" unicode="&#59565;" d="M424 752H200a8 8 0 0 0-8 8V824a8 8 0 0 0 8 8h224a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8zM321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-weizhidibujuzuo" unicode="&#59566;" d="M321.856 309.212l40.192-40.2a8 8 0 0 1 11.316-0.004l91.984 91.952a8 8 0 0 0 8.924 1.644l97.144-43.46a8 8 0 0 1 8.928 1.648l125.948 126.036a8 8 0 0 1 0 11.312l-40.192 40.2a8 8 0 0 1-11.312 0.004l-89.156-89.124a8.008 8.008 0 0 0-8.924-1.644l-97.148 43.46a7.996 7.996 0 0 1-8.924-1.648l-128.78-128.864a8 8 0 0 1 0-11.312zM200 64a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-624a8 8 0 0 0-8-8H200z m56 64h512V638.908L256 640v-512zM424-64H200a8 8 0 0 0-8 8v64a8 8 0 0 0 8 8h224a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typeguanlixitongstatefocused" unicode="&#59557;" d="M890.744 464.116c-16.572 1.484-66.916 12.288-80.116 41.04-11.484 25.04 7.544 60.424 25.544 85.632l7.34 10.356a8 8 0 0 1-0.728 10.132l-99.94 105.252a8 8 0 0 1-10.6 0.896l-10.928-8.192c-14.972-11.264-64-40.416-91.944-27.096-22.4 10.632-28.572 49.104-29.772 79.4l-0.6 14.788A8 8 0 0 1 591.004 784h-157.988a8 8 0 0 1-7.996-7.696l-0.564-14.768c-1.2-30.296-7.372-68.768-29.772-79.4-27.884-13.32-76.968 15.832-92 27.096l-10.928 8.188a8 8 0 0 1-10.6-0.892L181.268 611.276a8 8 0 0 1-0.72-10.132l7.336-10.356c17.944-25.152 36.972-60.48 25.544-85.572-13.084-28.756-62.344-39.444-80.172-41.16l-13.984-1.276A8 8 0 0 1 112 454.812v-141.624a8 8 0 0 1 7.272-7.968l13.984-1.276c17.828-1.716 67.088-12.404 80.172-41.16 11.428-25.036-7.6-60.364-25.544-85.572l-7.324-10.296a8 8 0 0 1 0.716-10.144l99.868-105.284a8 8 0 0 1 10.616-0.888l10.924 8.228c15.032 11.26 64.116 40.356 92 27.096 22.4-10.692 28.572-49.104 29.772-79.46l0.564-14.768a8 8 0 0 1 7.996-7.696H512v218.18c-100.212 0.028-181.792 81.556-181.792 181.816 0 100.22 81.612 181.82 181.848 181.82 83.624 0 154.244-56.8 175.356-133.816H912v22.832a8 8 0 0 1-7.252 7.964l-14.004 1.32zM576 336a8 8 0 0 0 8 8h240a8 8 0 0 0 8-8v-112a8 8 0 0 0-8-8h-240a8 8 0 0 0-8 8v112zM576 104a8 8 0 0 0 8 8h320a8 8 0 0 0 8-8v-112a8 8 0 0 0-8-8h-320a8 8 0 0 0-8 8v112z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typegonggongshujustatefocused" unicode="&#59558;" d="M112 600a8 8 0 0 0 8 8h264v-268H120a8 8 0 0 0-8 8V600zM112 244a8 8 0 0 0 8 8h264v-268H120a8 8 0 0 0-8 8v252zM912 600a8 8 0 0 1-8 8H384v-268h520a8 8 0 0 1 8 8V600zM912 244a8 8 0 0 1-8 8H384v-268h520a8 8 0 0 1 8 8v252zM112 776a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-72a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V776zM468 512a8 8 0 0 0 8 8h340a8 8 0 0 0 8-8v-76a8 8 0 0 0-8-8h-340a8 8 0 0 0-8 8V512zM468 156a8 8 0 0 0 8 8h340a8 8 0 0 0 8-8v-76a8 8 0 0 0-8-8h-340a8 8 0 0 0-8 8v76z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typemulustatefocused" unicode="&#59555;" d="M200 648v-88h88V648H200zM152 736c-24.5 0-40-15.5-40-40v-184c0-24.5 15.5-40 40-40h184c24.5 0 40 15.664 40 40.164V696c0 24.5-15.5 40-40 40H152zM424.028 728a8 8 0 0 0 8 8H904a8 8 0 0 0 8-8v-72a8 8 0 0 0-8-8H432.028a8 8 0 0 0-8 8V728zM424.028 288.388a8 8 0 0 0 8 8H904a8 8 0 0 0 8-8v-72a8 8 0 0 0-8-8H432.028a8 8 0 0 0-8 8v72zM200 208v-88h88v88H200z m-48 88c-24.5 0-40-15.5-40-40v-184c0-24.5 15.5-40 40-40h184c24.5 0 40 15.668 40 40.168V256c0 24.5-15.5 40-40 40H152zM424 552a8 8 0 0 0 8 8h296a8 8 0 0 0 8-8v-72a8 8 0 0 0-8-8h-296a8 8 0 0 0-8 8V552zM424 112a8 8 0 0 0 8 8h296a8 8 0 0 0 8-8v-72a8 8 0 0 0-8-8h-296a8 8 0 0 0-8 8v72z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typewodefenxistatefocused" unicode="&#59556;" d="M795.66 628.5l-273.364-182.244-275.796 91.932 26.984 80.956 236.204-78.736 238.636 159.092 47.336-71zM112 412a8 8 0 0 0 8 8h152a8 8 0 0 0 8-8v-288a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8v288zM744 496a8 8 0 0 0 8 8h152a8 8 0 0 0 8-8v-372a8 8 0 0 0-8-8h-152a8 8 0 0 0-8 8v372zM112 60a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-68a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8v68zM428 324a8 8 0 0 0 8 8h152a8 8 0 0 0 8-8v-200a8 8 0 0 0-8-8h-152a8 8 0 0 0-8 8v200zM280 592c0-46.392-37.608-84-84-84s-84 37.608-84 84 37.608 84 84 84 84-37.608 84-84zM594.668 504c0-46.392-37.612-84-84-84-46.392 0-84 37.608-84 84s37.608 84 84 84c46.388 0 84-37.608 84-84zM912 700c0-46.392-37.608-84-84-84s-84 37.608-84 84 37.608 84 84 84 84-37.608 84-84z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="jinyongshoushi1" unicode="&#59554;" d="M341.12-60.16l-4.48 4.224a120.96 120.96 0 0 0-3.52 3.84l-3.392 3.84-6.336 8.32-183.552 262.144a128 128 0 0 0 172.928 181.888l7.168-4.928L320 736A128 128 0 0 0 438.4 863.68L448 864a128 128 0 0 0 128-128L575.936 559.36l225.664-12.096a96 96 0 0 0 90.88-91.712l-0.064-9.28-3.328-60.672c-1.216-21.76-26.368-34.112-46.144-24.96a29.76 29.76 0 0 0-17.856 28.16l3.392 60.8a32 32 0 0 1-30.272 33.792l-225.664 12.032A64 64 0 0 0 512 559.36V736a64 64 0 1 1-128 0v-527.872l-86.848 124.16a64 64 0 1 1-104.896-73.344l183.552-262.144a62.72 62.72 0 0 1 10.24-11.392l8.448-9.152c5.824-5.248 13.44-8.256 21.504-8.256l109.184-0.064c6.976 0 13.504-3.2 18.112-8.448 15.616-17.856 3.648-55.552-20.096-55.552L416-96c-29.44 0-56.768 13.44-74.88 35.84zM928 128a192 192 0 1 1-384 0 192 192 0 0 1 384 0z m-226.24-123.392l123.968 214.72a128 128 0 0 0-123.968-214.656zM608 128a128 128 0 0 0 162.24 123.392l-123.968-214.72A127.616 127.616 0 0 0 608 128z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="kaiqishoushi1" unicode="&#59553;" d="M878.592-5.312l25.088 450.88a96.192 96.192 0 0 1-90.752 101.76L587.264 559.36V736a128 128 0 0 1-128 128l-9.536-0.32A128 128 0 0 1 331.328 736l-0.064-336.832-7.232 4.928a128 128 0 0 1-172.864-181.888l183.552-262.144 6.272-8.32 6.976-7.68 4.864-4.544-1.92 2.304c18.048-23.68 46.08-37.824 76.416-37.824h355.456a96 96 0 0 1 95.808 90.688z m-38.784 455.104l-25.088-451.584a32 32 0 0 0-32-30.208H427.392a31.808 31.808 0 0 0-21.504 8.32l-8.448 9.088a62.848 62.848 0 0 0-10.24 11.392L203.52 258.944a64 64 0 0 0 104.832 73.408l86.848-124.16V736a64 64 0 1 0 128 0v-176.64a64 64 0 0 1 60.608-63.936l225.664-11.968a32 32 0 0 0 30.272-33.664z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="guding1" unicode="&#59545;" d="M571.391963 213.312427l-22.271986-307.263808A36.991977 36.991977 0 0 0 512-127.99936a36.991977 36.991977 0 0 0-37.119977 34.047979l-22.399986 307.263808H130.752238a34.431978 34.431978 0 0 0-34.687978 34.175978V315.712363c0 18.879988 15.55199 34.175979 34.687978 34.175978h54.399966c22.975986 76.799952 64.76796 143.103911 118.911926 191.167881V759.488085h-34.687978a34.431978 34.431978 0 0 0-34.623979 34.111979V861.888021c0 18.815988 15.48799 34.111979 34.623979 34.111979h485.375696c19.135988 0 34.623978-15.29599 34.623979-34.111979V793.600064a34.431978 34.431978 0 0 0-34.623979-34.111979h-34.687978v-218.495863c54.143966-47.99997 95.99994-114.303929 118.975926-191.167881h54.399966c19.071988 0 34.623978-15.23199 34.623978-34.111978v-68.223958a34.431978 34.431978 0 0 0-34.687978-34.175978h-321.919799z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="quxiaoguding" unicode="&#59552;" d="M632.768 853.568l348.8-348.8c13.76-13.76 13.952-35.904 0.384-49.472l-19.904-19.84L781.056 582.4l-0.064-148.096-0.768-0.128a448 448 0 0 1-105.856-23.936C575.36 373.76 512 300.8 512 190.528c0-104.512 70.528-192.704 171.584-232.96l-43.52-43.52a34.944 34.944 0 0 0-49.472 0.384l-231.36 231.36-236.864-204.8a37.632 37.632 0 0 0-51.2 2.176 37.632 37.632 0 0 0-2.176 51.2l204.8 236.864L42.368 462.592A34.944 34.944 0 0 0 42.048 512l49.088 49.088a34.944 34.944 0 0 0 49.408-0.384l39.104-39.04c71.744 38.656 149.504 56.256 222.912 51.84l156.992 156.992-24.96 24.96a34.944 34.944 0 0 0-0.384 49.408l49.088 49.088a34.944 34.944 0 0 0 49.472-0.384zM775.616 0l-14.72 2.048a270.08 270.08 0 0 0-15.168 3.072l10.24-2.176a268.672 268.672 0 0 0-14.912 3.2l4.672-1.024a264.704 264.704 0 0 0-18.368 4.864l13.696-3.84a263.296 263.296 0 0 0-17.152 4.928l3.456-1.088a259.136 259.136 0 0 0-12.608 4.224l9.152-3.2a257.088 257.088 0 0 0-15.872 5.76l6.72-2.56a253.568 253.568 0 0 0-14.784 5.888l8.064-3.392a241.28 241.28 0 0 0-39.168 19.584l-11.904 7.936-2.048 1.536C606.592 80.896 576 132.48 576 190.528c0 124.224 108.48 164.224 188.928 177.024l18.048 2.56 16.448 1.728h0.448l13.632 0.96 2.048 0.128 16.768 0.64h1.472l11.264 0.064V448l63.808-51.84H908.8l37.056-30.016 78.144-63.36-178.944-144.128v87.296c-10.56 0-24.32 0-39.616-0.96l-1.152-0.064-2.816-0.192-9.856-0.832-3.584-0.384-2.304-0.256a329.088 329.088 0 0 1-10.112-1.28l-4.48-0.64a278.592 278.592 0 0 1-26.752-5.76 205.184 205.184 0 0 1-22.784-7.68 152.512 152.512 0 0 1-20.288-10.432l-0.832-0.512c-27.712-17.6-47.616-45.696-47.616-90.88 0-30.336 12.608-58.24 33.6-80.32l1.408-1.344a122.368 122.368 0 0 1 13.44-12.096 171.712 171.712 0 0 1 17.792-12.032 172.48 172.48 0 0 1 28.16-12.992 171.84 171.84 0 0 1 11.072-3.456l5.568-1.408 0.832-0.192c3.584-0.896 7.232-1.6 10.88-2.24z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="chajianxinxi" unicode="&#59551;" d="M452.650667 853.333333a163.242667 163.242667 0 0 0 162.986666-154.88l0.256-8.362666-0.384-10.453334-0.213333-3.413333-0.426667-4.181333-0.768-6.101334a162.773333 162.773333 0 0 0-8.106666-32l-0.426667-1.024h112.725333a85.333333 85.333333 0 0 0 85.333334-85.333333v-112.64a163.242667 163.242667 0 1 0 0-305.92V0a85.333333 85.333333 0 0 0-85.333334-85.333333H170.666667a85.333333 85.333333 0 0 0-85.333334 85.333333L85.333333 140.58666700000003a163.242667 163.242667 0 1 1 0 282.752L85.333333 547.626667a85.333333 85.333333 0 0 0 85.333334 85.333333h129.024l-0.426667 0.981333-1.536 4.437334 1.578667-4.394667-2.56 7.594667-1.109334 3.626666a162.090667 162.090667 0 0 0-2.602666 10.496l-1.024 5.12-0.981334 6.101334-0.170666 1.024a163.541333 163.541333 0 0 0-0.853334 8.234666l-0.298666 3.413334A163.242667 163.242667 0 0 0 452.608 853.333333z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="gongnengdian" unicode="&#59550;" d="M659.797333-0.0426670000000513A170.581333 170.581333 0 0 0 512-85.33333300000004a170.581333 170.581333 0 0 0-147.797333 85.290666h295.594666zM512 725.333333a298.666667 298.666667 0 0 0 170.709333-543.744L682.666667 128a85.333333 85.333333 0 0 0-85.333334-85.333333h-170.666666a85.333333 85.333333 0 0 0-85.333334 85.333333v53.546667A298.666667 298.666667 0 0 0 512 725.333333z m15.146667-79.573333a29.866667 29.866667 0 1 1 0-59.733333 140.8 140.8 0 0 0 140.8-140.8 29.866667 29.866667 0 1 1 59.733333 0 200.533333 200.533333 0 0 1-200.533333 200.533333z m433.194666-140.032a29.866667 29.866667 0 0 0-20.266666-33.621333l-3.968-0.981334-59.050667-10.410666a29.866667 29.866667 0 0 0-14.336 57.856l3.968 0.981333 59.050667 10.410667a29.866667 29.866667 0 0 0 34.602666-24.234667z m-866.133333 24.661333l4.053333-0.426666 59.050667-10.410667a29.866667 29.866667 0 0 0-6.314667-59.306667l-4.053333 0.426667-59.050667 10.453333a29.866667 29.866667 0 0 0 6.314667 59.264z m164.437333 244.266667l2.816-2.944 38.528-45.909333a29.866667 29.866667 0 0 0-42.922666-41.344l-2.816 2.944-38.570667 45.952a29.866667 29.866667 0 0 0 42.965333 41.301333z m546.005334 0.768a29.866667 29.866667 0 0 0 6.058666-38.826667l-2.389333-3.242666-38.570667-45.952a29.866667 29.866667 0 0 0-48.128 35.114666l2.389334 3.285334 38.528 45.909333a29.866667 29.866667 0 0 0 42.112 3.712zM512 881.92a29.866667 29.866667 0 0 0 29.610667-25.813333l0.256-4.053334v-59.989333a29.866667 29.866667 0 0 0-59.477334-4.053333l-0.256 4.053333V852.053333a29.866667 29.866667 0 0 0 29.866667 29.866667z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="gongchengxinxi" unicode="&#59549;" d="M938.666667 768a42.666667 42.666667 0 0 0 42.666666-42.666667v-597.333333a42.666667 42.666667 0 0 0-42.666666-42.666667H85.333333a42.666667 42.666667 0 0 0-42.666666 42.666667V725.333333a42.666667 42.666667 0 0 0 42.666666 42.666667h853.333334z m0-42.666667H85.333333v-554.666666h853.333334V725.333333z m-42.666667-42.666666v-469.333334H128V682.666667h768zM328.533333 0h366.933334a29.866667 29.866667 0 0 0 0-59.733333H328.533333a29.866667 29.866667 0 0 0 0 59.733333zM512 170.66666699999996a42.666667 42.666667 0 0 0 42.666667-42.666667v-128a42.666667 42.666667 0 0 0-85.333334 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shangwuxinxi" unicode="&#59548;" d="M298.666667 354.133333v-25.6a29.866667 29.866667 0 0 1 59.733333 0v25.6h307.285333v-25.6a29.866667 29.866667 0 0 1 25.813334-29.610666l4.053333-0.298667a29.866667 29.866667 0 0 1 29.866667 29.866667V354.133333H981.333333V42.66666699999996a85.333333 85.333333 0 0 0-85.333333-85.333334H128a85.333333 85.333333 0 0 0-85.333333 85.333334v311.466666h256z m341.333333 443.733334a115.2 115.2 0 0 0 114.986667-107.946667L755.2 682.666667v-42.666667H896a85.333333 85.333333 0 0 0 85.333333-85.333333v-140.8h-255.914666v25.6a29.866667 29.866667 0 0 1-25.813334 29.568l-4.053333 0.256a29.866667 29.866667 0 0 1-29.866667-29.866667v-25.557333H358.4v25.6a29.866667 29.866667 0 0 1-25.813333 29.610666L328.533333 469.333333a29.866667 29.866667 0 0 1-29.866666-29.866666v-25.6H42.666667V554.666667a85.333333 85.333333 0 0 0 85.333333 85.333333h140.8V682.666667a115.2 115.2 0 0 0 107.946667 114.986666L384 797.866667h256z m0-59.733334H384a55.466667 55.466667 0 0 1-55.168-49.792L328.533333 682.666667v-42.666667h366.933334V682.666667A55.466667 55.466667 0 0 1 640 738.133333z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="kehuxinxi" unicode="&#59547;" d="M636.714667 389.632c24.746667-4.266667 53.162667-9.301333 84.992-15.146667a256 256 0 0 0 205.738666-205.994666l26.453334-145.578667A128 128 0 0 0 827.946667-128H196.053333a128 128 0 0 0-125.952 150.912l26.453334 145.578667a256 256 0 0 0 205.738666 205.994666c31.829333 5.845333 60.16 10.88 85.077334 15.104A340.053333 340.053333 0 0 1 384 341.33333300000004c0-92.885333 35.626667-171.904 85.333333-201.173333V256h85.333334v-115.882667c49.706667 29.269333 85.333333 108.288 85.333333 201.216 0 16.64-1.152 32.768-3.285333 48.298667zM512 401.664l60.330667-42.496L512 281.002667l-60.330667 78.165333L512 401.664zM512 896a234.666667 234.666667 0 1 0 0-469.333333 234.666667 234.666667 0 0 0 0 469.333333z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="zhucexinxi1" unicode="&#59546;" d="M810.666667 264.53333299999997a34.133333 34.133333 0 0 0 34.133333-34.133333v-102.357333l102.4-0.042667a34.133333 34.133333 0 1 0 0-68.266667l-102.4 0.042667V-42.66666699999996a34.133333 34.133333 0 1 0-68.266667 0v102.442667l-102.4-0.042667a34.133333 34.133333 0 1 0 0 68.266667l102.4 0.042667V230.39999999999998a34.133333 34.133333 0 0 0 34.133334 34.133333zM896 725.333333a85.333333 85.333333 0 0 0 85.333333-85.333333v-393.642667A234.666667 234.666667 0 0 1 613.973333-42.66666699999996L128-42.66666699999996a85.333333 85.333333 0 0 0-85.333333 85.333334V640a85.333333 85.333333 0 0 0 85.333333 85.333333h768zM396.8 213.33333300000004H200.533333a29.866667 29.866667 0 0 1-4.053333-59.477333l4.053333-0.256h196.266667a29.866667 29.866667 0 0 1 0 59.733333z m170.666667 170.666667H200.533333a29.866667 29.866667 0 0 1-4.053333-59.477333l4.053333-0.256h366.933334a29.866667 29.866667 0 0 1 0 59.733333z m170.666666 170.666667H200.533333a29.866667 29.866667 0 0 1-4.053333-59.477334L200.533333 494.933333h537.6a29.866667 29.866667 0 0 1 0 59.733334z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tuichuxiezuo" unicode="&#59544;" d="M910.628 396.404a16 16 0 0 0 0-22.628l-209.94-209.944a8 8 0 0 0-11.316 0l-39.596 39.6a8 8 0 0 0 0 11.312L783.028 348H348a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8H785.2l-135.428 135.432a8 8 0 0 0 0 11.312l39.596 39.6a8 8 0 0 0 11.316 0l209.94-209.94zM540.972 512a8 8 0 0 1 8 8V776a8 8 0 0 1-8 8H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h412.972a8 8 0 0 1 8 8v256a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-184a8 8 0 0 0-8-8H192a8 8 0 0 0-8 8V704a8 8 0 0 0 8 8h276.972a8 8 0 0 0 8-8v-184a8 8 0 0 1 8-8h56z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="tishi" unicode="&#59718;" d="M468 120a16 16 0 0 1 16-16h56a16 16 0 0 1 16 16v304a16 16 0 0 1-16 16h-56a16 16 0 0 1-16-16v-304zM448 600c0-35.348 28.652-64 64-64s64 28.652 64 64-28.652 64-64 64-64-28.652-64-64zM960 384c0 247.424-200.576 448-448 448S64 631.424 64 384s200.576-448 448-448 448 200.576 448 448z m-64 0c0-212.076-171.924-384-384-384-212.08 0-384 171.924-384 384 0 212.08 171.92 384 384 384 212.076 0 384-171.92 384-384z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="tupian" unicode="&#59717;" d="M880 784a32 32 0 0 0 31.984-31L912 752v-736a32 32 0 0 0-31.004-31.984L880-16H144a32 32 0 0 0-31.984 31.004L112 16V752a32 32 0 0 0 31 31.984L144 784h736z m-32-340.568L618.568 214l166-166H840a8 8 0 0 1 7.98 7.404L848 56v387.432z m-536-20l-136-137.368V56a8 8 0 0 1 8-8h503.432L312 423.432zM840 720H184a8 8 0 0 1-7.98-7.4L176 712v-327.432l113.372 113.372a32 32 0 0 0 44.448 0.78l0.808-0.78L572 260.568l276 276V712a8 8 0 0 1-7.404 7.98L840 720zM640 524c0-37.556-30.444-68-68-68s-68 30.444-68 68 30.444 68 68 68 68-30.444 68-68z"  horiz-adv-x="1024" />
@@ -78,12 +146,6 @@
       
       <glyph glyph-name="a-qitazujianleixingtupianzujian" unicode="&#59666;" d="M72 832a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8V824a8 8 0 0 1-8 8H72zM64-8a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H72a8 8 0 0 0-8 8v48zM904-64a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-48zM960 776a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8V824a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-48zM187.2 824a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V824zM366.4 824a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V824zM545.6 824a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V824zM724.8 824a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V824zM952 708.8a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48zM952 529.6a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48zM952 350.4a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48zM952 171.2a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48zM836.8-56a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48zM657.6-56a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48zM478.4-56a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48zM299.2-56a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-48zM72 59.2a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H72zM72 238.4a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H72zM72 417.6a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H72zM72 596.8a8 8 0 0 0-8 8v96a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H72zM258.68 555.432A80 80 0 1 1 371.816 668.56 80 80 0 0 1 258.68 555.432zM652.216 80a8 8 0 0 0-7.192 4.496l-145.68 299.124a8 8 0 0 0 0.14 7.28l108.832 203.152c3.096 5.784 11.452 5.584 14.272-0.34l239.18-502.272a8 8 0 0 0-7.224-11.44h-202.328zM388.596 452.432c2.92 5.996 11.464 5.996 14.384 0l175.776-360.928a8 8 0 0 0-7.192-11.504H220.012a8 8 0 0 0-7.196 11.504l175.78 360.928z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="a-leixingliebiaozhanshi" unicode="&#59688;" d="M112 696a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-256a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V696z m288-64H192c-6.592 0-10.356-7.528-6.4-12.8l104-138.668a8 8 0 0 1 12.8 0l104 138.668c3.956 5.276 0.192 12.8-6.4 12.8zM112 328a8 8 0 0 0 8 8h784a8 8 0 0 0 8-8v-256a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8v256z m288-64H192c-6.592 0-10.356-7.528-6.4-12.8l104-138.668a8 8 0 0 1 12.8 0l104 138.668c3.956 5.272 0.192 12.8-6.4 12.8z"  horiz-adv-x="1024" />
-      
-      <glyph glyph-name="a-leixingduoliezhanshi" unicode="&#59689;" d="M112 72a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8V696a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-624zM408 312a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8V696a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8v-384zM712 224a8 8 0 0 1-8-8v-144a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v144a8 8 0 0 1-8 8h-192zM408 216a8 8 0 0 0 8 8h192a8 8 0 0 0 8-8v-144a8 8 0 0 0-8-8h-192a8 8 0 0 0-8 8v144zM712 464a8 8 0 0 1-8-8v-144a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v144a8 8 0 0 1-8 8h-192zM704 696a8 8 0 0 0 8 8h192a8 8 0 0 0 8-8v-144a8 8 0 0 0-8-8h-192a8 8 0 0 0-8 8V696z"  horiz-adv-x="1024" />
-      
-      <glyph glyph-name="a-leixingshuzhuangzhanshi" unicode="&#59690;" d="M64 696a8 8 0 0 0 8 8h256a8 8 0 0 0 8-8v-140a8 8 0 0 0-8-8H228v-136h188v44a8 8 0 0 0 8 8h480a8 8 0 0 0 8-8v-140a8 8 0 0 0-8-8H424a8 8 0 0 0-8 8v40H228v-188h188v44a8 8 0 0 0 8 8h480a8 8 0 0 0 8-8v-140a8 8 0 0 0-8-8H424a8 8 0 0 0-8 8v40H180a8 8 0 0 0-8 8V548H72a8 8 0 0 0-8 8V696zM424 704a8 8 0 0 1-8-8v-140a8 8 0 0 1 8-8h480a8 8 0 0 1 8 8V696a8 8 0 0 1-8 8H424z"  horiz-adv-x="1024" />
-      
       <glyph glyph-name="yindao1" unicode="&#59687;" d="M460 824a8 8 0 0 0 8 8h88a8 8 0 0 0 8-8v-88h201.256a8 8 0 0 0 4.912-1.684l133.712-104a8 8 0 0 0 0-12.632l-133.712-104a8 8 0 0 0-4.912-1.684H564v-128h292a8 8 0 0 0 8-8v-208a8 8 0 0 0-8-8h-292v-216a8 8 0 0 0-8-8h-88a8 8 0 0 0-8 8v216H258.744a8 8 0 0 0-4.912 1.684l-133.712 104a8 8 0 0 0 0 12.632l133.712 104a8 8 0 0 0 4.912 1.684H460V512H168a8 8 0 0 0-8 8V728a8 8 0 0 0 8 8h292V824z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="a-kejianoff" unicode="&#59685;" d="M442.892 236.98l-27.048-101.24a8.004 8.004 0 0 0-9.808-5.66l-55.912 15.044a8 8 0 0 0-5.652 9.792l27.024 101.228a405.736 405.736 0 0 0-119.62 69.388l-73.9-74.156a8 8 0 0 0-11.332-0.004l-40.992 41.12a8 8 0 0 0 0 11.296l73.968 74.16a406.66 406.66 0 0 0-86.128 180.1 7.88 7.88 0 0 0 6.352 9.28l22.052 4.052a8.064 8.064 0 0 0 6.14-1.38A624.096 624.096 0 0 1 512 453.528c135.66 0 261.264 43.144 363.968 116.48a8.06 8.06 0 0 0 6.128 1.376l22.052-4.028a7.88 7.88 0 0 0 6.36-9.28 406.684 406.684 0 0 0-86.092-180.128l73.932-74.16c3.116-3.12 3.116-8.172 0-11.296l-40.992-41.12a8 8 0 0 0-11.332 0.004l-73.9 74.156a405.736 405.736 0 0 0-119.62-69.388l27.024-101.264a8 8 0 0 0-5.656-9.788l-55.912-15.016a7.996 7.996 0 0 0-9.8 5.66l-27.056 101.244a407.8 407.8 0 0 0-138.212 0z"  horiz-adv-x="1024" />
@@ -96,8 +158,6 @@
       
       <glyph glyph-name="huifuquanxianjicheng" unicode="&#59499;" d="M856 784a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16h-264v64h216V720H216v-336H152V768a16 16 0 0 0 16 16h688zM744 620a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H280a8 8 0 0 0-8 8V612a8 8 0 0 0 8 8h464zM280.36 421.38a8 8 0 0 0 0.084 11.312l34.188 33.692a8 8 0 0 0 11.312-0.08l169.452-171.944a8 8 0 0 0 0-11.228l-175.064-177.64-39.888 39.308a8 8 0 0 0-0.08 11.316l97.2 98.628H280c-57.44 0-104-46.56-104-104 0-57.436 46.56-104 104-104h224a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H280c-92.784 0-168 75.216-168 168s75.216 168 168 168h101.508L280.36 421.38zM752 448a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v56zM744 292a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-192a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h192z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="a-liandongon" unicode="&#59683;" d="M841.984 713.984c-98.932 98.932-259.332 98.932-358.264 0h-0.004l-0.008-0.012h-0.004l-0.004-0.008-0.008-0.008-0.008-0.004-0.004-0.008-0.008-0.004-0.004-0.008-0.008-0.008-0.008-0.008-0.008-0.008-0.036-0.036-0.012-0.008-0.012-0.012-0.008-0.012-0.012-0.012-0.08-0.08-0.016-0.016-0.396-0.396-76.664-76.664a16 16 0 0 1 0-22.624l33.94-33.944a16 16 0 0 1 22.628 0l76.824 76.824 0.02 0.02 0.216 0.216 0.096 0.096 0.012 0.012 0.012 0.012 0.008 0.008 0.048 0.048 0.008 0.008 0.008 0.008 0.008 0.008 0.004 0.008 0.008 0.004 0.004 0.008h0.008l0.008 0.012 0.004 0.004 0.012 0.012h0.004c67.688 67.692 177.44 67.696 245.128 0 67.692-67.688 67.692-177.436 0-245.128l-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.024-0.024-0.008-0.008-0.004-0.004-0.008-0.008-0.008-0.008-0.012-0.012-0.008-0.008-0.008-0.008-0.012-0.012-0.008-0.008-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.016-0.016-0.012-0.012-0.016-0.016-0.028-0.028-0.084-0.084-0.02-0.02-0.016-0.016-0.02-0.02-0.04-0.04-0.132-0.132-0.02-0.02-0.176-0.176-0.056-0.056-0.084-0.084-0.028-0.028-0.032-0.032-0.028-0.028-0.74-0.74-0.04-0.04-75.528-75.528a16 16 0 0 1 0-22.628l33.94-33.94a15.996 15.996 0 0 1 22.628 0l75.528 75.528 0.04 0.04 0.828 0.828 0.084 0.084 0.056 0.056 0.176 0.172 0.024 0.024 0.128 0.132 0.04 0.04 0.02 0.016 0.016 0.02 0.02 0.02 0.052 0.052 0.016 0.016 0.016 0.016 0.028 0.028 0.016 0.016 0.016 0.012 0.012 0.016 0.012 0.012 0.012 0.012 0.016 0.012 0.008 0.012 0.012 0.012 0.012 0.012 0.012 0.008 0.008 0.012 0.008 0.008 0.012 0.008 0.008 0.008 0.008 0.012 0.008 0.004 0.004 0.008 0.008 0.008 0.024 0.02 0.004 0.004 0.004 0.004 0.004 0.004v0.004l0.004 0.004 0.004 0.004c98.936 98.932 98.936 259.336 0 358.268zM333.812 239.752a15.996 15.996 0 0 0 0 22.624l299.812 299.816a16 16 0 0 0 22.628 0l33.94-33.944a16 16 0 0 0 0-22.624l-299.812-299.816a16 16 0 0 0-22.628 0l-33.944 33.944zM540.284 54.016c-98.936-98.932-259.336-98.932-358.268 0-98.932 98.932-98.932 259.336 0 358.268v0.004l0.012 0.012 0.004 0.004 0.008 0.004v0.004l0.008 0.004 0.008 0.008 0.004 0.004 0.008 0.008 0.048 0.048 0.18 0.184 0.016 0.016 77.012 77.012a16 16 0 0 0 22.628 0l33.944-33.944a16 16 0 0 0 0-22.628l-77.18-77.176-0.012-0.012-0.06-0.06-0.008-0.008-0.008-0.008-0.02-0.02-0.004-0.004-0.004-0.004-0.004-0.004-0.008-0.008-0.004-0.004c-67.692-67.692-67.692-177.44 0-245.132 67.692-67.688 177.44-67.688 245.128 0l56.572-56.568zM483.712 110.584l0.004 0.004 0.008 0.004v0.004l0.008 0.008 0.004 0.004 0.024 0.024 0.004 0.004 0.008 0.008 0.008 0.008 0.016 0.016 0.012 0.008 0.008 0.012 0.064 0.064 0.016 0.012 0.012 0.016 0.012 0.012 0.016 0.016 0.012 0.012 0.032 0.032 0.016 0.016 0.016 0.016 0.016 0.016 0.152 0.152 0.02 0.02 0.024 0.02 0.02 0.024 0.024 0.02 0.168 0.172 0.024 0.024 0.028 0.028 0.028 0.028 0.028 0.024 0.028 0.028 0.028 0.028 1.02 1.024 0.044 0.04 0.172 0.176 0.044 0.044 0.932 0.932 0.052 0.052 0.056 0.056 0.052 0.052 74.052 74.052a16 16 0 0 0 22.628 0l33.94-33.94a16 16 0 0 0 0-22.628l-74.048-74.052-0.056-0.056-0.056-0.052-0.052-0.056-0.932-0.928-0.044-0.044-0.088-0.088-0.044-0.044-0.04-0.044-0.044-0.04-1.02-1.024-0.028-0.028-0.028-0.028-0.028-0.028-0.028-0.024-0.024-0.028-0.028-0.024-0.1-0.1-0.068-0.072-0.024-0.02-0.02-0.024-0.024-0.02-0.02-0.02-0.152-0.152-0.016-0.016-0.016-0.016-0.016-0.016-0.028-0.032-0.016-0.016-0.016-0.012-0.012-0.012-0.012-0.016-0.012-0.012-0.068-0.064-0.008-0.012-0.012-0.008-0.016-0.016-0.008-0.008-0.004-0.008-0.008-0.008-0.024-0.02-0.004-0.004-0.008-0.008v-0.004l-0.004-0.004-0.004-0.004-56.572 56.568z"  horiz-adv-x="1024" />
-      
       <glyph glyph-name="a-fangxiangxiangxia-1" unicode="&#59673;" d="M165.936 342.656a8 8 0 0 1 0-11.316l295.492-295.492 0.076-0.08 45.256-45.252a7.988 7.988 0 0 1 11.316 0l45.252 45.256 0.064 0.06 295.508 295.508a8 8 0 0 1 0 11.316l-45.256 45.252a8 8 0 0 1-11.312 0l-289.916-289.912-289.912 289.912a8 8 0 0 1-11.312 0l-45.256-45.252z m636.396 387.684a8 8 0 0 0 11.312 0l45.256-45.256a8 8 0 0 0 0-11.312l-295.508-295.508-0.06-0.064-45.256-45.252a7.988 7.988 0 0 0-11.316 0l-45.256 45.252-0.076 0.08-295.492 295.492a8 8 0 0 0 0 11.316l45.256 45.252a8 8 0 0 0 11.312 0l289.912-289.912 289.916 289.912z"  horiz-adv-x="1028" />
       
       <glyph glyph-name="a-fangxiangxiangyou-1" unicode="&#59674;" d="M530.192 13.944a8 8 0 0 1 11.316 0l295.492 295.492 0.076 0.08 45.256 45.252a8.004 8.004 0 0 1 0 11.316l-45.256 45.256-0.06 0.06-295.508 295.508a8 8 0 0 1-11.316 0l-45.256-45.256a8 8 0 0 1 0-11.312l289.916-289.912-289.916-289.916a8 8 0 0 1 0-11.312l45.256-45.256zM142.504 650.34a8 8 0 0 0 0 11.312L187.76 706.908a8 8 0 0 0 11.316 0l295.508-295.508 0.06-0.06 45.256-45.256a8 8 0 0 0 0-11.316l-45.256-45.252-0.076-0.08-295.492-295.492a8 8 0 0 0-11.316 0L142.508 59.2a8 8 0 0 0 0 11.312l289.912 289.916-289.916 289.912z"  horiz-adv-x="1028" />
@@ -200,7 +260,7 @@
       
       <glyph glyph-name="mimayuechi" unicode="&#59623;" d="M536.916 354.816c65.156-91.644 56.648-219.58-25.52-301.748-91.656-91.656-240.26-91.656-331.916 0s-91.656 240.26 0 331.916c81.86 81.86 209.144 90.608 300.716 26.248l368.952 368.952a8 8 0 0 0 11.312 0l45.256-45.256a8 8 0 0 0 0-11.316l-71.284-71.28 76.676-76.68a8 8 0 0 0 0-11.312L865.852 519.08a8 8 0 0 0-11.312 0l-76.676 76.68-58.668-58.672 129.648-129.648a8 8 0 0 0 0-11.312l-45.256-45.256a8 8 0 0 0-11.312 0l-129.652 129.648-125.708-125.708z m-300.868-245.18c60.416-60.412 158.364-60.412 218.78 0 60.416 60.416 60.416 158.364 0 218.78-60.412 60.416-158.364 60.416-218.78 0-60.412-60.416-60.412-158.364 0-218.78z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="zhuye_liebiao" unicode="&#59624;" d="M768 140.492a28.516 28.516 0 0 0-8.332-20.148 28.408 28.408 0 0 0-20.112-8.344H284.444a28.416 28.416 0 0 0-20.112 8.344A28.52 28.52 0 0 0 256 140.492v299.448a28.552 28.552 0 0 0 10.98 22.508l227.556 203.548a28.404 28.404 0 0 0 34.928 0l227.556-203.548a28.536 28.536 0 0 0 10.98-22.508v-299.448z m-64 276.856L512 592l-192-174.652V176h384v241.348zM128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m56-80a8 8 0 0 0 8 8h640a8 8 0 0 0 8-8v-640a8 8 0 0 0-8-8H192a8 8 0 0 0-8 8V704z"  horiz-adv-x="1024" />
+      <glyph glyph-name="zhuye_liebiao" unicode="&#59624;" d="M768 140.49199999999996a28.516 28.516 0 0 0-8.332-20.148 28.408 28.408 0 0 0-20.112-8.344H284.444a28.416 28.416 0 0 0-20.112 8.344A28.52 28.52 0 0 0 256 140.49199999999996v299.448a28.544 28.544 0 0 0 10.98 22.508l227.556 203.548a28.404 28.404 0 0 0 34.928 0l227.556-203.548a28.536 28.536 0 0 0 10.98-22.508v-299.448z m-64 276.856L512 592l-192-174.652V176h384v241.348zM128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m56-728V712h656v-656H184z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="shangbaobiaoqian" unicode="&#59625;" d="M516.696 621.656a8 8 0 0 0 0-11.312L348.832 442.48a8 8 0 0 0-11.312 0L229.656 550.344a8 8 0 0 0 0 11.312L263.6 595.6a8 8 0 0 0 11.316 0L337.52 532.984a8 8 0 0 1 11.312 0L471.44 655.6a8 8 0 0 0 11.316 0l33.94-33.94zM364.168 128a112 112 0 1 0 0 224 112 112 0 0 0 0-224z m0 64a47.992 47.992 0 0 1 48 48 48 48 0 1 1-48-48zM784 212a8 8 0 0 0-8-8h-208a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h208a8 8 0 0 0 8-8v-56zM776 492a8 8 0 0 1 8 8V556a8 8 0 0 1-8 8h-208a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h208zM128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m56-728V712h656v-656H184z"  horiz-adv-x="1024" />
       
@@ -228,7 +288,7 @@
       
       <glyph glyph-name="tubiaozhanshi" unicode="&#59576;" d="M552 632a8 8 0 0 1-8 8h-64a8 8 0 0 1-8-8v-496a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V632zM732 520a8 8 0 0 0 8-8v-376a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8V512a8 8 0 0 0 8 8h64zM364 388a8 8 0 0 1-8 8H292a8 8 0 0 1-8-8v-252a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v252zM128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m56-728V712h656v-656H184z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="tongjitubiao" unicode="&#59577;" d="M943.928 376a448.088 448.088 0 0 1-34.028 163.44A448.04 448.04 0 0 1 568 810.176a448.028 448.028 0 0 1-64 5.752c-4.416 0.08-8-3.508-8-7.928v-432a8 8 0 0 1 8-8h432a7.888 7.888 0 0 1 7.928 8z m-80.868 73.508c1.092-4.916-2.696-9.508-7.728-9.508H576a8 8 0 0 0-8 8V727.332c0 5.032 4.592 8.82 9.508 7.728a375.996 375.996 0 0 0 285.552-285.552zM96 368c0 199.128 145.508 364.276 336 394.908V689.76C281.488 659.988 168 527.248 168 368c0-181.148 146.852-328 328-328 159.248 0 291.988 113.488 321.76 264h73.148c-30.636-190.492-195.78-336-394.908-336-220.912 0-400 179.088-400 400z"  horiz-adv-x="1024" />
+      <glyph glyph-name="tongjitubiao" unicode="&#59577;" d="M943.928 376a448.088 448.088 0 0 1-34.028 163.44A448.04 448.04 0 0 1 568 810.176a448.028 448.028 0 0 1-64 5.752c-4.416 0.08-8-3.508-8-7.928v-432a8 8 0 0 1 8-8h432a7.888 7.888 0 0 1 7.928 8z m-100.548 135.888A375.956 375.956 0 0 0 865.04 440H568V737.04a375.968 375.968 0 0 0 193.872-103.168 375.988 375.988 0 0 0 81.508-121.984zM422.732 761.304c4.844 0.896 9.268-2.86 9.268-7.788v-57.184c0-3.82-2.716-7.1-6.444-7.916C278.26 656.1800000000001 168 524.9680000000001 168 368c0-181.148 146.852-328 328-328 156.968 0 288.18 110.26 320.416 257.552a8.152 8.152 0 0 0 7.916 6.448h57.188c4.924 0 8.68-4.428 7.784-9.268C854.888 108.80799999999999 691.888-32 496-32c-220.912 0-400 179.088-400 400 0 195.888 140.808 358.888 326.732 393.304z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="baobiaozhanshi" unicode="&#59578;" d="M680 56V712H184v-592c0-35.348 28.652-64 64-64h432z m232 8c0-44.184-35.816-80-80-80H192c-44.184 0-80 35.816-80 80V768a16 16 0 0 0 16 16h608a16 16 0 0 0 16-16v-296a8 8 0 0 1 8-8h136a16 16 0 0 0 16-16v-384z m-160 328v-292c0-24.3 19.7-44 44-44s44 19.7 44 44v292h-88zM272 608a16 16 0 0 0 16 16h208a16 16 0 0 0 16-16v-208a16 16 0 0 0-16-16H288a16 16 0 0 0-16 16V608z m72-56v-96h96V552H344z m-72-220a8 8 0 0 0 8 8h304a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H280a8 8 0 0 0-8 8v56z m0-120a8 8 0 0 0 8 8h304a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H280a8 8 0 0 0-8 8v56z"  horiz-adv-x="1024" />
       
@@ -250,7 +310,7 @@
       
       <glyph glyph-name="zhutifenxi" unicode="&#59619;" d="M912 768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-624a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768zM184 200V712h656v-512H184z m132-164a8 8 0 0 0 8 8h372a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H324a8 8 0 0 0-8 8v48z m42.576 429.988l-116.916-116.932a8 8 0 0 0-11.312 0l-33.944 33.936a8 8 0 0 0 0 11.316l114.648 114.664A107.496 107.496 0 0 0 296 564c0 59.648 48.352 108 108 108s108-48.352 108-108a107.496 107.496 0 0 0-17.612-59.132l65.984-65.984A107.504 107.504 0 0 0 612 452c16.58 0 32.292-3.736 46.332-10.416L778.344 561.6a8 8 0 0 0 11.312 0l33.944-33.944a8 8 0 0 0 0-11.312l-118.156-118.156A107.512 107.512 0 0 0 720 344c0-59.648-48.352-108-108-108s-108 48.352-108 108a107.56 107.56 0 0 0 11.736 49.012l-70.956 70.952A107.672 107.672 0 0 0 404 456c-16.224 0-31.616 3.58-45.424 9.988zM360 564c0-24.3 19.7-44 44-44s44 19.7 44 44-19.7 44-44 44-44-19.7-44-44z m252-176c-24.3 0-44-19.7-44-44s19.7-44 44-44 44 19.7 44 44-19.7 44-44 44z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="yichu" unicode="&#59571;" d="M264 416a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h496a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H264zM64 608a16 16 0 0 0 16 16h864a16 16 0 0 0 16-16v-448a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16V608z m64-56v-336a8 8 0 0 1 8-8h752a8 8 0 0 1 8 8V552a8 8 0 0 1-8 8H136a8 8 0 0 1-8-8z"  horiz-adv-x="1024" />
+      <glyph glyph-name="yichu" unicode="&#59571;" d="M264 416a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h496a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H264zM64 608a16 16 0 0 0 16 16h864a16 16 0 0 0 16-16v-448a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16V608z m64-48v-352h768V560H128z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="font-tip-error" unicode="&#57818;" d="M512-127.99099999999999a501.751 501.751 0 0 0-199.357 40 513.783 513.783 0 0 0-163.069 109.565 513.783 513.783 0 0 0-109.566 163.07A501.751 501.751 0 0 0 0.01 384a501.751 501.751 0 0 0 40 199.357 513.783 513.783 0 0 0 109.565 163.069 513.783 513.783 0 0 0 163.07 109.566A501.751 501.751 0 0 0 512 895.99a501.751 501.751 0 0 0 199.357-40 513.783 513.783 0 0 0 163.069-109.565 513.783 513.783 0 0 0 109.566-163.07A501.751 501.751 0 0 0 1023.99 384a501.751 501.751 0 0 0-40-199.357 513.783 513.783 0 0 0-109.565-163.069 513.783 513.783 0 0 0-163.07-109.566A501.751 501.751 0 0 0 512-127.99000000000001z m235.068 660.916a24.32 24.32 0 0 1 7.36 17.856 24.32 24.32 0 0 1-7.36 17.856l-52.927 51.647a23.616 23.616 0 0 1-34.432 0L512 472.638 363.075 620.284a23.616 23.616 0 0 1-34.432 0l-52.927-51.647a26.944 26.944 0 0 1-6.144-17.92c0-6.912 2.048-12.864 6.144-17.792l148.926-147.709-148.926-147.645a26.944 26.944 0 0 1-6.144-17.92c0-6.912 2.048-12.864 6.144-17.792l52.927-51.71a23.616 23.616 0 0 1 34.432 0L512 297.85699999999997l147.71-147.71a23.616 23.616 0 0 1 34.43 0l52.928 51.711a24.32 24.32 0 0 1 7.36 17.856 24.32 24.32 0 0 1-7.36 17.856L598.142 385.216l148.926 147.71z"  horiz-adv-x="1024" />
       
@@ -492,7 +552,7 @@
       
       <glyph glyph-name="sigongge_4" unicode="&#59403;" d="M120 784a8 8 0 0 1-8-8v-784a8 8 0 0 1 8-8h784a8 8 0 0 1 8 8V776a8 8 0 0 1-8 8H120z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="normal1" unicode="&#59067;" d="M128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m272-736V512h448v-464H400zM848 576H176V720h672v-144zM176 512h160v-464H176V512z"  horiz-adv-x="1024" />
+      <glyph glyph-name="normal1" unicode="&#59067;" d="M80 832a16 16 0 0 1-16-16v-864a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V816a16 16 0 0 1-16 16H80z m816-64v-216H128V768h768zM344 488v-488H128V488h216z m64-488V488h488v-488H408z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="xinxitongzhi" unicode="&#59252;" d="M336 496a8 8 0 0 0 8-8v-80a8 8 0 0 0-8-8H256a8 8 0 0 0-8 8v80a8 8 0 0 0 8 8h80zM552 496a8 8 0 0 0 8-8v-80a8 8 0 0 0-8-8h-80a8 8 0 0 0-8 8v80a8 8 0 0 0 8 8h80zM776 488a8 8 0 0 1-8 8h-80a8 8 0 0 1-8-8v-80a8 8 0 0 1 8-8h80a8 8 0 0 1 8 8v80zM120 800c-8.84 0-16-7.16-16-15.992v-679.66a15.996 15.996 0 0 1 16-15.992h162.22l132.376-118.32a8.016 8.016 0 0 1 8.156-1.524c0.408-0.064 0.824-0.096 1.248-0.096h48a8 8 0 0 1 8 8v111.94h424a16 16 0 0 1 16 15.992V784.008A16 16 0 0 1 904 800H120z m728-647.676H440a24 24 0 0 1-24-24v-73.728l-49.444 44.196-59.648 53.532h-2.328a7.98 7.98 0 0 1-2.096 0H176a8 8 0 0 0-8 7.996V728.0360000000001a8 8 0 0 0 8 7.996h672a8 8 0 0 0 8-7.996V160.32000000000005a8 8 0 0 0-8-7.996z"  horiz-adv-x="1024" />
       
@@ -534,7 +594,7 @@
       
       <glyph glyph-name="zhuxingtu_0" unicode="&#59410;" d="M664 640V776a8 8 0 0 0 8 8h232a8 8 0 0 0 8-8v-784a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8v384a8 8 0 0 0 8 8h176V504a8 8 0 0 0 8 8h176V632a8 8 0 0 0 8 8h176z m64 80v-672h120V720h-120z m-64-144h-120v-528h120V576z m-304-128v-400h120V448H360z m-64-128H176v-272h120v272z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="normal8" unicode="&#59074;" d="M80 832a16 16 0 0 1-16-16v-864a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V816a16 16 0 0 1-16 16H80z m56-64h208v-216H128V760a8 8 0 0 0 8 8z m-8-280h216v-208H128v208z m280 0h208v-208h-208v208z m272 0h216v-208h-216v208z m-64-272v-216h-208v216h208z m64-216v216h216v-208a8 8 0 0 0-8-8h-208z m0 552V768h208a8 8 0 0 0 8-8v-208h-216z m-64 216v-216h-208V768h208zM128 216h216v-216H136a8 8 0 0 0-8 8v208z"  horiz-adv-x="1024" />
+      <glyph glyph-name="normal8" unicode="&#59074;" d="M80 832a16 16 0 0 1-16-16v-864a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V816a16 16 0 0 1-16 16H80z m536-64v-216h-208V768h208z m64 0h216v-216h-216V768z m-64-280v-208h-208v208h208z m64-208v208h216v-208h-216z m-64-64v-216h-208v216h208z m64-216v216h216v-216h-216zM128 768h216v-216H128V768z m0-280h216v-208H128v208z m0-272h216v-216H128v216z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="neicunguanli" unicode="&#59259;" d="M384 444a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V636a8 8 0 0 1-8 8H392a8 8 0 0 1-8-8v-192zM672 436a8 8 0 0 0-8 8V636a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-192a8 8 0 0 0-8-8h-56zM524 444a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V636a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-192zM272 784a16 16 0 0 1-16-16v-302.88c0-3.424-1.096-6.752-3.128-9.504l-89.744-121.528a16 16 0 0 1-3.128-9.504V0a16 16 0 0 1 16-16h672a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H272z m56-80a8 8 0 0 0 8 8h448a8 8 0 0 0 8-8v-640a8 8 0 0 0-8-8H240a8 8 0 0 0-8 8v239.516c0 1.708 0.548 3.376 1.564 4.752l92.872 125.76c1.016 1.376 1.564 3.044 1.564 4.756V704z"  horiz-adv-x="1024" />
       
@@ -548,13 +608,13 @@
       
       <glyph glyph-name="normal10" unicode="&#59076;" d="M256 776a8 8 0 0 0 8 8h496a8 8 0 0 0 8-8v-136h184a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H72a8 8 0 0 0-8 8V632a8 8 0 0 0 8 8h184V776z m64-56v-80h384V720H320zM192 512h64v-456a8 8 0 0 1 8-8h496a8 8 0 0 1 8 8V512h64v-496a32 32 0 0 0-32-32H224a32 32 0 0 0-32 32V512z m192 0h64v-400H384V512z m256 0h-64v-400h64V512z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="denglu-youxiang" unicode="&#59261;" d="M128 696a16 16 0 0 1-16-16v-592a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V680a16 16 0 0 1-16 16H128z m48-100.736l184.248-182.2L176 222.572V595.264zM848 136H181.168c0.628 0.556 1.24 1.14 1.832 1.752l222.756 230.308 94.992-93.94a16.004 16.004 0 0 1 22.504 0l93.204 92.172 224.916-224.92A32.008 32.008 0 0 1 848 136.27999999999997v-0.28z m0 89.256l-186.036 186.036L848 595.264v-370.008zM794.132 632l-270.88-267.872a16.004 16.004 0 0 0-22.504 0L229.868 632h564.264z"  horiz-adv-x="1024" />
+      <glyph glyph-name="denglu-youxiang" unicode="&#59261;" d="M128 696a16 16 0 0 1-16-16v-592a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V680a16 16 0 0 1-16 16H128z m48-100.736l184.248-182.2L176 222.572V595.264zM848 136H181.168c0.628 0.556 1.24 1.14 1.832 1.752l222.756 230.308L512 262.996l104.456 103.296 224.916-224.92A32.008 32.008 0 0 1 848 136.27999999999997v-0.28z m0 89.256l-186.036 186.036L848 595.264v-370.008zM794.132 632L512 353.004 229.868 632h564.264z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="sigongge_3" unicode="&#59413;" d="M120 784a8 8 0 0 1-8-8v-784a8 8 0 0 1 8-8h784a8 8 0 0 1 8 8V776a8 8 0 0 1-8 8H120z m728-364h-300V720h300v-300z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="normal11" unicode="&#59077;" d="M500.688 781.256a15.996 15.996 0 0 0 22.624 0l215.6-215.6a8 8 0 0 0 0-11.312l-45.256-45.256a8 8 0 0 0-11.312 0L552 639.432V208a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8V639.432L341.656 509.088a8 8 0 0 0-11.312 0L285.088 554.344a8 8 0 0 0 0 11.312l215.6 215.6zM192 376a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-376a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16v376a8 8 0 0 1-8 8h-64a8 8 0 0 1-8-8v-304a8 8 0 0 0-8-8H200a8 8 0 0 0-8 8v304z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="denglu-shouji" unicode="&#59262;" d="M612 184h-200v-64a8 8 0 0 1 8-8h184a8 8 0 0 1 8 8v64zM220 788a16 16 0 0 0 16 16h552a16 16 0 0 0 16-16v-808a16 16 0 0 0-16-16H236a16 16 0 0 0-16 16V788z m80-56a8 8 0 0 1-8-8v-396h440V724a8 8 0 0 1-8 8H300z m-8-688a8 8 0 0 1 8-8h424a8 8 0 0 1 8 8v213.072a7.932 7.932 0 0 0-4-1.072H296c-1.456 0-2.824 0.388-4 1.072V44z"  horiz-adv-x="1024" />
+      <glyph glyph-name="denglu-shouji" unicode="&#59262;" d="M612 184h-200v-64a8 8 0 0 1 8-8h184a8 8 0 0 1 8 8v64zM220 788a16 16 0 0 0 16 16h552a16 16 0 0 0 16-16v-808a16 16 0 0 0-16-16H236a16 16 0 0 0-16 16V788z m72-56v-404h440V732H292z m0-696h440v221.072a7.932 7.932 0 0 0-4-1.072H296c-1.456 0-2.824 0.388-4 1.072V36z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="bujige" unicode="&#59414;" d="M605.964 255.86h236.216a73.8 73.8 0 0 1 52.2 21.636A73.888 73.888 0 0 1 916 329.72799999999995v77.708a73.976 73.976 0 0 1-5.536 28.144l-114.272 277.52A36.912 36.912 0 0 1 762.088 736H128a16 16 0 0 1-16-16v-411.208a16 16 0 0 1 16-16h141.428a36.888 36.888 0 0 0 30.152-15.62l201.268-285.352a18.44 18.44 0 0 1 23.324-5.872l66.956 33.536a92.324 92.324 0 0 1 42.656 44.184 92.412 92.412 0 0 1 5.508 61.188l-33.328 131.004zM324 351.44399999999996V672h413.36l104.82-264.564v-77.708h-236.216a73.776 73.776 0 0 1-58.268-28.532 73.88 73.88 0 0 1-13.264-63.544l33.332-131.04a18.504 18.504 0 0 0-1.096-12.248 18.496 18.496 0 0 0-8.54-8.844l-24.396-12.188-173.84 246.424c-9.228 13.072-22.492 23.784-35.892 31.688zM260 356H176V672h84v-316z"  horiz-adv-x="1024" />
       
@@ -656,7 +716,7 @@
       
       <glyph glyph-name="normal28" unicode="&#59094;" d="M747.204 283.60799999999995c8.38-10.476 0.924-25.996-12.492-25.996H289.292c-13.416 0-20.88 15.52-12.496 25.996l222.712 278.388a16 16 0 0 0 24.988 0l222.708-278.388z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="biaojiweiyidu" unicode="&#59267;" d="M912 513.088a15.992 15.992 0 0 1-6.124 12.588l-384 301.356a15.996 15.996 0 0 1-19.752 0l-384-301.36A16 16 0 0 1 112 513.092V0a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V513.088zM176 438.6l182.924-139.516L176 120.22000000000003V438.6zM193.68 48l307.136 300.308a15.996 15.996 0 0 0 22.368 0L830.32 48H193.68zM848 120.22000000000003l-186.42 182.28L848 444.532v-324.312z m-26.172 384.832l-206.496-157.332-92.148 90.096a15.996 15.996 0 0 1-22.368 0l-95.644-93.516L198.08 502.252l303.824 246.76a15.996 15.996 0 0 0 20.184-0.008l299.74-243.952z"  horiz-adv-x="1024" />
+      <glyph glyph-name="biaojiweiyidu" unicode="&#59267;" d="M912 511.728c0 4.884-2.228 9.5-6.056 12.536l-384 304.696a15.996 15.996 0 0 1-19.888 0l-384-304.696A16 16 0 0 1 112 511.728V0a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V511.728z m-87.436-4.592l-209.232-159.416L512 448.756l-106.828-104.456L195.632 504.12 512 755.152l312.564-248.016zM176 438.604l182.924-139.52L176 120.22000000000003v318.384zM193.68 48L512 359.244l96.956-94.8 0.984-1.292 0.188 0.144L830.32 48H193.68zM848 120.22000000000003l-186.42 182.28L848 444.532v-324.312z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="xia" unicode="&#59431;" d="M172.52 538.48C160.42 553.6 171.188 576 190.552 576h642.9c19.364 0 30.128-22.4 18.032-37.52l-321.448-401.812c-9.248-11.556-26.824-11.556-36.068 0L172.516 538.48z"  horiz-adv-x="1024" />
       
@@ -1072,7 +1132,7 @@
       
       <glyph glyph-name="xiala1" unicode="&#59288;" d="M512 832c247.424 0 448-200.576 448-448s-200.576-448-448-448S64 136.57600000000002 64 384 264.576 832 512 832z m0-68c-212.08 0-384-170.132-384-380s171.92-380 384-380c212.076 0 384 170.132 384 380s-171.924 380-384 380z m192.9-230.344l-192.992-192.996-193 193a8 8 0 0 1-11.312 0L262.348 488.4a8 8 0 0 1 0-11.316l243.244-243.244a7.976 7.976 0 0 1 6.32-2.316 7.968 7.968 0 0 1 6.316 2.316l243.248 243.244a8 8 0 0 1 0 11.316l-45.256 45.252a8 8 0 0 1-11.316 0z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="normal68" unicode="&#59165;" d="M880 784a32 32 0 0 0 31.984-31L912 752v-736a32 32 0 0 0-31.004-31.984L880-16H144a32 32 0 0 0-31.984 31.004L112 16V752a32 32 0 0 0 31 31.984L144 784h736z m-32-340.568L618.568 214l166-166H840a8 8 0 0 1 7.98 7.404L848 56v387.432z m-536-20l-136-137.368V56a8 8 0 0 1 8-8h503.432L312 423.432zM840 720H184a8 8 0 0 1-7.98-7.4L176 712v-327.432l113.372 113.372a32 32 0 0 0 44.448 0.78l0.808-0.78L572 260.568l276 276V712a8 8 0 0 1-7.404 7.98L840 720zM640 524c0-37.556-30.444-68-68-68s-68 30.444-68 68 30.444 68 68 68 68-30.444 68-68z"  horiz-adv-x="1024" />
+      <glyph glyph-name="normal68" unicode="&#59165;" d="M572 456c37.556 0 68 30.444 68 68s-30.444 68-68 68-68-30.444-68-68 30.444-68 68-68zM911.984 768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16l-0.016 768z m-293.416-554L848 443.432V48h-63.432l-166 166zM176 286.06399999999996l136 137.368L687.432 48H176v238.064zM176 720l672-0.02v-183.412l-276-276-237.372 237.372-0.808 0.78a32 32 0 0 1-44.448-0.78L176 384.568V720z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="chexiao" unicode="&#59289;" d="M265.844 582.06l139.468 140.92a16 16 0 0 1-0.116 22.628l-34.12 33.764a16 16 0 0 1-22.624-0.12L122.86 551.3199999999999a16 16 0 0 1 0-22.512l225.592-227.94a16 16 0 0 1 22.628-0.116l34.116 33.764a16 16 0 0 1 0.116 22.628l-143.424 144.92h369.488c112.192 0 200.624-87.324 200.624-192s-88.432-192-200.624-192H175.748a16 16 0 0 1-16-16v-48a16 16 0 0 1 16-16h455.628c153.596 0 280.624 120.412 280.624 272 0 151.584-127.028 272-280.624 272H265.844z"  horiz-adv-x="1024" />
       
@@ -1130,7 +1190,7 @@
       
       <glyph glyph-name="a-bianzu18" unicode="&#59509;" d="M576 528a16 16 0 0 1 16-16h304a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16h-304a16 16 0 0 1-16-16v-100H284a16 16 0 0 1-16-16v-132H128a16 16 0 0 1-16-16v-240a16 16 0 0 1 16-16h140v-132a16 16 0 0 1 16-16h292v-100a16 16 0 0 1 16-16h304a16 16 0 0 1 16 16v240a16 16 0 0 1-16 16h-304a16 16 0 0 1-16-16v-76H332v84h140a16 16 0 0 1 16 16V504a16 16 0 0 1-16 16H332V604h244v-76z m264 56h-192V712h192v-128z m-424-264H184v128h232v-128z m232-264v128h192v-128h-192z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="normal77" unicode="&#59174;" d="M653.696 353.024l-151.552-151.616a32 32 0 1 0-45.312 45.248l149.696 149.696H493.696a32 32 0 0 0 0 64h192a32 32 0 0 0 32-32v-192a32 32 0 0 0-64 0V353.024zM864-32h-576a64 64 0 0 0-64 64v576a64 64 0 0 0 64 64h576a64 64 0 0 0 64-64v-576a64 64 0 0 0-64-64z m0 640h-576v-576h576v576z m-192 224a32 32 0 1 0 0-64H128v-544a32 32 0 1 0-64 0V768a64 64 0 0 0 64 64h544z"  horiz-adv-x="1024" />
+      <glyph glyph-name="normal77" unicode="&#59174;" d="M841.984 713.984c-98.932 98.932-259.332 98.932-358.264 0h-0.004l-0.008-0.012h-0.004l-0.004-0.008-0.008-0.008-0.008-0.004-0.004-0.008-0.008-0.004-0.004-0.008-0.008-0.008-0.008-0.008-0.008-0.008-0.036-0.036-0.012-0.008-0.012-0.012-0.008-0.012-0.012-0.012-0.08-0.08-0.016-0.016-0.396-0.396-76.664-76.664a16 16 0 0 1 0-22.624l33.94-33.944a16 16 0 0 1 22.628 0l76.824 76.824 0.02 0.02 0.216 0.216 0.096 0.096 0.012 0.012 0.012 0.012 0.008 0.008 0.048 0.048 0.008 0.008 0.008 0.008 0.008 0.008 0.004 0.008 0.008 0.004 0.004 0.008h0.008l0.008 0.012 0.004 0.004 0.012 0.012h0.004c67.688 67.692 177.44 67.696 245.128 0 67.692-67.688 67.692-177.436 0-245.128l-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.004-0.024-0.024-0.008-0.008-0.004-0.004-0.008-0.008-0.008-0.008-0.012-0.012-0.008-0.008-0.008-0.008-0.012-0.012-0.008-0.008-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.012-0.016-0.016-0.012-0.012-0.016-0.016-0.028-0.028-0.084-0.084-0.02-0.02-0.016-0.016-0.02-0.02-0.04-0.04-0.132-0.132-0.02-0.02-0.176-0.176-0.056-0.056-0.084-0.084-0.028-0.028-0.032-0.032-0.028-0.028-0.74-0.74-0.04-0.04-75.528-75.528a16 16 0 0 1 0-22.628l33.94-33.94a15.996 15.996 0 0 1 22.628 0l75.528 75.528 0.04 0.04 0.828 0.828 0.084 0.084 0.056 0.056 0.176 0.172 0.024 0.024 0.128 0.132 0.04 0.04 0.02 0.016 0.016 0.02 0.02 0.02 0.052 0.052 0.016 0.016 0.016 0.016 0.028 0.028 0.016 0.016 0.016 0.012 0.012 0.016 0.012 0.012 0.012 0.012 0.016 0.012 0.008 0.012 0.012 0.012 0.012 0.012 0.012 0.008 0.008 0.012 0.008 0.008 0.012 0.008 0.008 0.008 0.008 0.012 0.008 0.004 0.004 0.008 0.008 0.008 0.024 0.02 0.004 0.004 0.004 0.004 0.004 0.004v0.004l0.004 0.004 0.004 0.004c98.936 98.932 98.936 259.336 0 358.268zM333.812 239.75199999999995a15.996 15.996 0 0 0 0 22.624l299.812 299.816a16 16 0 0 0 22.628 0l33.94-33.944a16 16 0 0 0 0-22.624l-299.812-299.816a16 16 0 0 0-22.628 0l-33.944 33.944zM540.284 54.01599999999996c-98.936-98.932-259.336-98.932-358.268 0-98.932 98.932-98.932 259.336 0 358.268v0.004l0.012 0.012 0.004 0.004 0.008 0.004v0.004l0.008 0.004 0.008 0.008 0.004 0.004 0.008 0.008 0.048 0.048 0.18 0.184 0.016 0.016 77.012 77.012a16 16 0 0 0 22.628 0l33.944-33.944a16 16 0 0 0 0-22.628l-77.18-77.176-0.012-0.012-0.06-0.06-0.008-0.008-0.008-0.008-0.02-0.02-0.004-0.004-0.004-0.004-0.004-0.004-0.008-0.008-0.004-0.004c-67.692-67.692-67.692-177.44 0-245.132 67.692-67.688 177.44-67.688 245.128 0l56.572-56.568zM483.712 110.58399999999995l0.004 0.004 0.008 0.004v0.004l0.008 0.008 0.004 0.004 0.024 0.024 0.004 0.004 0.008 0.008 0.008 0.008 0.016 0.016 0.012 0.008 0.008 0.012 0.064 0.064 0.016 0.012 0.012 0.016 0.012 0.012 0.016 0.016 0.012 0.012 0.032 0.032 0.016 0.016 0.016 0.016 0.016 0.016 0.152 0.152 0.02 0.02 0.024 0.02 0.02 0.024 0.024 0.02 0.168 0.172 0.024 0.024 0.028 0.028 0.028 0.028 0.028 0.024 0.028 0.028 0.028 0.028 1.02 1.024 0.044 0.04 0.172 0.176 0.044 0.044 0.932 0.932 0.052 0.052 0.056 0.056 0.052 0.052 74.052 74.052a16 16 0 0 0 22.628 0l33.94-33.94a16 16 0 0 0 0-22.628l-74.048-74.052-0.056-0.056-0.056-0.052-0.052-0.056-0.932-0.928-0.044-0.044-0.088-0.088-0.044-0.044-0.04-0.044-0.044-0.04-1.02-1.024-0.028-0.028-0.028-0.028-0.028-0.028-0.028-0.024-0.024-0.028-0.028-0.024-0.1-0.1-0.068-0.072-0.024-0.02-0.02-0.024-0.024-0.02-0.02-0.02-0.152-0.152-0.016-0.016-0.016-0.016-0.016-0.016-0.028-0.032-0.016-0.016-0.016-0.012-0.012-0.012-0.012-0.016-0.012-0.012-0.068-0.064-0.008-0.012-0.012-0.008-0.016-0.016-0.008-0.008-0.004-0.008-0.008-0.008-0.024-0.02-0.004-0.004-0.008-0.008v-0.004l-0.004-0.004-0.004-0.004-56.572 56.568z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="wenzixiahuaxian1" unicode="&#59036;" d="M295.011611 776.347393a7.968872 7.968872 0 0 1-7.968872 7.968872h-63.750972a7.968872 7.968872 0 0 1-7.968872-7.968872v-525.945525c0-66.018117 53.514957-119.533074 119.533074-119.533074h350.63035c66.018117 0 119.533074 53.514957 119.533074 119.533074v525.945525a7.968872 7.968872 0 0 1-7.968872 7.968872h-63.750972a7.968872 7.968872 0 0 1-7.968872-7.968872v-525.945525c0-22.006039-17.838319-39.844358-39.844358-39.844358h-350.63035c-22.006039 0-39.844358 17.838319-39.844358 39.844358v525.945525zM167.509665-12.57089499999995a7.968872 7.968872 0 0 0-7.968871 7.968872v63.750972a7.968872 7.968872 0 0 0 7.968871 7.968872h685.322958a7.968872 7.968872 0 0 0 7.968871-7.968872v-63.750972a7.968872 7.968872 0 0 0-7.968871-7.968872h-685.322958z"  horiz-adv-x="1024" />
       
@@ -1328,7 +1388,7 @@
       
       <glyph glyph-name="hangliezhuanhuan1" unicode="&#59542;" d="M398.208 839.104c31.424 0 56.96-25.472 56.96-56.896l-0.064-455.04h455.104c31.424 0 56.96-25.536 56.96-56.96v-284.416c0-31.424-25.536-56.96-56.96-56.96H113.792a56.896 56.896 0 0 0-56.96 56.96V782.208c0 31.424 25.536 56.96 56.96 56.96h284.416z m512-568.896l-455.104 0.064v-284.48h455.104V270.208zM592.448 805.76a28.48 28.48 0 0 0 3.328-36.288l-3.328-3.968-11.84-11.712h73.6c121.6 0 220.992-95.424 227.2-215.488l0.384-12.096v-81.024l9.728 9.728a28.48 28.48 0 0 0 36.288 3.328l3.968-3.328a28.48 28.48 0 0 0 3.264-36.288l-3.264-3.904-53.888-53.952a37.504 37.504 0 0 0-48.448-3.904l-4.672 3.904-53.888 53.952a28.416 28.416 0 0 0 36.288 43.52l3.904-3.328 13.76-13.696V526.208a170.688 170.688 0 0 1-159.808 170.368l-10.816 0.32h-73.6l11.84-11.84a28.48 28.48 0 0 0 3.328-36.288l-3.328-3.904a28.48 28.48 0 0 0-36.288-3.328l-3.904 3.328-53.952 53.888a37.504 37.504 0 0 0-3.968 48.448l3.968 4.608 53.952 53.952a28.416 28.416 0 0 0 40.192 0z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="normal92" unicode="&#59187;" d="M80 768a16 16 0 0 1-16-16v-800a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V752a16 16 0 0 1-16 16H80z m56-64h752a8 8 0 0 0 8-8v-688a8 8 0 0 0-8-8H136a8 8 0 0 0-8 8V696a8 8 0 0 0 8 8zM276 824a8 8 0 0 0 8 8h72a8 8 0 0 0 8-8v-176a8 8 0 0 0-8-8H284a8 8 0 0 0-8 8V824zM660 824a8 8 0 0 0 8 8h72a8 8 0 0 0 8-8v-176a8 8 0 0 0-8-8h-72a8 8 0 0 0-8 8V824zM456 552a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V552zM648 552a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V552zM456 360a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v96zM456 168a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v96zM264 360a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H272a8 8 0 0 0-8 8v96zM264 168a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H272a8 8 0 0 0-8 8v96zM648 360a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v96z"  horiz-adv-x="1024" />
+      <glyph glyph-name="normal92" unicode="&#59187;" d="M464 560a8 8 0 0 1-8-8v-96a8 8 0 0 1 8-8h96a8 8 0 0 1 8 8V552a8 8 0 0 1-8 8h-96zM648 552a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8V552zM464 368a8 8 0 0 1-8-8v-96a8 8 0 0 1 8-8h96a8 8 0 0 1 8 8v96a8 8 0 0 1-8 8h-96zM456 168a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8h-96a8 8 0 0 0-8 8v96zM272 368a8 8 0 0 1-8-8v-96a8 8 0 0 1 8-8h96a8 8 0 0 1 8 8v96a8 8 0 0 1-8 8H272zM264 168a8 8 0 0 0 8 8h96a8 8 0 0 0 8-8v-96a8 8 0 0 0-8-8H272a8 8 0 0 0-8 8v96zM656 368a8 8 0 0 1-8-8v-96a8 8 0 0 1 8-8h96a8 8 0 0 1 8 8v96a8 8 0 0 1-8 8h-96zM284 832a8 8 0 0 1-8-8v-56H80a16 16 0 0 1-16-16v-800a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V752a16 16 0 0 1-16 16h-196V824a8 8 0 0 1-8 8h-72a8 8 0 0 1-8-8v-56H364V824a8 8 0 0 1-8 8H284z m376-184a8 8 0 0 1 8-8h72a8 8 0 0 1 8 8V704h148v-704H128V704h148v-56a8 8 0 0 1 8-8h72a8 8 0 0 1 8 8V704h296v-56z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="guanlianguize" unicode="&#59304;" d="M112 768a16 16 0 0 0 16 16h496a16 16 0 0 0 16-16v-200h-64V720H176v-400h400v72h64v-120a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768zM388 496a16 16 0 0 0 16 16h496a16 16 0 0 0 16-16v-496a16 16 0 0 0-16-16H404a16 16 0 0 0-16 16v200h64v-152h400V448H452v-72H388v120zM232 656a8 8 0 0 0 8 8h272a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H240a8 8 0 0 0-8 8V656zM516 168a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h272a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8h-272z"  horiz-adv-x="1024" />
       

i18n/i18n.cn.js

@@ -199,6 +199,6 @@ BI.i18n = {
     "BI-Basic_Search_And_Patch_Paste": "搜索，支持批量粘贴、粘贴值通过换行识别",
     "BI-Basic_Recommend_Color": "推荐色",
     "BI-Basic_Too_Much_Value_Get_Two_Thousand": "粘贴的值过多，只能识别出前2000个值",
-    "BI-Basic_Open": "开",
-    "BI-Basic_Close": "关",
+    "BI-Basic_Simple_Open": "开",
+    "BI-Basic_Simple_Close": "关",
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220322093515",
+  "version": "2.0.20220505161347",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

private/less/app.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/app";
-@import "var";
+@import "../../src/less/resource/app.less";
+@import "var.less";

private/less/background.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/background";
-@import "var";
+@import "../../src/less/resource/background.less";
+@import "var.less";

private/less/font.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/font";
-@import "var";
+@import "../../src/less/resource/font.less";
+@import "var.less";

private/less/icon.less

@@ -1,5 +1,5 @@
-@import "../../src/less/resource/icon";
-@import "var";
+@import "../../src/less/resource/icon.less";
+@import "var.less";
 
 
 

public/less/app.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/app";
-@import "var";
+@import "../../src/less/resource/app.less";
+@import "var.less";

public/less/background.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/background";
-@import "var";
+@import "../../src/less/resource/background.less";
+@import "var.less";

public/less/font.less

@@ -1,2 +1,2 @@
-@import "../../src/less/resource/font";
-@import "var";
+@import "../../src/less/resource/font.less";
+@import "var.less";

public/less/icon.less

@@ -1,5 +1,5 @@
-@import "../../src/less/resource/icon";
-@import "var";
+@import "../../src/less/resource/icon.less";
+@import "var.less";
 
 
 

src/base/combination/bubble.js

@@ -228,7 +228,7 @@
         _assertPopupView: function () {
             var self = this, o = this.options;
             if (this.popupView == null) {
-                this.popupView = BI.createWidget(this.options.popup, {
+                this.popupView = BI.createWidget(BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup, {
                     type: "bi.bubble_popup_view",
                     showArrow: o.showArrow,
                     value: o.value
@@ -332,7 +332,7 @@
                 name: "offset",
                 options: {
                     offset: function () {
-                        return [o.adjustXOffset, (o.showArrow ? 9 : 0) + (o.adjustYOffset + o.adjustLength)];
+                        return [o.adjustXOffset, (o.showArrow ? 12 : 0) + (o.adjustYOffset + o.adjustLength)];
                     }
                 }
             }];
@@ -340,7 +340,7 @@
                 modifiers.push({
                     name: "arrow",
                     options: {
-                        padding: 5,
+                        padding: 4,
                         element: this.popupView.arrow.element[0]
                     }
                 });

src/base/combination/combo.js

@@ -7,7 +7,7 @@
      */
     BI.Combo = BI.inherit(BI.Bubble, {
         _const: {
-            TRIANGLE_LENGTH: 9
+            TRIANGLE_LENGTH: 12
         },
         _defaultConfig: function () {
             var conf = BI.Combo.superclass._defaultConfig.apply(this, arguments);
@@ -103,7 +103,7 @@
         _assertPopupView: function () {
             var self = this, o = this.options;
             if (this.popupView == null) {
-                this.popupView = BI.createWidget(this.options.popup, {
+                this.popupView = BI.createWidget(BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup, {
                     type: "bi.popup_view",
                     showArrow: o.showArrow,
                     value: o.value

src/base/combination/group.button.js

@@ -33,11 +33,9 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
             self.populate(newValue);
         }) : o.items;
         this.populate(items);
-        if (BI.isFunction(o.value)) {
-            this.__watch(o.value, function (context, newValue) {
-                self.setValue(newValue);
-            })
-        }
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
         if (BI.isKey(o.value) || BI.isNotEmptyArray(o.value)) {
             this.setValue(o.value);
         }

src/base/combination/group.virtual.js

@@ -17,11 +17,9 @@ BI.VirtualGroup = BI.inherit(BI.Widget, {
             self.populate(newValue);
         }) : o.items;
         this.populate(items);
-        if (BI.isFunction(o.value)) {
-            this.__watch(o.value, function (context, newValue) {
-                self.setValue(newValue);
-            })
-        }
+        o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
+            self.setValue(newValue);
+        }) : o.value;
         if (BI.isKey(o.value)) {
             this.setValue(o.value);
         }
@@ -66,11 +64,11 @@ BI.VirtualGroup = BI.inherit(BI.Widget, {
     },
 
     addItems: function (items) {
-        this.layouts.addItems(items);
+        this.layouts.addItems(items, this);
     },
 
     prependItems: function (items) {
-        this.layouts.prependItems(items);
+        this.layouts.prependItems(items, this);
     },
 
     setValue: function (v) {

src/base/foundation/message.js

@@ -22,6 +22,7 @@ BI.Msg = function () {
             // BI.Msg.prompt(title, message, value, callback, min_width);
         },
         toast: function (message, options, context) {
+            BI.isString(options) && (options = { level: options })
             options = options || {};
             context = context || BI.Widget._renderEngine.createElement("body");
             var level = options.level || "common";

src/base/layer/layer.popup.js

@@ -5,7 +5,7 @@
  */
 BI.PopupView = BI.inherit(BI.Widget, {
     _const: {
-        TRIANGLE_LENGTH: 9
+        TRIANGLE_LENGTH: 12
     },
     _defaultConfig: function (props) {
         return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
@@ -185,7 +185,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
     setDirection: function (direction, position) {
         var o = this.options;
         if (o.showArrow) {
-            var style, wrapperStyle, placeholderStyle;
+            var style = {}, wrapperStyle = {}, placeholderStyle = {};
             var adjustXOffset = position.adjustXOffset || 0;
             var adjustYOffset = position.adjustYOffset || 0;
             var bodyBounds = BI.Widget._renderEngine.createElement("body").bounds();
@@ -197,22 +197,22 @@ BI.PopupView = BI.inherit(BI.Widget, {
             var offsetStyle = position.offsetStyle;
             var middle = offsetStyle === "center" || offsetStyle === "middle";
 
-            var minLeft = Math.max(5, offset.left + 5 + popupWidth - bodyWidth);
-            var minRight = Math.max(5, popupWidth - (offset.left + 5));
-            var minTop = Math.max(5, offset.top + 5 + popupHeight - bodyHeight);
-            var minBottom = Math.max(5, popupHeight - (offset.top + 5));
+            var minLeft = Math.max(4, offset.left + 4 + popupWidth - bodyWidth);
+            var minRight = Math.max(4, popupWidth - (offset.left + 4));
+            var minTop = Math.max(4, offset.top + 4 + popupHeight - bodyHeight);
+            var minBottom = Math.max(4, popupHeight - (offset.top + 4));
 
-            var maxLeft = Math.min(popupWidth - 12 - 5, offset.left + position.width - 12 - 5);
-            var maxRight = Math.min(popupWidth - 12 - 5, bodyWidth - (offset.left + position.width - 12 - 5));
-            var maxTop = Math.min(popupHeight - 12 - 5, offset.top + position.height - 12 - 5);
-            var maxBottom = Math.min(popupHeight - 12 - 5, bodyHeight - (offset.top + position.height - 12 - 5));
+            var maxLeft = Math.min(popupWidth - 16 - 4, offset.left + position.width - 16 - 4);
+            var maxRight = Math.min(popupWidth - 16 - 4, bodyWidth - (offset.left + position.width - 16 - 4));
+            var maxTop = Math.min(popupHeight - 16 - 4, offset.top + position.height - 16 - 4);
+            var maxBottom = Math.min(popupHeight - 16 - 4, bodyHeight - (offset.top + position.height - 16 - 4));
             switch (direction) {
                 case "bottom":
                 case "bottom,right":
                     direction = "bottom";
                     style = {
                         // 5表示留出一定的空间
-                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft)
+                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft)
                     };
                     wrapperStyle = {
                         top: o.tgap + o.vgap,
@@ -231,7 +231,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "bottom,left":
                     direction = "bottom";
                     style = {
-                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight)
+                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight)
                     };
                     wrapperStyle = {
                         top: o.bgap + o.vgap,
@@ -251,7 +251,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "top,right":
                     direction = "top";
                     style = {
-                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 6, minLeft, maxLeft)
+                        left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft)
                     };
                     wrapperStyle = {
                         bottom: o.bgap + o.vgap,
@@ -270,7 +270,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "top,left":
                     direction = "top";
                     style = {
-                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 6, minRight, maxRight)
+                        right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight)
                     };
                     wrapperStyle = {
                         bottom: o.bgap + o.vgap,
@@ -290,7 +290,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "left,bottom":
                     direction = "left";
                     style = {
-                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop)
+                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop)
                     };
                     wrapperStyle = {
                         right: o.rgap + o.hgap,
@@ -309,7 +309,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "left,top":
                     direction = "left";
                     style = {
-                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom)
+                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom)
                     };
                     wrapperStyle = {
                         right: o.rgap + o.hgap,
@@ -329,7 +329,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "right,bottom":
                     direction = "right";
                     style = {
-                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 6, minTop, maxTop)
+                        top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop)
                     };
                     wrapperStyle = {
                         left: o.lgap + o.hgap,
@@ -348,7 +348,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
                 case "right,top":
                     direction = "right";
                     style = {
-                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 6, minBottom, maxBottom)
+                        bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom)
                     };
                     wrapperStyle = {
                         left: o.lgap + o.hgap,

src/base/list/virtualgrouplist.js

@@ -21,7 +21,6 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
     },
 
     init: function () {
-        var self = this;
         this.renderedIndex = -1;
     },
 
@@ -90,10 +89,10 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
         var getElementHeight = function () {
             return self.container.element.height() + self.topBlank.element.height() + self.bottomBlank.element.height();
         };
-        while ((lastHeight = getElementHeight()) < minContentHeight && index < o.items.length) {
+        while ((lastHeight = this.renderedIndex === -1 ? 0 : getElementHeight()) < minContentHeight && index < o.items.length) {
             var items = o.items.slice(index, index + o.blockSize);
-            this.container.addItems(items.map(function (item, i) {
-                return o.itemFormatter(item, index + i)
+            this.container[self.renderedIndex === -1 ? "populate" : "addItems"](items.map(function (item, i) {
+                return o.itemFormatter(item, index + i);
             }), this);
             var addedHeight = getElementHeight() - lastHeight;
             this.tree.set(cnt, addedHeight);
@@ -142,7 +141,9 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
     _populate: function (items) {
         var o = this.options;
         if (items && this.options.items !== items) {
+            // 重新populate一组items,需要重新对线段树分块
             this.options.items = items;
+            this._restore();
         }
         this.tree = BI.PrefixIntervalTree.uniform(Math.ceil(o.items.length / o.blockSize), this._isAutoHeight() ? 0 : o.rowHeight * o.blockSize);
 
@@ -153,14 +154,18 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
         }
     },
 
-    restore: function () {
+    _restore: function () {
         this.renderedIndex = -1;
-        this.options.scrollTop = 0;
         // 依赖于cache的占位元素也要初始化
         this.topBlank.setHeight(0);
         this.bottomBlank.setHeight(0);
     },
 
+    restore: function () {
+        this.options.scrollTop = 0;
+        this._restore();
+    },
+
     populate: function (items) {
         this._populate(items);
     }

src/base/pager/pager.js

@@ -12,6 +12,8 @@ BI.Pager = BI.inherit(BI.Widget, {
             behaviors: {},
             layouts: [{
                 type: "bi.horizontal",
+                hgap: 10,
+                vgap: 0
             }],
 
             dynamicShow: true, // 是否动态显示上一页、下一页、首页、尾页， 若为false，则指对其设置使能状态
@@ -24,7 +26,6 @@ BI.Pager = BI.inherit(BI.Widget, {
             }, // 初始化当前页
             groups: 0, // 连续显示分页数
             jump: BI.emptyFn, // 分页的回调函数
-
             first: false, // 是否显示首页
             last: false, // 是否显示尾页
             prev: "上一页",
@@ -35,7 +36,7 @@ BI.Pager = BI.inherit(BI.Widget, {
                 return 1;
             },
             hasPrev: BI.emptyFn, // pages不可用时有效
-            hasNext: BI.emptyFn  // pages不可用时有效
+            hasNext: BI.emptyFn // pages不可用时有效
         });
     },
 
@@ -81,9 +82,11 @@ BI.Pager = BI.inherit(BI.Widget, {
                     disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
                 });
             } else {
-                view.push(BI.extend({
-                    disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
-                }, prev));
+                view.push({
+                    el: BI.extend({
+                        disabled: pages === false ? o.hasPrev(curr) === false : !(curr > 1 && prev !== false)
+                    }, prev)
+                });
             }
         }
 
@@ -94,7 +97,7 @@ BI.Pager = BI.inherit(BI.Widget, {
                 value: "first",
                 disabled: !(dict.index > 1 && groups !== 0)
             });
-            if (dict.index > 1 && groups !== 0) {
+            if (dict.index > 1 && groups !== 0 && groups !== pages - 1) {
                 view.push({
                     type: "bi.label",
                     cls: "page-ellipsis",
@@ -108,6 +111,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         dict.start = dict.index > 1 ? curr - dict.poor : 1;
         dict.end = dict.index > 1 ? (function () {
             var max = curr + (groups - dict.poor - 1);
+
             return max > pages ? pages : max;
         }()) : groups;
         if (dict.end - dict.start < groups - 1) { // 最后一组状态
@@ -135,7 +139,7 @@ BI.Pager = BI.inherit(BI.Widget, {
 
         // 总页数大于连续分页数，且当前组最大页小于总页，输出尾页
         if (((!o.dynamicShow && !o.dynamicShowFirstLast) || (pages > groups && dict.end < pages && groups !== 0)) && last) {
-            if (pages > groups && dict.end < pages && groups !== 0) {
+            if (pages > groups && dict.end < pages && groups !== 0 && groups !== pages - 1) {
                 view.push({
                     type: "bi.label",
                     cls: "page-ellipsis",
@@ -155,28 +159,36 @@ BI.Pager = BI.inherit(BI.Widget, {
             view.push((function () {
                 if (BI.isKey(next)) {
                     if (pages === false) {
-                        return {text: next, value: "next", disabled: o.hasNext(curr) === false};
+                        return { text: next, value: "next", disabled: o.hasNext(curr) === false };
                     }
+
                     return (dict.flow && curr === pages)
                         ?
-                        {text: next, value: "next", disabled: true}
+                        { text: next, value: "next", disabled: true }
                         :
-                        {text: next, value: "next", disabled: !(curr !== pages && next || dict.flow)};
+                        { text: next, value: "next", disabled: !(curr !== pages && next || dict.flow) };
                 }
-                return BI.extend({
-                    disabled: pages === false ? o.hasNext(curr) === false : !(curr !== pages && next || dict.flow)
-                }, next);
 
+                return {
+                    el: BI.extend({
+                        disabled: pages === false ? o.hasNext(curr) === false : !(curr !== pages && next || dict.flow)
+                    }, next)
+                };
             }()));
         }
 
         this.button_group = BI.createWidget({
             type: "bi.button_group",
             element: this,
-            items: BI.createItems(view, {
-                cls: "bi-list-item-select bi-border-radius",
-                height: 23,
-                stopPropagation: true
+            items: BI.map(view, function (idx, v) {
+                v = BI.extend({
+                    cls: "bi-list-item-select bi-border-radius",
+                    height: 23,
+                    hgap: v.el ? 0 : 10,
+                    stopPropagation: true
+                }, BI.stripEL(v));
+
+                return BI.formatEL(v);
             }),
             behaviors: o.behaviors,
             layouts: o.layouts
@@ -230,6 +242,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         v || (v = 1);
         var o = this.options;
         var pages = this.options.pages;
+
         return pages === false ? o.hasPrev(v) : v > 1;
     },
 
@@ -237,6 +250,7 @@ BI.Pager = BI.inherit(BI.Widget, {
         v || (v = 1);
         var o = this.options;
         var pages = this.options.pages;
+
         return pages === false ? o.hasNext(v) : v < pages;
     },
 
@@ -265,7 +279,7 @@ BI.Pager = BI.inherit(BI.Widget, {
                 return BI.MIN;
             case "last":
                 return BI.MAX;
-            default :
+            default:
                 return val;
         }
     },

src/base/single/input/file.js

@@ -97,7 +97,7 @@
             split = "onabort.onerror.onloadstart.onprogress".split("."),
             length = split.length,
             CRLF = "\r\n",
-            xhr = this.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP"),
+            xhr = XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP"),
             sendFile;
 
         // FireFox 3+, Safari 4 beta (Chrome 2 beta file is buggy and will not work)

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

@@ -22,12 +22,6 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
         this.checkbox = BI.createWidget({
             type: "bi.arrow_group_node_checkbox"
         });
-        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
-            if (type === BI.Events.CLICK) {
-                self.setSelected(self.isSelected());
-            }
-            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
-        });
         return {
             type: "bi.vertical_adapt",
             columnSize: [o.iconWrapperWidth || o.height, "fill"],

src/case/button/switch.js

@@ -36,24 +36,24 @@ BI.Switch = BI.inherit(BI.BasicButton, {
                 width: 12,
                 height: 12,
                 top: tgap,
-                left: this.options.selected ? 28 : 4
+                left: o.selected ? 28 : 4
             }, {
                 type: "bi.label",
-                text: BI.i18nText("BI-Basic_Open"),
+                text: BI.i18nText("BI-Basic_Simple_Open"),
                 cls: "content-tip",
                 left: 8,
                 top: tgap - 2,
-                invisible: !o.showTip,
+                invisible: !(o.showTip && o.selected),
                 ref: function (ref) {
                     self.openTip = ref;
                 }
             }, {
                 type: "bi.label",
-                text: BI.i18nText("BI-Basic_Close"),
+                text: BI.i18nText("BI-Basic_Simple_Close"),
                 cls: "content-tip",
                 right: 8,
                 top: tgap - 2,
-                invisible: !o.showTip,
+                invisible: !(o.showTip && !o.selected),
                 ref: function (ref) {
                     self.closeTip = ref;
                 }

src/case/colorchooser/farbtastic/farbtastic.js

@@ -16,6 +16,7 @@ BI.Farbtastic = BI.inherit(BI.BasicButton, {
 
     render: function () {
         var self = this;
+        this._defaultState();
         return {
             type: "bi.absolute",
             items: [{
@@ -87,6 +88,10 @@ BI.Farbtastic = BI.inherit(BI.BasicButton, {
         }
     },
 
+    _defaultState: function () {
+        this.hsl = [0, 0, 0];
+    },
+
     _unpack: function (color) {
         if (color.length === 7) {
             return [parseInt("0x" + color.substring(1, 3)) / 255,

src/case/combo/bubblecombo/combo.bubble.js

@@ -53,12 +53,12 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             offsetStyle: o.offsetStyle,
             showArrow: true,
             el: o.el,
-            popup: BI.extend({
+            popup: () => BI.extend({
                 type: "bi.bubble_popup_view",
                 animation: "bi-zoom-big",
                 animationDuring: 200,
                 primary: o.primary
-            }, o.popup)
+            }, BI.isFunction(this.options.popup) ? this.options.popup() : this.options.popup)
         });
         this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () {
             self.fireEvent(BI.BubbleCombo.EVENT_TRIGGER_CHANGE, arguments);
@@ -99,6 +99,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
 
     isViewVisible: function () {
         return this.combo.isViewVisible();
+    },
+
+    adjustWidth: function () {
+        this.combo.adjustWidth();
+    },
+
+    adjustHeight: function () {
+        this.combo.adjustHeight();
     }
 });
 

src/case/list/list.select.js

@@ -93,10 +93,23 @@ BI.SelectList = BI.inherit(BI.Widget, {
         var notSelectLength = this.getAllLeaves().length - selectLength;
         var hasNext = this.list.hasNext();
         var isAlreadyAllSelected = this.toolbar.isSelected();
-        var isHalf = selectLength > 0 && (notSelectLength > 0 || (!isAlreadyAllSelected && hasNext));
-        isHalf = isHalf || (notSelectLength > 0 && hasNext && isAlreadyAllSelected);
+        var isHalf = selectLength > 0 && notSelectLength > 0;
+        var allSelected = isAlreadyAllSelected;
+
+        if (this.isAllSelected() === false) {
+            hasNext && (isHalf = selectLength > 0);
+            if (!isAlreadyAllSelected && notSelectLength === 0 && !hasNext) {
+                allSelected = true;
+            }
+        } else {
+            hasNext && (isHalf = notSelectLength > 0);
+            if (!isAlreadyAllSelected && notSelectLength === 0) {
+                allSelected = true;
+            }
+        }
+
         this.toolbar.setHalfSelected(isHalf);
-        !isHalf && this.toolbar.setSelected(selectLength > 0 && notSelectLength <= 0 && (!hasNext || isAlreadyAllSelected));
+        !isHalf && this.toolbar.setSelected(allSelected);
     },
 
     setAllSelected: function (v) {

src/case/ztree/0.treeview.js

@@ -347,33 +347,33 @@ BI.TreeView = BI.inherit(BI.Pane, {
     _dealWidthNodes: function (nodes) {
         var self = this, o = this.options;
         var ns = BI.Tree.arrayFormat(nodes);
-        BI.each(ns, function (i, n) {
-            n.isParent = n.isParent || n.parent;
+        return BI.map(ns, function (i, n) {
+            var newNode = BI.extend({}, n);
+            newNode.isParent = newNode.isParent || newNode.parent;
             // n.value = BI.isUndefined(n.value) ? n.text : n.value;
             // n.text = BI.isUndefined(n.text) ? n.value : n.text;
             // if (n.text === null) {
             //     n.text = "";
             // }
-            if (BI.isNull(n.title)) {
-                n.title = n.text;
+            if (BI.isNull(newNode.title)) {
+                newNode.title = newNode.text;
             }
-            if (n.disabled) {
-                n.title = n.warningTitle || n.title;
+            if (newNode.disabled) {
+                newNode.title = newNode.warningTitle || newNode.title;
             }
             var text = BI.createWidget(BI.extend({
                 cls: "tree-node-text",
-                css: {
-                    display: "inline"
-                },
+                tagName: "span",
                 whiteSpace: "nowrap",
                 root: true,
                 keyword: o.paras.keyword
-            }, n, {
-                type: "bi.text"
+            }, newNode, {
+                type: "bi.text",
+                text: BI.replaceAll(newNode.text, "\n", " ")
             }));
             var fragment = BI.Widget._renderEngine.createElement("<div>");
             fragment.append(text.element[0]);
-            n.text = fragment.html();
+            newNode.text = fragment.html();
             // // 处理标红
             // if (BI.isNotNull(n.text)) {
             //     if (BI.isKey(o.paras.keyword)) {
@@ -382,8 +382,8 @@ BI.TreeView = BI.inherit(BI.Pane, {
             //         n.text = BI.htmlEncode(BI.Text.formatText(n.text + ""));
             //     }
             // }
+            return newNode;
         });
-        return nodes;
     },
 
     _loadMore: function () {

src/component/treevaluechooser/abstract.treevaluechooser.js

@@ -549,7 +549,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 checked: state[0],
                 halfCheck: state[1],
                 open: o.open,
-                disabled: nodes[i].disabled
+                disabled: nodes[i].disabled,
+                title: nodes[i].title || nodes[i].text,
+                warningTitle: nodes[i].warningTitle,
             });
         }
         // 如果指定节点全部打开
@@ -588,7 +590,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                     checked: state[0],
                     halfCheck: state[1],
                     open: self.options.open,
-                    disabled: node.disabled
+                    disabled: node.disabled,
+                    title: node.title || node.text,
+                    warningTitle: node.warningTitle,
                 });
             });
         }

src/core/0.foundation.js

@@ -4,7 +4,7 @@
 /**
  * 初始化BI对象
  */
-_global = undefined;
+var _global = undefined;
 if (typeof window !== "undefined") {
     _global = window;
 } else if (typeof global !== "undefined") {
@@ -14,6 +14,11 @@ if (typeof window !== "undefined") {
 } else {
     _global = this;
 }
+
+if (_global) {
+    _global._global = _global;
+}
+
 if (_global.BI == null) {
     _global.BI = {prepares: []};
 }

src/core/2.base.js

@@ -3,20 +3,6 @@
  * Create By GUY 2014\11\17
  *
  */
-_global = undefined;
-if (typeof window !== "undefined") {
-    _global = window;
-} else if (typeof global !== "undefined") {
-    _global = global;
-} else if (typeof self !== "undefined") {
-    _global = self;
-} else {
-    _global = this;
-}
-if (!_global.BI) {
-    _global.BI = {};
-}
-
 !(function (undefined) {
     var traverse = function (func, context) {
         return function (value, key, obj) {
@@ -295,13 +281,13 @@ if (!_global.BI) {
             var i;
             if (BI.isArray(obj)) {
                 for (i = 0; i < obj.length; i++) {
-                    if ((isFunction && target.apply(context, [i, obj[i]]) === true) || (!isFunction && BI.contains(target, obj[i]))) {
+                    if ((isFunction && (target === obj[i] || target.apply(context, [i, obj[i]]) === true)) || (!isFunction && BI.contains(target, obj[i]))) {
                         obj.splice(i--, 1);
                     }
                 }
             } else {
                 BI.each(obj, function (i, v) {
-                    if ((isFunction && target.apply(context, [i, obj[i]]) === true) || (!isFunction && BI.contains(target, obj[i]))) {
+                    if ((isFunction && (target === obj[i] || target.apply(context, [i, obj[i]]) === true)) || (!isFunction && BI.contains(target, obj[i]))) {
                         delete obj[i];
                     }
                 });
@@ -749,20 +735,6 @@ if (!_global.BI) {
         BI[name] = _apply(name);
     });
     _.extend(BI, {
-        getTime: function () {
-            if (_global.performance && _global.performance.now) {
-                return _global.performance.now();
-            }
-            if (_global.performance && _global.performance.webkitNow) {
-                return _global.performance.webkitNow();
-            }
-            if (Date.now) {
-                return Date.now();
-            }
-            return BI.getDate().getTime();
-
-
-        },
 
         parseInt: function (number) {
             var radix = 10;

src/core/4.widget.js

@@ -398,6 +398,10 @@
             lifeHook !== false && !this.__async && callLifeHook(this, "beforeMount");
             this._isMounted = true;
             this.__isMounting = false;
+            for (var key in this._children) {
+                var child = this._children[key];
+                child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
+            }
             if (this._parent) {
                 if (!this._parent.isEnabled()) {
                     this._setEnable(false);
@@ -406,10 +410,6 @@
                     this._setValid(false);
                 }
             }
-            for (var key in this._children) {
-                var child = this._children[key];
-                child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
-            }
             this._mountChildren && this._mountChildren();
             if (layer === 0) {
                 // mounted里面会执行scrollTo之类的方法，如果放宏任务里会闪
@@ -461,9 +461,9 @@
 
         _setEnable: function (enable) {
             if (enable === true) {
-                this.options.disabled = false;
+                this.options._disabled = false;
             } else if (enable === false) {
-                this.options.disabled = true;
+                this.options._disabled = true;
             }
             // 递归将所有子组件使能
             BI.each(this._children, function (i, child) {
@@ -473,9 +473,9 @@
 
         _setValid: function (valid) {
             if (valid === true) {
-                this.options.invalid = false;
+                this.options._invalid = false;
             } else if (valid === false) {
-                this.options.invalid = true;
+                this.options._invalid = true;
             }
             // 递归将所有子组件使有效
             BI.each(this._children, function (i, child) {
@@ -493,6 +493,7 @@
 
         setEnable: function (enable) {
             this._manualSetEnable = true;
+            this.options.disabled = !enable;
             this._setEnable(enable);
             if (enable === true) {
                 this.element.removeClass("base-disabled disabled");
@@ -555,6 +556,7 @@
 
         setValid: function (valid) {
             this._manualSetValid = true;
+            this.options.invalid = !valid;
             this._setValid(valid);
             if (valid === true) {
                 this.element.removeClass("base-invalid invalid");
@@ -579,10 +581,6 @@
             return this.options.height;
         },
 
-        isValid: function () {
-            return !this.options.invalid;
-        },
-
         addWidget: function (name, widget) {
             var self = this;
             if (name instanceof BI.Widget) {
@@ -597,12 +595,6 @@
                 throw new Error("组件：组件名已存在，不能进行添加");
             }
             widget._setParent && widget._setParent(this);
-            // if (this.options.disabled) {
-            //     widget.options && (widget.options.disabled = true);
-            // }
-            // if (this.options.invalid) {
-            //     widget.options && (widget.options.invalid = true);
-            // }
             widget.on(BI.Events.DESTROY, function () {
                 BI.remove(self._children, this);
             });
@@ -689,7 +681,11 @@
         },
 
         isEnabled: function () {
-            return !this.options.disabled;
+            return this.options.disabled === true ? false: !this.options._disabled;
+        },
+
+        isValid: function () {
+            return this.options.invalid === true ? false: !this.options._invalid;
         },
 
         isVisible: function () {

src/core/controller/controller.broadcast.js

@@ -30,10 +30,9 @@ BI.BroadcastController = BI.inherit(BI.Controller, {
     remove: function (name, fn) {
         var self = this;
         if (fn) {
-            BI.remove(this._broadcasts[name], function (idx) {
-                return self._broadcasts[name].indexOf(fn) === idx;
+            BI.remove(this._broadcasts[name], function (index, cb) {
+                return fn === cb;
             });
-            this._broadcasts[name].remove(fn);
             if (this._broadcasts[name].length === 0) {
                 delete this._broadcasts[name];
             }

src/core/platform/web/config.js

@@ -49,7 +49,7 @@ BI.prepares.push(function () {
         // 当列宽既需要自动列宽又需要自适应列宽时，inline布局也处理不了了，降级table处理吧
         var hasAutoAndFillColumnSize = false;
         if (ob.columnSize && ob.columnSize.length > 0) {
-            if (ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
+            if ((ob.columnSize.indexOf("") >= 0 || ob.columnSize.indexOf("auto") >= 0) && ob.columnSize.indexOf("fill") >= 0) {
                 hasAutoAndFillColumnSize = true;
             }
         } else {
@@ -57,7 +57,7 @@ BI.prepares.push(function () {
             BI.each(ob.items, function (i, item) {
                 if (item.width === "fill") {
                     hasFill = true;
-                } else if (BI.isNull(item.width) || item.width === "") {
+                } else if (BI.isNull(item.width) || item.width === "" || item.width === "auto") {
                     hasAuto = true;
                 }
             });
@@ -173,7 +173,7 @@ BI.prepares.push(function () {
         }
         var hasAuto = false;
         if (ob.rowSize && ob.rowSize.length > 0) {
-            if (ob.rowSize.indexOf("") >= 0) {
+            if (ob.rowSize.indexOf("") >= 0 || ob.rowSize.indexOf("auto") >= 0) {
                 hasAuto = true;
             }
         } else {

src/core/platform/web/dom.js

@@ -628,20 +628,20 @@
                     return pos;
                 default :
                     if (BI.DOM.isBottomSpaceLarger(combo)) {
-                        pos = BI.DOM.getBottomAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
+                        top = BI.DOM.getBottomAdaptPosition(combo, popup, extraHeight, needAdaptHeight).top;
                         firstDir = "bottom";
                     } else {
-                        pos = BI.DOM.getTopAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
+                        top = BI.DOM.getTopAdaptPosition(combo, popup, extraHeight, needAdaptHeight).top;
                         firstDir = "top";
                     }
                     if (leftRight[0] === "right") {
-                        left = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight).left;
-                        pos.left = left;
+                        pos = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight);
+                        pos.top = top;
                         pos.dir = firstDir + "," + pos.dir;
                         return pos;
                     }
-                    left = BI.DOM.getRightAlignPosition(combo, popup, extraWidth).left;
-                    pos.left = left;
+                    pos = BI.DOM.getRightAlignPosition(combo, popup, extraWidth);
+                    pos.top = top;
                     pos.dir = firstDir + "," + pos.dir;
                     return pos;
             }

src/core/wrapper/layout/flex/flex.horizontal.js

@@ -40,10 +40,10 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
     _hasFill: function () {
         var o = this.options;
         if (o.columnSize.length > 0) {
-            return o.columnSize.indexOf("fill") >= 0;
+            return o.columnSize.indexOf("fill") >= 0 || o.columnSize.indexOf("auto") >= 0;
         }
         return BI.some(o.items, function (i, item) {
-            if (item.width === "fill") {
+            if (item.width === "fill" || item.width === "auto") {
                 return true;
             }
         });
@@ -52,7 +52,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
-        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width;
+        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
         if (o.columnSize.length > 0) {
             if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) {
                 columnSize = null;

src/core/wrapper/layout/flex/flex.vertical.js

@@ -39,10 +39,10 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
     _hasFill: function () {
         var o = this.options;
         if (o.rowSize.length > 0) {
-            return o.rowSize.indexOf("fill") >= 0;
+            return o.rowSize.indexOf("fill") >= 0 || o.rowSize.indexOf("auto") >= 0;
         }
         return BI.some(o.items, function (i, item) {
-            if (item.height === "fill") {
+            if (item.height === "fill" || item.height === "auto") {
                 return true;
             }
         });
@@ -51,7 +51,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
-        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height;
+        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
         if (o.rowSize.length > 0) {
             if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) {
                 rowSize = null;

src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@@ -36,10 +36,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
     _hasFill: function () {
         var o = this.options;
         if (o.columnSize.length > 0) {
-            return o.columnSize.indexOf("fill") >= 0;
+            return o.columnSize.indexOf("fill") >= 0 || o.columnSize.indexOf("auto") >= 0;
         }
         return BI.some(o.items, function (i, item) {
-            if (item.width === "fill") {
+            if (item.width === "fill" || item.width === "auto") {
                 return true;
             }
         });
@@ -48,7 +48,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
-        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width;
+        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
         if (o.columnSize.length > 0) {
             if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) {
                 columnSize = null;

src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@@ -36,10 +36,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
     _hasFill: function () {
         var o = this.options;
         if (o.rowSize.length > 0) {
-            return o.rowSize.indexOf("fill") >= 0;
+            return o.rowSize.indexOf("fill") >= 0 || o.rowSize.indexOf("auto") >= 0;
         }
         return BI.some(o.items, function (i, item) {
-            if (item.height === "fill") {
+            if (item.height === "fill" || item.height === "auto") {
                 return true;
             }
         });
@@ -48,7 +48,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
-        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height;
+        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
         if (o.rowSize.length > 0) {
             if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) {
                 rowSize = null;

src/core/wrapper/layout/sticky/sticky.horizontal.js

@@ -13,7 +13,7 @@ BI.HorizontalStickyLayout = BI.inherit(BI.FlexHorizontalLayout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.HorizontalStickyLayout.superclass._addElement.apply(this, arguments);
-        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width;
+        var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
         if (o.columnSize.length > 0) {
             if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) {
                 columnSize = null;

src/core/wrapper/layout/sticky/sticky.vertical.js

@@ -13,7 +13,7 @@ BI.VerticalStickyLayout = BI.inherit(BI.FlexVerticalLayout, {
     _addElement: function (i, item) {
         var o = this.options;
         var w = BI.VerticalStickyLayout.superclass._addElement.apply(this, arguments);
-        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height;
+        var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height;
         if (o.rowSize.length > 0) {
             if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) {
                 rowSize = null;

src/less/base/colorchooser/colorchooser.popup.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-color-chooser-popup {
   & .disable-mask {

src/less/base/colorchooser/colorchooser.trigger.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-color-chooser-trigger {
   .border-radius(2px);

src/less/base/colorchooser/colorpicker/button.colorpicker.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-color-picker-button {
   & .color-picker-button-mask {

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

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-color-chooser-show-button {
   &.active, &:active {

src/less/base/colorchooser/colorpicker/editor.colorpicker.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-color-picker-editor {
   & .color-picker-editor-display {

src/less/base/colorchooser/farbtastic/farbtastic.less

@@ -1,5 +1,5 @@
-@import "../../../index";
-@import "../../../image";
+@import "../../../index.less";
+@import "../../../image.less";
 
 .bi-farbtastic {
   & * {

src/less/base/combo/combo.bubble.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 // .bi-bubble-combo {
 //   & .button-combo-triangle-wrapper {

src/less/base/combo/combo.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 @val: transform .3s ease;
 .bi-combo {
   & > .bi-trigger {

src/less/base/combo/combo.searchtextvalue.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 @val: transform .3s ease;
 .bi-search-text-value-combo{
   & .trigger-icon-button{

src/less/base/combo/combo.textvalue.icon.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-icon-text-value-combo{
   &.combo-error {

src/less/base/combo/combo.textvalue.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-text-value-combo {
   &.combo-error {

src/less/base/combo/combo.textvaluecheck.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-text-value-check-combo {
   &.bi-combo-popup, &:hover {

src/less/base/combo/combo.textvaluedownlist.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-text-value-down-list-combo {
   &.bi-combo-popup, &:hover {

src/less/base/combo/popup.bubble.less

@@ -1,8 +1,8 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-bubble-popup-view {
   &.bi-popup-view > .list-view-shadow {
     .box-shadows(0px 9px 28px 8px rgba(0, 0, 0, 0.05), 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12));
     .border-radius(4px);
   }
-}
+}

src/less/base/dom.less

@@ -1,2 +1,2 @@
-@import "../index";
-@import "../lib/colors";
+@import "../index.less";
+@import "../lib/colors.less";

src/less/base/editor/editor.search.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 /*************BI.SearchEditor******************/
 .bi-search-editor {
   .border-radius(2px);

src/less/base/editor/editor.search.small.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-small-search-editor {
   & .bi-editor {

src/less/base/foundation/bi.message.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-message-title {
   font-size: @font-size-14;

src/less/base/layer/layer.multiselect.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-multi-list-view{
   & .bi-button-mask{

src/less/base/layer/panel.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-panel{
   .border-radius(2px);

src/less/base/loader/sort.list.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-sortable-holder {
   border: 1px dashed @color-bi-border-sortable-holder;

src/less/base/pager/pager.all.count.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-all-count-pager {
   & .all-pager-prev {

src/less/base/pager/pager.direction.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-direction-pager {
   & .direction-pager-prev {

src/less/base/pager/pager.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-pager{
   & .page-item{

src/less/base/pane.less

@@ -1,6 +1,6 @@
-@import "../index";
-@import "../image";
-@import "../lib/icon";
+@import "../index.less";
+@import "../image.less";
+@import "../lib/icon.less";
 .bi-pane {
     min-height: 25px;
     &.loading-status{

src/less/base/segment/button.segment.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-segment-button {
   @transition: color 0.3s, background 0.3s, border-color 0.3s, box-shadow 0.3s;

src/less/base/segment/segment.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-segment{
   & > .center-element{

src/less/base/single/button/button.half.less

@@ -1,8 +1,9 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-half-button {
   .border-radius(2px);
   box-sizing: border-box;
+
   &:after {
     position: absolute;
     left: 2px;
@@ -12,4 +13,10 @@
     background-color: @color-bi-background-half-button-content;
     content: '';
   }
+
+  &.disabled {
+    &:after {
+      background-color: @color-bi-background-disabled-half-button-content;
+    }
+  }
 }

src/less/base/single/button/button.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 @hoverVal: opacity .3s ease;
 @activeVal: transform .5s ease, opacity 1s ease;
 @activeStopVal: transform 0s;

src/less/base/single/button/item.singleselect.icontext.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-single-select-icon-text-item{
   &:active, &.active {

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

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-switch {
   font-size: @font-size-12;

src/less/base/single/editor/editor.multifile.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-multifile-editor {
   .multifile-editor {

src/less/base/single/editor/editor.textarea.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-textarea-editor {
   .overflow-hidden();

src/less/base/single/html.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-html {
 	article,

src/less/base/single/input/checkbox.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-checkbox {
   & .checkbox-content, &.checkbox-content {

src/less/base/single/input/file.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-file{
   .opacity(0);

src/less/base/single/input/input.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-input, .bi-textarea{
   border: none;

src/less/base/single/input/radio.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-radio {
   & .radio-content, &.radio-content {

src/less/base/single/label.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-label {
   .overflow-hidden();

src/less/base/single/text.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-text {
   .overflow-hidden();

src/less/base/single/tip/tip.bubble.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-bubble {
   z-index: @zIndex-tip;

src/less/base/single/tip/tip.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-tip{
   position: fixed !important;

src/less/base/single/tip/tip.toast.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-toast{
   color: @color-bi-color-toast-text;

src/less/base/single/tip/tip.tooltip.less

@@ -1,4 +1,4 @@
-@import "../../../index";
+@import "../../../index.less";
 
 .bi-tooltip{
   max-width: 250px;

src/less/base/tree/tree.branch.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 .bi-branch-tree{
   & .bi-branch-tree-view{
     min-width: 300px;

src/less/base/tree/tree.display.less

@@ -1,4 +1,4 @@
-@import "../../index";
+@import "../../index.less";
 
 .bi-display-tree{
   .ztree * {