Browse Source

Pull request #259181: 无JIRA任务,解决冲突

Merge in DEC/fineui from ~AUSTIN.DUAN/decision-fineui:feature/x to feature/x

* commit '586f1f7191786f6ea4a86cce15221b165bb3c83f': (24 commits)
  BI-141781 feat: 下拉框接收tipText
  BI-129824 fix: 多提交
  BI-129824 fix: 控件优化
  BI-129824 fix: 控件优化
  BI-137665 feat: 修改弹窗样式
  无JIRA任务 form不传label时展示内容
  update font
  BI-137665 fix: 代码优化
  BI-137665 fix: 代码优化
  BI-137665 fix: 代码优化
  JSY-36355 feat: MultiSelectItem支持传入el
  BI-141206 fix: 去掉默认值
  无JIRA  类型
  JSY-35428 feat:选色板支持高度props传入
  JSY-35428 feat:增加选色控件传递可选颜色色值
  无jira任务 多提交的
  BI-139188 feat: 【ParusBI】 search_editor的布局改成自适应的
  BI-139188 feat: 【ParusBI】 深色模式下树控件样式补齐
  KERNEL-16950 fix: 加一些log
  KERNEL-16950 fix: 日志
  ...
research/test
Austin.Duan-段嗣跃 11 months ago committed by drew-倪梦威
parent
commit
8b7bb7fd9a
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 18
      packages/fineui/dist/font/iconfont.svg
  3. BIN
      packages/fineui/dist/font/iconfont.ttf
  4. BIN
      packages/fineui/dist/font/iconfont.woff
  5. BIN
      packages/fineui/dist/font/iconfont.woff2
  6. 474
      packages/fineui/src/base/foundation/message.js
  7. 48
      packages/fineui/src/base/layer/layer.popover.js
  8. 2
      packages/fineui/src/case/button/item.multiselect.js
  9. 26
      packages/fineui/src/case/button/switch.js
  10. 3
      packages/fineui/src/case/colorchooser/colorchooser.js
  11. 4
      packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js
  12. 2
      packages/fineui/src/component/form/form.field.js
  13. 6
      packages/fineui/src/core/4.widget.js
  14. 4
      packages/fineui/src/core/platform/web/detectElementResize.js
  15. 6
      packages/fineui/src/core/wrapper/layout/layout.table.js
  16. 2
      packages/fineui/src/fix/fix.js
  17. 4
      packages/fineui/src/less/base/tree/ztree.less
  18. 2
      packages/fineui/src/less/lib/colors.less
  19. 2
      packages/fineui/src/less/lib/constant.less
  20. 5
      packages/fineui/src/less/lib/font.less
  21. 5
      packages/fineui/src/less/resource/font.less
  22. 7
      packages/fineui/src/widget/editor/editor.search.js
  23. 5
      packages/fineui/src/widget/multiselect/multiselect.loader.js
  24. 5
      packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js
  25. 6
      packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js
  26. 18
      packages/fineui/typescript/base/foundation/message.ts
  27. 5
      packages/fineui/typescript/case/button/switch.ts
  28. 7
      packages/fineui/typescript/case/colorchooser/colorchooser.ts
  29. 12
      packages/fineui/typescript/core/base.ts

BIN
packages/fineui/dist/font/iconfont.eot vendored

Binary file not shown.

18
packages/fineui/dist/font/iconfont.svg vendored

@ -14,6 +14,14 @@
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="quxiaohebing" unicode="&#60090;" d="M384 728a8 8 0 0 0-8-8H176v-672h200a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H128a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h248a8 8 0 0 0 8-8v-48z m256-736a8 8 0 0 1 8-8h248a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16h-248a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h200v-672h-200a8 8 0 0 1-8-8v-48zM480 592a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8V776a8 8 0 0 1-8 8h-48a8 8 0 0 1-8-8v-184z m0-600a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8v184a8 8 0 0 1-8 8h-48a8 8 0 0 1-8-8v-184z m203.412 523.5a8 8 0 0 0 0-11.312l-120.344-120.344 120.344-120.344a8 8 0 0 0 0-11.312l-39.6-39.6a8 8 0 0 0-11.312 0l-120.344 120.344-122.9-122.9a8 8 0 0 0-11.312 0l-39.6 39.596a8 8 0 0 0 0 11.312l122.9 122.904-122.9 122.9a8 8 0 0 0 0 11.316l39.6 39.6a8 8 0 0 0 11.312 0l122.9-122.904 120.344 120.344a8 8 0 0 0 11.316 0l39.596-39.6z" horiz-adv-x="1024" />
<glyph glyph-name="chakanbiduixiangqing" unicode="&#60078;" d="M180 52V716h224v-449.884a331.58 331.58 0 0 0 68 118.616V768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h312.984A330.54 330.54 0 0 0 404 61.884V52H180zM912 768v-333.116a331.248 331.248 0 0 1-68 37.184V716h-224v-235.324a330.2 330.2 0 0 1-68-30.256V768a16 16 0 0 0 16 16h328a16 16 0 0 0 16-16z m48-600a231.996 231.996 0 0 0-45.328-137.76l80.28-80.28a8 8 0 0 0 0-11.316l-39.596-39.596a8 8 0 0 0-11.316 0l-80.592 80.592a232.024 232.024 0 0 0-299.496 24.312A232 232 0 1 0 960 168z m-400 0a168 168 0 1 1 336.004 0A168 168 0 0 1 560 168z" horiz-adv-x="1024" />
<glyph glyph-name="zhinengwenda" unicode="&#60077;" d="M561.404 272l55.864-38.192L732 160.684V272h164V736H276v-464h285.404z m20.596-91.608L541.616 208H260c-26.508 0-48 21.492-48 48V752c0 26.508 21.492 48 48 48h652c26.508 0 48-21.492 48-48v-496c0-26.508-21.492-48-48-48h-116v-105.656c0-25.264-27.896-40.564-49.2-26.988l-164.8 105.036zM184 524H112c-26.508 0-48-21.492-48-48v-342.688c0-26.512 21.492-48 48-48h116v-101.276c0-25.24 27.86-40.544 49.16-27.008l164.84 104.748 34.532 23.536h87.528v64h-107.264l-49.992-34.072L292 42.284v107.028H128V460h56V524zM696 644l-76-256h64l46 154.948L776 388h64l-76 256h-68zM532 518c0 34.24-27.76 62-62 62-34.24 0-62-27.76-62-62 0-34.24 27.76-62 62-62 34.24 0 62 27.76 62 62z m9.808-103.548A125.4 125.4 0 0 0 470 392C400.412 392 344 448.412 344 518S400.412 644 470 644 596 587.588 596 518c0-19.692-4.516-38.328-12.572-54.932l31.832-27.216-41.592-48.644-31.86 27.244z" horiz-adv-x="1024" />
<glyph glyph-name="a-typeshujuzhongxinstatenormal" unicode="&#60076;" d="M920 624a16 16 0 0 1-16 16h-64a16 16 0 0 1-16-16v-480a16 16 0 0 1 16-16h64a16 16 0 0 1 16 16V624z m-176 88a16 16 0 0 0 16-16v-624a16 16 0 0 0-16-16h-64a16 16 0 0 0-16 16V696a16 16 0 0 0 16 16h64z m-160 72a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h456z m-116-136H244a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224a8 8 0 0 1 8 8V640a8 8 0 0 1-8 8z m8-160a8 8 0 0 1-8 8H244a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224a8 8 0 0 1 8 8v56z m-8-144H244a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8z m8-160a8 8 0 0 1-8 8H244a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224a8 8 0 0 1 8 8v56z" horiz-adv-x="1024" />
<glyph glyph-name="a-SPAHana" unicode="&#60075;" d="M870.4 75.09504h-41.04704l-15.0528 45.63456H749.2608l-15.0528-45.63456h-41.04704l67.95264 207.22688h41.216L870.4 75.09504zM217.7792 202.97216h77.056v79.32416h41.07264v-207.05792h-41.02656v89.6h-77.1072v-89.57952h-40.99584v207.06304h41.02144v-79.32928l-0.02048-0.02048z m300.76928-127.71328h-41.02656l-15.0528 45.58848H397.42976l-15.0528-45.58848h-41.04704l67.95264 207.06304h41.1904l68.07552-207.06304z m46.52032 207.06304l81.44896-137.60512v137.57952h41.05216v-207.03744h-41.05216l-81.44896 137.57952v-137.57952h-41.02656v207.06304h41.02656z m216.56576-62.48448l-21.26336-64.89088h42.55232l-21.28896 64.89088z m-372.97152-64.8704h42.55232l-21.26336 64.896-21.28896-64.896zM601.6 385.70496c0-16.27136-13.45024-29.57824-29.86496-29.57824-16.44032 0-29.87008 13.30688-29.87008 29.57824s13.45536 29.58336 29.87008 29.58336c16.4352 0 29.86496-13.312 29.86496-29.58336zM785.69984 696.32l-313.69728-337.82784H153.6V696.32h632.09984z m-213.9904-285.9776a24.91904 24.91904 0 0 1-24.84736-24.63744c0-13.49632 11.22816-24.6784 24.84736-24.6784a24.78592 24.78592 0 0 1 24.0384 24.6784c0 13.312-10.63424 24.20736-24.0384 24.65792v-0.02048z m6.92736-8.58112c1.31584-0.7168 2.39104-1.83808 3.03616-3.1744 0.90624-1.64352 1.35168-3.50208 1.29024-5.376 0-2.58048-0.40448-4.73088-1.72032-6.21568a9.08288 9.08288 0 0 0-5.18656-3.01056c2.70336-2.1504 4.6592-5.06368 5.61664-8.36096l3.2512-6.4256h-6.5024l-3.8912 7.31136a48.88576 48.88576 0 0 1-2.82112 4.89472 2.8416 2.8416 0 0 1-1.50528 1.29024 6.17472 6.17472 0 0 1-2.58048 0.43008h-1.12128v-13.9264h-5.376v33.44896h11.22816a14.336 14.336 0 0 0 6.28224-0.88576z m-6.85568-3.38944H565.76v-10.13248h4.3008c2.8672 0 4.54144 0.24064 5.25824 0.7424a3.28704 3.28704 0 0 1 1.64864 1.52576c0.52224 0.9216 0.78336 1.97632 0.73728 3.03616a5.632 5.632 0 0 1-0.7168 3.08224 3.74272 3.74272 0 0 1-1.90976 1.4848c-0.47616 0.2816-2.1504 0.2816-4.77696 0.2816l1.50528-0.02048h-0.0256zM173.02528 605.76256c-15.0016-23.05536-7.8848-49.4592-6.97856-51.75296 6.57408-22.24128 25.54368-33.11616 35.40992-38.94272 27.2384-15.91296 50.8928-11.35104 55.9616-26.78784 0.14336-0.47616 2.07872-6.8096-0.59904-12.1856-7.33696-14.57152-41.216-7.1168-43.3408-6.64064a75.9808 75.9808 0 0 0-22.74816 9.3184l-5.20704 3.48672-20.52608-41.40544 3.41504-2.03264a140.73344 140.73344 0 0 1 61.6448-19.18464c12.45184-0.81408 22.77376-1.7664 35.40992 2.39104a89.48224 89.48224 0 0 1 23.20384 13.18912l5.20704 4.37248-5.61664-15.91296h56.53504l8.96 30.34112 6.56896-1.95584c17.96096-4.8128 36.9152-4.48 54.69184 0.95232l4.13184 1.34144 9.39008-30.67904h88.9088V487.61344h32.256l4.54144 0.18944c34.81088 2.5088 62.43328 33.57184 62.43328 71.3728 0 37.77024-27.47904 68.83328-62.43328 71.38816l-4.54144 0.14336H467.74784v-161.89952L412.3648 630.94784H360.4224l-47.11936-134.87616-0.95744 4.46464A70.41536 70.41536 0 0 1 300.544 525.7728c-6.88128 8.43776-14.76608 12.66688-26.28096 18.85184-11.25376 6.16448-17.18272 5.97504-32.54272 12.81024-8.67328 3.87072-16.25088 4.06016-21.12512 11.03872-1.0496 1.29024-5.0176 6.97344-3.48672 12.16 2.26816 7.4752 14.57664 8.9344 20.50048 9.74848 9.43616 1.1264 27.49952 1.4592 51.36896-12.1856 6.54848 13.47584 13.24032 26.76224 19.92704 40.23808-15.84128 7.97696-59.42272 27.11552-102.73792 11.03872-9.44128-3.39456-23.27552-8.77056-33.14176-23.6544v-0.0512z m232.2432-108.38016l-5.54496-1.29024c-9.27744-1.81248-18.82624-1.78688-28.09856 0.07168l-5.56544 1.36192 19.16416 64.58368 20.0704-64.72704h-0.0256z m159.91808 61.98272c0-6.02112-2.24768-11.8272-6.33344-16.27136a20.70528 20.70528 0 0 0-11.75552-6.35904l-3.34336-0.23552h-26.59328v45.77792h26.59328c11.8272-0.0256 21.43232-10.22464 21.43232-22.8864v-0.0256z" horiz-adv-x="1024" /> <glyph glyph-name="a-SPAHana" unicode="&#60075;" d="M870.4 75.09504h-41.04704l-15.0528 45.63456H749.2608l-15.0528-45.63456h-41.04704l67.95264 207.22688h41.216L870.4 75.09504zM217.7792 202.97216h77.056v79.32416h41.07264v-207.05792h-41.02656v89.6h-77.1072v-89.57952h-40.99584v207.06304h41.02144v-79.32928l-0.02048-0.02048z m300.76928-127.71328h-41.02656l-15.0528 45.58848H397.42976l-15.0528-45.58848h-41.04704l67.95264 207.06304h41.1904l68.07552-207.06304z m46.52032 207.06304l81.44896-137.60512v137.57952h41.05216v-207.03744h-41.05216l-81.44896 137.57952v-137.57952h-41.02656v207.06304h41.02656z m216.56576-62.48448l-21.26336-64.89088h42.55232l-21.28896 64.89088z m-372.97152-64.8704h42.55232l-21.26336 64.896-21.28896-64.896zM601.6 385.70496c0-16.27136-13.45024-29.57824-29.86496-29.57824-16.44032 0-29.87008 13.30688-29.87008 29.57824s13.45536 29.58336 29.87008 29.58336c16.4352 0 29.86496-13.312 29.86496-29.58336zM785.69984 696.32l-313.69728-337.82784H153.6V696.32h632.09984z m-213.9904-285.9776a24.91904 24.91904 0 0 1-24.84736-24.63744c0-13.49632 11.22816-24.6784 24.84736-24.6784a24.78592 24.78592 0 0 1 24.0384 24.6784c0 13.312-10.63424 24.20736-24.0384 24.65792v-0.02048z m6.92736-8.58112c1.31584-0.7168 2.39104-1.83808 3.03616-3.1744 0.90624-1.64352 1.35168-3.50208 1.29024-5.376 0-2.58048-0.40448-4.73088-1.72032-6.21568a9.08288 9.08288 0 0 0-5.18656-3.01056c2.70336-2.1504 4.6592-5.06368 5.61664-8.36096l3.2512-6.4256h-6.5024l-3.8912 7.31136a48.88576 48.88576 0 0 1-2.82112 4.89472 2.8416 2.8416 0 0 1-1.50528 1.29024 6.17472 6.17472 0 0 1-2.58048 0.43008h-1.12128v-13.9264h-5.376v33.44896h11.22816a14.336 14.336 0 0 0 6.28224-0.88576z m-6.85568-3.38944H565.76v-10.13248h4.3008c2.8672 0 4.54144 0.24064 5.25824 0.7424a3.28704 3.28704 0 0 1 1.64864 1.52576c0.52224 0.9216 0.78336 1.97632 0.73728 3.03616a5.632 5.632 0 0 1-0.7168 3.08224 3.74272 3.74272 0 0 1-1.90976 1.4848c-0.47616 0.2816-2.1504 0.2816-4.77696 0.2816l1.50528-0.02048h-0.0256zM173.02528 605.76256c-15.0016-23.05536-7.8848-49.4592-6.97856-51.75296 6.57408-22.24128 25.54368-33.11616 35.40992-38.94272 27.2384-15.91296 50.8928-11.35104 55.9616-26.78784 0.14336-0.47616 2.07872-6.8096-0.59904-12.1856-7.33696-14.57152-41.216-7.1168-43.3408-6.64064a75.9808 75.9808 0 0 0-22.74816 9.3184l-5.20704 3.48672-20.52608-41.40544 3.41504-2.03264a140.73344 140.73344 0 0 1 61.6448-19.18464c12.45184-0.81408 22.77376-1.7664 35.40992 2.39104a89.48224 89.48224 0 0 1 23.20384 13.18912l5.20704 4.37248-5.61664-15.91296h56.53504l8.96 30.34112 6.56896-1.95584c17.96096-4.8128 36.9152-4.48 54.69184 0.95232l4.13184 1.34144 9.39008-30.67904h88.9088V487.61344h32.256l4.54144 0.18944c34.81088 2.5088 62.43328 33.57184 62.43328 71.3728 0 37.77024-27.47904 68.83328-62.43328 71.38816l-4.54144 0.14336H467.74784v-161.89952L412.3648 630.94784H360.4224l-47.11936-134.87616-0.95744 4.46464A70.41536 70.41536 0 0 1 300.544 525.7728c-6.88128 8.43776-14.76608 12.66688-26.28096 18.85184-11.25376 6.16448-17.18272 5.97504-32.54272 12.81024-8.67328 3.87072-16.25088 4.06016-21.12512 11.03872-1.0496 1.29024-5.0176 6.97344-3.48672 12.16 2.26816 7.4752 14.57664 8.9344 20.50048 9.74848 9.43616 1.1264 27.49952 1.4592 51.36896-12.1856 6.54848 13.47584 13.24032 26.76224 19.92704 40.23808-15.84128 7.97696-59.42272 27.11552-102.73792 11.03872-9.44128-3.39456-23.27552-8.77056-33.14176-23.6544v-0.0512z m232.2432-108.38016l-5.54496-1.29024c-9.27744-1.81248-18.82624-1.78688-28.09856 0.07168l-5.56544 1.36192 19.16416 64.58368 20.0704-64.72704h-0.0256z m159.91808 61.98272c0-6.02112-2.24768-11.8272-6.33344-16.27136a20.70528 20.70528 0 0 0-11.75552-6.35904l-3.34336-0.23552h-26.59328v45.77792h26.59328c11.8272-0.0256 21.43232-10.22464 21.43232-22.8864v-0.0256z" horiz-adv-x="1024" />
<glyph glyph-name="DB2" unicode="&#60074;" d="M275.00544 95.62112v198.25152h64.64c66.4064 0 99.4816-32.27648 99.4816-96.75776 0-30.592-9.23136-55.3216-27.93984-73.78944-18.70848-18.46784-42.63424-27.86304-71.94624-27.86304H275.00544v0.15872z m39.9104 163.80416v-129.19296h21.76c18.944 0 33.72032 6.02112 44.56448 17.90464 10.83904 12.04224 16.22016 28.10368 16.22016 48.49664 0 19.67616-5.70368 35.09248-16.86528 46.17216-11.32032 11.07968-25.856 16.54272-43.91936 16.54272h-21.76v0.0768z m155.77088-163.80416v198.25152h66.4064c20.31616 0 36.04992-4.096 47.13472-12.28288 11.07968-8.192 16.4608-19.51232 16.4608-34.048 0-10.75712-3.456-20.23424-10.28096-28.2624-6.82496-8.02816-15.41632-13.64992-25.856-16.78336v-0.5632c13.00992-1.7664 23.5264-6.82496 31.55968-15.41632 7.94624-8.59136 11.96032-19.27168 11.96032-32.11776 0-18.06336-6.02112-32.3584-18.14528-43.03872-12.12416-10.68032-28.58496-15.97952-49.46432-15.97952H470.68672v0.24064z m39.82848 166.69696v-49.05984h18.94912c9.15456 0 16.22016 2.32448 21.51936 6.98368 5.2992 4.6592 7.86944 11.07968 7.86944 19.4304 0 15.17568-10.43968 22.80448-31.39584 22.80448l-16.9472-0.15872z m0-80.69632v-54.36416h23.68512c10.04032 0 17.90464 2.49344 23.5264 7.38816 5.62176 4.89984 8.51456 11.80672 8.51456 20.5568 0 8.35072-2.81088 14.85312-8.51456 19.51232-5.69856 4.65408-13.64992 6.98368-24.0896 6.98368l-23.12192-0.0768z m165.40672-51.712h79.3344v-34.44736h-124.38016v14.77632c0 10.35776 1.7664 19.82976 5.38112 28.2624a94.38208 94.38208 0 0 0 14.77632 23.92576c6.34368 7.38816 15.97952 15.97952 29.22496 25.93792 12.12416 9.55392 20.47488 18.06848 25.37472 25.37472 4.89984 7.38816 7.22432 15.17568 7.22432 23.5264 0 17.90464-9.14944 26.73664-27.54048 26.73664-16.05632 0-31.39584-6.82496-46.09024-20.47488v36.93568c16.384 11.24352 34.6112 16.78336 55.08608 16.78336 18.70848 0 33.47968-5.05856 44.32384-15.17568 10.83904-10.11712 16.37888-24.00768 16.37888-41.83552 0-9.9584-1.52576-18.8672-4.736-26.73664-3.05152-7.95136-7.71072-15.41632-13.65504-22.56384-5.9392-6.9888-15.41632-15.41632-28.58496-25.2928-12.60544-9.55904-21.11488-16.94208-25.45152-22.16448-4.33664-5.21728-6.66624-9.55392-6.66624-13.568zM153.6 675.84h139.15136v-20.87936H153.6V675.84z m158.90432 0v-20.87936h198.41024S490.19904 675.84 464.18432 675.84H312.50432z m237.91616 0v-21.03808h120.36608L663.72096 675.84h-113.30048z m318.77632 0h-112.17408l-7.0656-21.03808h119.23968V675.84zM153.6 634.89024h139.15136v-20.87936H153.6v20.87936z m158.90432-20.95616h222.2592s-2.08896 16.5376-7.22432 20.87424H312.50432v-20.87424z m237.91616 0h133.85216l-6.02112 20.95616h-127.83104v-20.95616z m318.77632 0v20.95616h-126.54592l-6.18496-20.95616h132.73088zM193.98656 595.2256h60.22656v-20.87936H193.98656v20.87936z m159.06816 0h60.22144v-20.87936H353.05472v20.87936z m119.48032-20.87936h60.22144s4.096 11.07968 4.096 20.87936H472.45312v-20.87936h0.08192z m118.43584 20.87936v-20.87936h106.87488l-7.0656 20.87936h-99.80928z m131.92704-20.87936H830.976v20.87936h-100.93056l-7.14752-20.87936zM193.98656 554.51136h60.22656v-20.87424H193.98656v20.87424z m159.06816-20.87424h154.7264s12.52864 11.07968 16.62464 20.87424H353.05472v-20.87424z m357.39648 3.13344l-5.14048 17.7408h-114.33984v-20.87424h60.22144v12.04224l4.17792-12.04224h111.2064l4.01408 12.04224v-12.04224H830.976v20.87424h-114.50368l-6.02112-17.7408zM193.98656 513.80224h60.22656v-20.87424H193.98656v20.87424z m159.06816-21.03808h171.35104c-4.096 9.9584-16.61952 20.87936-16.61952 20.87936H353.05472v-20.87936z m237.91616 21.0432h60.22144v-20.87936h-60.22144v20.87424z m169.26208 0h-97.72032l7.38816-21.0432h83.18464l7.14752 21.0432z m9.3952 0h60.22144v-20.87936h-60.22144v20.87424z m-575.6416-40.79616h60.22656v-20.87424H193.98656v20.87424z m159.06816 0h60.22144v-20.87424H353.05472v20.87424z m179.70176 0H472.53504v-20.87424h64.39424c-0.0768 9.87648-4.1728 20.87424-4.1728 20.87424z m58.2144 0h60.22144v-20.87424h-60.22144v20.87424z m155.776 0h-70.66112l7.30624-20.95616h56.12544l7.22944 20.95616z m22.88128 0h60.22144v-20.87424h-60.22144v20.87424zM154.64448 433.34656h139.15136v-20.87936H154.64448v20.87936z m380.27776 0h-222.4128v-20.87936h215.02976c4.1728 4.33664 7.38304 20.87936 7.38304 20.87936z m16.62464 0h99.64544v-20.87936h-99.64544v20.87936z m180.5056 0h-42.48064l7.38816-20.87936h27.86304l7.22944 20.87936z m37.57568 0H870.4v-20.87936h-100.77184v20.87936zM154.64448 392.3968h139.15136v-20.87936H154.64448V392.3968z m356.352 0H312.50432v-20.87936h151.68c26.9824 0.08192 46.81216 20.87936 46.81216 20.87936z m40.5504 0h99.64544v-20.87936h-99.64544V392.3968z m159.78496-20.79744l7.47008 20.79744h-15.8208l7.47008-20.79744h0.88064z m58.29632 20.79744H870.4v-20.87936h-100.77184V392.3968z" horiz-adv-x="1024" /> <glyph glyph-name="DB2" unicode="&#60074;" d="M275.00544 95.62112v198.25152h64.64c66.4064 0 99.4816-32.27648 99.4816-96.75776 0-30.592-9.23136-55.3216-27.93984-73.78944-18.70848-18.46784-42.63424-27.86304-71.94624-27.86304H275.00544v0.15872z m39.9104 163.80416v-129.19296h21.76c18.944 0 33.72032 6.02112 44.56448 17.90464 10.83904 12.04224 16.22016 28.10368 16.22016 48.49664 0 19.67616-5.70368 35.09248-16.86528 46.17216-11.32032 11.07968-25.856 16.54272-43.91936 16.54272h-21.76v0.0768z m155.77088-163.80416v198.25152h66.4064c20.31616 0 36.04992-4.096 47.13472-12.28288 11.07968-8.192 16.4608-19.51232 16.4608-34.048 0-10.75712-3.456-20.23424-10.28096-28.2624-6.82496-8.02816-15.41632-13.64992-25.856-16.78336v-0.5632c13.00992-1.7664 23.5264-6.82496 31.55968-15.41632 7.94624-8.59136 11.96032-19.27168 11.96032-32.11776 0-18.06336-6.02112-32.3584-18.14528-43.03872-12.12416-10.68032-28.58496-15.97952-49.46432-15.97952H470.68672v0.24064z m39.82848 166.69696v-49.05984h18.94912c9.15456 0 16.22016 2.32448 21.51936 6.98368 5.2992 4.6592 7.86944 11.07968 7.86944 19.4304 0 15.17568-10.43968 22.80448-31.39584 22.80448l-16.9472-0.15872z m0-80.69632v-54.36416h23.68512c10.04032 0 17.90464 2.49344 23.5264 7.38816 5.62176 4.89984 8.51456 11.80672 8.51456 20.5568 0 8.35072-2.81088 14.85312-8.51456 19.51232-5.69856 4.65408-13.64992 6.98368-24.0896 6.98368l-23.12192-0.0768z m165.40672-51.712h79.3344v-34.44736h-124.38016v14.77632c0 10.35776 1.7664 19.82976 5.38112 28.2624a94.38208 94.38208 0 0 0 14.77632 23.92576c6.34368 7.38816 15.97952 15.97952 29.22496 25.93792 12.12416 9.55392 20.47488 18.06848 25.37472 25.37472 4.89984 7.38816 7.22432 15.17568 7.22432 23.5264 0 17.90464-9.14944 26.73664-27.54048 26.73664-16.05632 0-31.39584-6.82496-46.09024-20.47488v36.93568c16.384 11.24352 34.6112 16.78336 55.08608 16.78336 18.70848 0 33.47968-5.05856 44.32384-15.17568 10.83904-10.11712 16.37888-24.00768 16.37888-41.83552 0-9.9584-1.52576-18.8672-4.736-26.73664-3.05152-7.95136-7.71072-15.41632-13.65504-22.56384-5.9392-6.9888-15.41632-15.41632-28.58496-25.2928-12.60544-9.55904-21.11488-16.94208-25.45152-22.16448-4.33664-5.21728-6.66624-9.55392-6.66624-13.568zM153.6 675.84h139.15136v-20.87936H153.6V675.84z m158.90432 0v-20.87936h198.41024S490.19904 675.84 464.18432 675.84H312.50432z m237.91616 0v-21.03808h120.36608L663.72096 675.84h-113.30048z m318.77632 0h-112.17408l-7.0656-21.03808h119.23968V675.84zM153.6 634.89024h139.15136v-20.87936H153.6v20.87936z m158.90432-20.95616h222.2592s-2.08896 16.5376-7.22432 20.87424H312.50432v-20.87424z m237.91616 0h133.85216l-6.02112 20.95616h-127.83104v-20.95616z m318.77632 0v20.95616h-126.54592l-6.18496-20.95616h132.73088zM193.98656 595.2256h60.22656v-20.87936H193.98656v20.87936z m159.06816 0h60.22144v-20.87936H353.05472v20.87936z m119.48032-20.87936h60.22144s4.096 11.07968 4.096 20.87936H472.45312v-20.87936h0.08192z m118.43584 20.87936v-20.87936h106.87488l-7.0656 20.87936h-99.80928z m131.92704-20.87936H830.976v20.87936h-100.93056l-7.14752-20.87936zM193.98656 554.51136h60.22656v-20.87424H193.98656v20.87424z m159.06816-20.87424h154.7264s12.52864 11.07968 16.62464 20.87424H353.05472v-20.87424z m357.39648 3.13344l-5.14048 17.7408h-114.33984v-20.87424h60.22144v12.04224l4.17792-12.04224h111.2064l4.01408 12.04224v-12.04224H830.976v20.87424h-114.50368l-6.02112-17.7408zM193.98656 513.80224h60.22656v-20.87424H193.98656v20.87424z m159.06816-21.03808h171.35104c-4.096 9.9584-16.61952 20.87936-16.61952 20.87936H353.05472v-20.87936z m237.91616 21.0432h60.22144v-20.87936h-60.22144v20.87424z m169.26208 0h-97.72032l7.38816-21.0432h83.18464l7.14752 21.0432z m9.3952 0h60.22144v-20.87936h-60.22144v20.87424z m-575.6416-40.79616h60.22656v-20.87424H193.98656v20.87424z m159.06816 0h60.22144v-20.87424H353.05472v20.87424z m179.70176 0H472.53504v-20.87424h64.39424c-0.0768 9.87648-4.1728 20.87424-4.1728 20.87424z m58.2144 0h60.22144v-20.87424h-60.22144v20.87424z m155.776 0h-70.66112l7.30624-20.95616h56.12544l7.22944 20.95616z m22.88128 0h60.22144v-20.87424h-60.22144v20.87424zM154.64448 433.34656h139.15136v-20.87936H154.64448v20.87936z m380.27776 0h-222.4128v-20.87936h215.02976c4.1728 4.33664 7.38304 20.87936 7.38304 20.87936z m16.62464 0h99.64544v-20.87936h-99.64544v20.87936z m180.5056 0h-42.48064l7.38816-20.87936h27.86304l7.22944 20.87936z m37.57568 0H870.4v-20.87936h-100.77184v20.87936zM154.64448 392.3968h139.15136v-20.87936H154.64448V392.3968z m356.352 0H312.50432v-20.87936h151.68c26.9824 0.08192 46.81216 20.87936 46.81216 20.87936z m40.5504 0h99.64544v-20.87936h-99.64544V392.3968z m159.78496-20.79744l7.47008 20.79744h-15.8208l7.47008-20.79744h0.88064z m58.29632 20.79744H870.4v-20.87936h-100.77184V392.3968z" horiz-adv-x="1024" />
@ -74,7 +82,7 @@
<glyph glyph-name="fasong" unicode="&#60047;" d="M270.7 360l243.456 235-55.56 57.56L112 318l346.596-334.56 55.56 57.56-247.6 239H913.6V696h-80v-336H270.7zM833.6 696h80V736h-80v-40z" horiz-adv-x="1024" /> <glyph glyph-name="fasong" unicode="&#60047;" d="M270.7 360l243.456 235-55.56 57.56L112 318l346.596-334.56 55.56 57.56-247.6 239H913.6V696h-80v-336H270.7zM833.6 696h80V736h-80v-40z" horiz-adv-x="1024" />
<glyph glyph-name="AIzhuli" unicode="&#60046;" d="M840 776a8 8 0 0 1-8-8v-80a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V768a8 8 0 0 1-8 8h-64z m0-176a8 8 0 0 1-8-8v-592a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V592a8 8 0 0 1-8 8h-64zM788.316-8a8 8 0 0 1 7.46 10.892l-297.796 768A8 8 0 0 1 490.52 776h-69.04a8 8 0 0 1-7.46-5.108l-297.8-768A8 8 0 0 1 123.688-8h62.84a8 8 0 0 1 7.456 5.108L456 672.844 577.308 360H395.404a8 8 0 0 1-7.428-5.028l-25.588-64A8 8 0 0 1 369.816 280h238.512l109.692-282.892A8 8 0 0 1 725.48-8h62.836z" horiz-adv-x="1024" /> <glyph glyph-name="AIzhuli" unicode="&#60046;" d="M372 411.944a36 36 0 0 0 36 36 36 36 0 0 0 36-36v-40a36 36 0 0 0-72 0v40zM580 411.944a36 36 0 0 0 36 36 36 36 0 0 0 36-36v-40a36 36 0 0 0-72 0v40zM920 395.944a36 36 0 0 0 36 36 36 36 0 0 0 36-36v-128a36 36 0 0 0-72 0v128zM32 395.944a36 36 0 0 0 36 36 36 36 0 0 0 36-36v-128a36 36 0 0 0-72 0v128zM600 531.948h-176c-125.92 0-228-102.08-228-228.004 0-125.92 102.08-228 228-228h176c125.92 0 228 102.08 228 228 0 125.924-102.08 228-228 228z m-176 72h176c165.684 0 300-134.316 300-300.004 0-165.684-134.316-300-300-300h-176c-165.684 0-300 134.316-300 300 0 165.688 134.316 300 300 300zM325.552 668.96c14.408 16.856 18.88 41.08 9.496 62.812-13.14 30.42-48.448 44.432-78.872 31.296-30.42-13.136-44.432-48.448-31.296-78.872 10.536-24.396 35.332-38.24 60.432-35.988l40.848-116.76 65.012 30.94L325.552 668.96zM677.62 668.96c-14.408 16.856-18.876 41.08-9.492 62.812 13.136 30.42 48.448 44.432 78.872 31.296 30.42-13.136 44.432-48.448 31.296-78.872-10.536-24.396-35.336-38.24-60.436-35.988l-40.844-116.76-65.012 30.94 65.616 106.572z" horiz-adv-x="1024" />
<glyph glyph-name="a-shituyichuzuhe" unicode="&#60045;" d="M184 296V712h416v-128H328a16 16 0 0 1-16-16v-272H184z m712 288h-224V768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-528a16 16 0 0 1 16-16h184v-224a16 16 0 0 1 16-16h568a16 16 0 0 1 16 16V568a16 16 0 0 1-16 16zM384 512h456v-456H384V512z m348.28-116a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-109.364l-123.712 123.708a8 8 0 0 1-11.312 0l-39.6-39.596a8 8 0 0 1 0-11.316L609.092 236H500a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224.28a8 8 0 0 1 8 8v224z" horiz-adv-x="1024" /> <glyph glyph-name="a-shituyichuzuhe" unicode="&#60045;" d="M184 296V712h416v-128H328a16 16 0 0 1-16-16v-272H184z m712 288h-224V768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-528a16 16 0 0 1 16-16h184v-224a16 16 0 0 1 16-16h568a16 16 0 0 1 16 16V568a16 16 0 0 1-16 16zM384 512h456v-456H384V512z m348.28-116a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-109.364l-123.712 123.708a8 8 0 0 1-11.312 0l-39.6-39.596a8 8 0 0 1 0-11.316L609.092 236H500a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h224.28a8 8 0 0 1 8 8v224z" horiz-adv-x="1024" />
@ -1264,7 +1272,7 @@
<glyph glyph-name="denglu-yonghuming" unicode="&#59241;" d="M512 352a256 256 0 1 0 0 512 256 256 0 0 0 0-512z m0 64a192 192 0 1 1 0 384 192 192 0 0 1 0-384z m0-512C252.608-96 32-19.008 32 64c0 99.456 236.48 256 480 256s480-156.544 480-256c0-83.008-220.608-160-480-160z m0 64c225.024 0 416 66.624 416 96 0 57.216-203.584 192-416 192s-416-134.784-416-192c0-29.376 190.976-96 416-96z" horiz-adv-x="1024" /> <glyph glyph-name="denglu-yonghuming" unicode="&#59241;" d="M512 352a256 256 0 1 0 0 512 256 256 0 0 0 0-512z m0 64a192 192 0 1 1 0 384 192 192 0 0 1 0-384z m0-512C252.608-96 32-19.008 32 64c0 99.456 236.48 256 480 256s480-156.544 480-256c0-83.008-220.608-160-480-160z m0 64c225.024 0 416 66.624 416 96 0 57.216-203.584 192-416 192s-416-134.784-416-192c0-29.376 190.976-96 416-96z" horiz-adv-x="1024" />
<glyph glyph-name="bingtu_90" unicode="&#59392;" 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-72c-207.66 0-376-168.34-376-376s168.34-376 376-376 376 168.34 376 376-168.34 376-376 376z m0 0v-376h376a375.992 375.992 0 0 1-376 376z" horiz-adv-x="1024" /> <glyph glyph-name="bingtu_90" unicode="&#59392;" d="M960 384c0-247.424-200.576-448-448-448S64 136.57600000000002 64 384 264.576 832 512 832s448-200.576 448-448z m-72 0h-376V760c-207.66 0-376-168.34-376-376s168.34-376 376-376 376 168.34 376 376z" horiz-adv-x="1024" />
<glyph glyph-name="dengluye-fanhui" unicode="&#59242;" d="M173.248 384l297.408-297.344a32 32 0 0 0-45.312-45.312l-320 320a32 32 0 0 0 0 45.312l320 320a32 32 0 1 0 45.312-45.312L173.248 384zM128 352a32 32 0 0 0 0 64h768a32 32 0 1 0 0-64H128z" horiz-adv-x="1024" /> <glyph glyph-name="dengluye-fanhui" unicode="&#59242;" d="M173.248 384l297.408-297.344a32 32 0 0 0-45.312-45.312l-320 320a32 32 0 0 0 0 45.312l320 320a32 32 0 1 0 45.312-45.312L173.248 384zM128 352a32 32 0 0 0 0 64h768a32 32 0 1 0 0-64H128z" horiz-adv-x="1024" />
@ -1466,7 +1474,7 @@
<glyph glyph-name="Ryuyanfenxi" unicode="&#58902;" d="M288 649.152c0 3.784 3.064 6.848 6.848 6.848H560c99.412 0 180-80.588 180-180 0-75.96-47.052-140.932-113.6-167.356l107.18-184.628c3.096-5.332-0.752-12.016-6.92-12.016h-71.872a8 8 0 0 0-6.904 3.96L542.496 296H360v-176a8 8 0 0 0-8-8H296a8 8 0 0 0-8 8V649.152z m72-69.82v-206.664c0-2.58 2.088-4.668 4.668-4.668H560c59.648 0 108 48.352 108 108s-48.352 108-108 108H364.668c-2.58 0-4.668-2.088-4.668-4.668zM128 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 m48-736V720h672v-672H176z" horiz-adv-x="1024" /> <glyph glyph-name="Ryuyanfenxi" unicode="&#58902;" d="M288 649.152c0 3.784 3.064 6.848 6.848 6.848H560c99.412 0 180-80.588 180-180 0-75.96-47.052-140.932-113.6-167.356l107.18-184.628c3.096-5.332-0.752-12.016-6.92-12.016h-71.872a8 8 0 0 0-6.904 3.96L542.496 296H360v-176a8 8 0 0 0-8-8H296a8 8 0 0 0-8 8V649.152z m72-69.82v-206.664c0-2.58 2.088-4.668 4.668-4.668H560c59.648 0 108 48.352 108 108s-48.352 108-108 108H364.668c-2.58 0-4.668-2.088-4.668-4.668zM128 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 m48-736V720h672v-672H176z" horiz-adv-x="1024" />
<glyph glyph-name="xingxing_50" unicode="&#59426;" d="M470.524 773.76c18.516 31.788 64.44 31.788 82.952 0l116.448-199.924a15.996 15.996 0 0 1 10.44-7.584l226.12-48.968c35.956-7.784 50.148-51.46 25.636-78.896l-154.156-172.524a16.008 16.008 0 0 1-3.988-12.272l23.308-230.188c3.704-36.6-33.448-63.596-67.112-48.76l-211.72 93.296a15.996 15.996 0 0 1-12.904 0l-211.72-93.296c-33.664-14.836-70.816 12.16-67.112 48.76l23.308 230.188a16 16 0 0 1-3.988 12.272L91.88 438.388c-24.512 27.436-10.32 71.112 25.636 78.896l226.12 48.968a16 16 0 0 1 10.44 7.584l116.448 199.924zM512 686.02l-99.44-170.728a47.992 47.992 0 0 0-31.32-22.752l-193.096-41.816 131.64-147.328a48.008 48.008 0 0 0 11.96-36.82l-19.9-196.568 180.8 79.672a48.02 48.02 0 0 0 38.712 0l180.8-79.672-19.904 196.568a48.012 48.012 0 0 0 11.964 36.82l131.644 147.328-193.1 41.816a48 48 0 0 0-31.32 22.752L512 686.02zM512 153.75199999999995c6.596 0 13.192-1.356 19.356-4.076l180.8-79.672-19.904 196.572a48 48 0 0 0 11.964 36.816l131.644 147.332-193.1 41.812a48.02 48.02 0 0 0-31.32 22.76L512 686.012v-532.264z" horiz-adv-x="1024" /> <glyph glyph-name="xingxing_50" unicode="&#59426;" d="M553.476 773.76c-18.516 31.788-64.44 31.788-82.956 0L354.076 573.836a16 16 0 0 0-10.44-7.584L117.516 517.28c-35.96-7.784-50.148-51.46-25.64-78.896l154.16-172.524a16 16 0 0 0 3.984-12.272l-23.304-230.188c-3.708-36.6 33.448-63.596 67.112-48.76l211.72 93.296a15.996 15.996 0 0 0 12.904 0l211.716-93.296c33.664-14.836 70.82 12.16 67.112 48.76l-23.304 230.188a15.996 15.996 0 0 0 3.988 12.272l154.156 172.524c24.508 27.436 10.32 71.112-25.636 78.896L680.36 566.252a16.016 16.016 0 0 0-10.44 7.584L553.476 773.76zM412.56 515.2919999999999L512 686.02v-532.264a48 48 0 0 1-19.356-4.076l-180.8-79.672 19.9 196.568a48.012 48.012 0 0 1-11.96 36.82l-131.64 147.328 193.096 41.816a48.004 48.004 0 0 1 31.32 22.752z" horiz-adv-x="1024" />
<glyph glyph-name="wanjiantouxia" unicode="&#59090;" d="M813.984 378.756c6.728 0 10.452-7.804 6.216-13.032l-301.008-371.616a16 16 0 0 0-24.868 0l-301.008 371.616c-4.24 5.228-0.516 13.032 6.216 13.032h185.724c0 220.92 181.32 400 405 400 11.06 0 21.992-0.4 32.808-1.28-115.832-60.32-194.808-165.056-194.808-318.72v-80h185.728z" horiz-adv-x="1034" /> <glyph glyph-name="wanjiantouxia" unicode="&#59090;" d="M813.984 378.756c6.728 0 10.452-7.804 6.216-13.032l-301.008-371.616a16 16 0 0 0-24.868 0l-301.008 371.616c-4.24 5.228-0.516 13.032 6.216 13.032h185.724c0 220.92 181.32 400 405 400 11.06 0 21.992-0.4 32.808-1.28-115.832-60.32-194.808-165.056-194.808-318.72v-80h185.728z" horiz-adv-x="1034" />
@ -1884,7 +1892,7 @@
<glyph glyph-name="normal63" unicode="&#59160;" d="M725.333333 704h85.333334a85.333333 85.333333 0 0 0 85.333333-85.333333v-512a85.333333 85.333333 0 0 0-85.333333-85.333334H213.333333a85.333333 85.333333 0 0 0-85.333333 85.333334v512a85.333333 85.333333 0 0 0 85.333333 85.333333h85.333334V725.333333a21.333333 21.333333 0 0 0 42.666666 0v-21.333333h341.333334V725.333333a21.333333 21.333333 0 1 0 42.666666 0v-21.333333z m0-42.666667V640a21.333333 21.333333 0 1 0-42.666666 0v21.333333H341.333333V640a21.333333 21.333333 0 0 0-42.666666 0v21.333333H213.333333a42.666667 42.666667 0 0 1-42.666666-42.666666v-85.333334h682.666666v85.333334a42.666667 42.666667 0 0 1-42.666666 42.666666h-85.333334z m-370.389333-237.824a159.530667 159.530667 0 0 0-34.56-27.264c-13.824-7.68-26.496-13.056-38.784-16.128v-41.472c25.344 7.296 46.464 18.816 62.976 34.56V149.333333h41.856v274.176h-31.488z m213.12 40.704l-134.4-353.28h35.712l134.016 353.28h-35.328z m135.552-40.704a159.530667 159.530667 0 0 0-34.56-27.264c-13.824-7.68-26.496-13.056-38.784-16.128v-41.472c25.344 7.296 46.464 18.816 62.976 34.56V149.333333h41.856v274.176h-31.488z" horiz-adv-x="1024" /> <glyph glyph-name="normal63" unicode="&#59160;" d="M725.333333 704h85.333334a85.333333 85.333333 0 0 0 85.333333-85.333333v-512a85.333333 85.333333 0 0 0-85.333333-85.333334H213.333333a85.333333 85.333333 0 0 0-85.333333 85.333334v512a85.333333 85.333333 0 0 0 85.333333 85.333333h85.333334V725.333333a21.333333 21.333333 0 0 0 42.666666 0v-21.333333h341.333334V725.333333a21.333333 21.333333 0 1 0 42.666666 0v-21.333333z m0-42.666667V640a21.333333 21.333333 0 1 0-42.666666 0v21.333333H341.333333V640a21.333333 21.333333 0 0 0-42.666666 0v21.333333H213.333333a42.666667 42.666667 0 0 1-42.666666-42.666666v-85.333334h682.666666v85.333334a42.666667 42.666667 0 0 1-42.666666 42.666666h-85.333334z m-370.389333-237.824a159.530667 159.530667 0 0 0-34.56-27.264c-13.824-7.68-26.496-13.056-38.784-16.128v-41.472c25.344 7.296 46.464 18.816 62.976 34.56V149.333333h41.856v274.176h-31.488z m213.12 40.704l-134.4-353.28h35.712l134.016 353.28h-35.328z m135.552-40.704a159.530667 159.530667 0 0 0-34.56-27.264c-13.824-7.68-26.496-13.056-38.784-16.128v-41.472c25.344 7.296 46.464 18.816 62.976 34.56V149.333333h41.856v274.176h-31.488z" horiz-adv-x="1024" />
<glyph glyph-name="ditupeizhi_fangda" unicode="&#59023;" d="M480 704a8 8 0 0 1-8-8v-272H200a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h272v-272a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v272h272a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-272V696a8 8 0 0 1-8 8h-64z" horiz-adv-x="1024" /> <glyph glyph-name="ditupeizhi_fangda" unicode="&#59023;" d="M552 736a8 8 0 0 1-8 8h-64a8 8 0 0 1-8-8v-312H160a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h312v-312a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v312h312a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-312V736z" horiz-adv-x="1024" />
<glyph glyph-name="cengjiziduan" unicode="&#59495;" d="M526.532 799.156a8 8 0 0 0 7.156 0L975.8 578.096c5.896-2.948 5.896-11.36 0-14.308l-442.112-221.056a8.016 8.016 0 0 0-7.156 0L84.424 563.788c-5.9 2.948-5.9 11.36 0 14.308L526.532 799.16zM229.548 570.944l300.564-150.28 300.56 150.28-300.56 150.28-300.56-150.28zM98.112 401.784a8 8 0 0 0 11.504 7.192l420.496-204.84 420.496 204.84a8 8 0 0 0 11.504-7.192v-59.216c0-3.048-1.732-5.832-4.468-7.176l-427.532-210.448-427.532 210.448a7.996 7.996 0 0 0-4.468 7.176v59.216zM109.62 190.53200000000004c-5.312 2.592-11.508-1.276-11.508-7.188v-57.724c0-3.032 1.712-5.804 4.424-7.16l427.576-213.516 427.572 213.516a8.008 8.008 0 0 1 4.428 7.16v57.724a8 8 0 0 1-11.508 7.188l-420.492-205.248-420.492 205.248z" horiz-adv-x="1024" /> <glyph glyph-name="cengjiziduan" unicode="&#59495;" d="M526.532 799.156a8 8 0 0 0 7.156 0L975.8 578.096c5.896-2.948 5.896-11.36 0-14.308l-442.112-221.056a8.016 8.016 0 0 0-7.156 0L84.424 563.788c-5.9 2.948-5.9 11.36 0 14.308L526.532 799.16zM229.548 570.944l300.564-150.28 300.56 150.28-300.56 150.28-300.56-150.28zM98.112 401.784a8 8 0 0 0 11.504 7.192l420.496-204.84 420.496 204.84a8 8 0 0 0 11.504-7.192v-59.216c0-3.048-1.732-5.832-4.468-7.176l-427.532-210.448-427.532 210.448a7.996 7.996 0 0 0-4.468 7.176v59.216zM109.62 190.53200000000004c-5.312 2.592-11.508-1.276-11.508-7.188v-57.724c0-3.032 1.712-5.804 4.424-7.16l427.576-213.516 427.572 213.516a8.008 8.008 0 0 1 4.428 7.16v57.724a8 8 0 0 1-11.508 7.188l-420.492-205.248-420.492 205.248z" horiz-adv-x="1024" />
@ -1896,7 +1904,7 @@
<glyph glyph-name="normal65" unicode="&#59162;" d="M725.333333 704h85.333334a85.333333 85.333333 0 0 0 85.333333-85.333333v-512a85.333333 85.333333 0 0 0-85.333333-85.333334H213.333333a85.333333 85.333333 0 0 0-85.333333 85.333334v512a85.333333 85.333333 0 0 0 85.333333 85.333333h85.333334V725.333333a21.333333 21.333333 0 0 0 42.666666 0v-21.333333h341.333334V725.333333a21.333333 21.333333 0 1 0 42.666666 0v-21.333333z m0-42.666667V640a21.333333 21.333333 0 1 0-42.666666 0v21.333333H341.333333V640a21.333333 21.333333 0 0 0-42.666666 0v21.333333H213.333333a42.666667 42.666667 0 0 1-42.666666-42.666666v-85.333334h682.666666v85.333334a42.666667 42.666667 0 0 1-42.666666 42.666666h-85.333334zM384 426.666667v-42.666667h384v42.666667H384z m-128-256v-42.666667h384v42.666667H256z m0 128v-42.666667h512v42.666667H256z" horiz-adv-x="1024" /> <glyph glyph-name="normal65" unicode="&#59162;" d="M725.333333 704h85.333334a85.333333 85.333333 0 0 0 85.333333-85.333333v-512a85.333333 85.333333 0 0 0-85.333333-85.333334H213.333333a85.333333 85.333333 0 0 0-85.333333 85.333334v512a85.333333 85.333333 0 0 0 85.333333 85.333333h85.333334V725.333333a21.333333 21.333333 0 0 0 42.666666 0v-21.333333h341.333334V725.333333a21.333333 21.333333 0 1 0 42.666666 0v-21.333333z m0-42.666667V640a21.333333 21.333333 0 1 0-42.666666 0v21.333333H341.333333V640a21.333333 21.333333 0 0 0-42.666666 0v21.333333H213.333333a42.666667 42.666667 0 0 1-42.666666-42.666666v-85.333334h682.666666v85.333334a42.666667 42.666667 0 0 1-42.666666 42.666666h-85.333334zM384 426.666667v-42.666667h384v42.666667H384z m-128-256v-42.666667h384v42.666667H256z m0 128v-42.666667h512v42.666667H256z" horiz-adv-x="1024" />
<glyph glyph-name="ditupeizhi_suoxiao" unicode="&#59025;" d="M192 416a8 8 0 0 0 8 8h624a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H200a8 8 0 0 0-8 8v64z" horiz-adv-x="1024" /> <glyph glyph-name="ditupeizhi_suoxiao" unicode="&#59025;" d="M152 416a8 8 0 0 0 8 8h704a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H160a8 8 0 0 0-8 8v64z" horiz-adv-x="1024" />
<glyph glyph-name="yunhangzhong" unicode="&#59497;" d="M729.088 586.496a24 24 0 0 0 33.472-1.792c58.432-62.08 95.872-179.2 84.864-268.928a23.68 23.68 0 1 0-47.104 5.76c9.344 75.968-22.848 175.68-73.024 231.488a23.68 23.68 0 0 0 1.792 33.472zM810.368 318.08a142.336 142.336 0 1 0-54.272-279.488 142.336 142.336 0 0 0 54.272 279.424z m-12.16-62.912a78.336 78.336 0 1 1-29.952-153.728 78.336 78.336 0 0 1 29.888 153.728zM601.792 67.2a23.68 23.68 0 0 0-15.808-29.632c-84.736-25.856-169.6-18.24-246.272 29.632a23.68 23.68 0 1 0 25.088 40.192c64.896-40.512 135.616-46.336 207.36-24.448a23.68 23.68 0 0 0 29.632-15.744zM352.32 92.864a142.336 142.336 0 1 1-230.272 167.36 142.336 142.336 0 0 1 230.272-167.36z m-51.776 37.632a78.336 78.336 0 1 0-126.72 92.096 78.336 78.336 0 0 0 126.72-92.096zM194.88 415.232a23.68 23.68 0 0 0-16.704 29.056 307.648 307.648 0 0 0 162.624 197.248 23.68 23.68 0 0 0 20.8-42.624A260.224 260.224 0 0 1 224 432a23.68 23.68 0 0 0-29.12-16.768zM355.904 617.216A142.336 142.336 0 1 1 619.84 723.84 142.336 142.336 0 0 1 355.84 617.216z m59.328 23.936a78.336 78.336 0 1 0 145.28 58.688 78.336 78.336 0 0 0-145.28-58.688z" horiz-adv-x="1024" /> <glyph glyph-name="yunhangzhong" unicode="&#59497;" d="M729.088 586.496a24 24 0 0 0 33.472-1.792c58.432-62.08 95.872-179.2 84.864-268.928a23.68 23.68 0 1 0-47.104 5.76c9.344 75.968-22.848 175.68-73.024 231.488a23.68 23.68 0 0 0 1.792 33.472zM810.368 318.08a142.336 142.336 0 1 0-54.272-279.488 142.336 142.336 0 0 0 54.272 279.424z m-12.16-62.912a78.336 78.336 0 1 1-29.952-153.728 78.336 78.336 0 0 1 29.888 153.728zM601.792 67.2a23.68 23.68 0 0 0-15.808-29.632c-84.736-25.856-169.6-18.24-246.272 29.632a23.68 23.68 0 1 0 25.088 40.192c64.896-40.512 135.616-46.336 207.36-24.448a23.68 23.68 0 0 0 29.632-15.744zM352.32 92.864a142.336 142.336 0 1 1-230.272 167.36 142.336 142.336 0 0 1 230.272-167.36z m-51.776 37.632a78.336 78.336 0 1 0-126.72 92.096 78.336 78.336 0 0 0 126.72-92.096zM194.88 415.232a23.68 23.68 0 0 0-16.704 29.056 307.648 307.648 0 0 0 162.624 197.248 23.68 23.68 0 0 0 20.8-42.624A260.224 260.224 0 0 1 224 432a23.68 23.68 0 0 0-29.12-16.768zM355.904 617.216A142.336 142.336 0 1 1 619.84 723.84 142.336 142.336 0 0 1 355.84 617.216z m59.328 23.936a78.336 78.336 0 1 0 145.28 58.688 78.336 78.336 0 0 0-145.28-58.688z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 1010 KiB

After

Width:  |  Height:  |  Size: 1013 KiB

BIN
packages/fineui/dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff2 vendored

Binary file not shown.

474
packages/fineui/src/base/foundation/message.js

@ -17,258 +17,268 @@ import {
i18nText, i18nText,
KeyCode, KeyCode,
isPlainObject, isPlainObject,
SIZE_CONSANTS SIZE_CONSANTS,
CenterAdaptLayout,
VerticalLayout,
HTapeLayout,
RightVerticalAdaptLayout
} from "../../core"; } from "../../core";
import { Toast } from "../single"; import { Button, IconLabel, Label, Toast } from "../single";
export const Msg = (() => { let $mask, $pop;
let $mask, $pop;
const messageShows = []; const messageShows = [];
const toastStack = []; const toastStack = [];
const defaultConfig = { const AlertLevel = {
buttonHeight: 24, WARNING: 'warning',
}; INFO: 'info',
ERROR: 'error',
SUCCESS: 'success',
}
return { function getIconCls(level) {
alert(title, message, callback, config = defaultConfig) { switch (level) {
this._show(false, title, message, callback, config); case AlertLevel.ERROR:
}, return 'alert-error-font';
confirm(title, message, callback, config = defaultConfig) { case AlertLevel.SUCCESS:
this._show(true, title, message, callback, config); return 'alert-success-font';
}, case AlertLevel.INFO:
prompt(title, message, value, callback, min_width) { return 'alert-info-font';
// Msg.prompt(title, message, value, callback, min_width); case AlertLevel.WARNING:
}, default:
toast(message, options, context) { return 'alert-warning-font';
isString(options) && (options = { level: options }); }
options = options || {}; }
context = context || Widget._renderEngine.createElement("body");
const level = options.level || "common";
const autoClose = isNull(options.autoClose) ? true : options.autoClose;
const callback = isFunction(options.callback) ? options.callback : emptyFn;
const toast = createWidget({
type: "bi.toast",
cls: "bi-message-animate bi-message-leave",
level,
autoClose,
closable: options.closable,
text: message,
listeners: [
{
eventName: Toast.EVENT_DESTORY,
action() {
remove(toastStack, toast.element);
let _height = SIZE_CONSANTS.TOAST_TOP;
each(toastStack, (i, element) => {
element.css({ top: _height });
_height += element.outerHeight() + 10;
});
callback();
},
}
],
});
let height = SIZE_CONSANTS.TOAST_TOP;
each(toastStack, (i, element) => {
height += element.outerHeight() + 10;
});
createWidget({
type: "bi.absolute",
element: context,
items: [
{
el: toast,
left: "50%",
top: height,
}
],
});
toastStack.push(toast.element);
toast.element.css({ "margin-left": (-1 * toast.element.outerWidth()) / 2 });
toast.element.removeClass("bi-message-leave").addClass("bi-message-enter");
autoClose &&
delay(() => {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave");
toast.destroy?.();
}, 5000);
return function() { export const Msg = {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave"); alert(title, message, callback, config) {
toast.destroy?.(); _show(false, title, message, callback, config);
}; },
}, confirm(title, message, callback, config) {
_show(hasCancel, title, message, callback, config) { _show(true, title, message, callback, config);
isNull($mask) && },
($mask = Widget._renderEngine toast(message, options, context) {
.createElement("<div class=\"bi-z-index-mask\">") isString(options) && (options = { level: options });
.css({ options = options || {};
position: "absolute", context = context || Widget._renderEngine.createElement("body");
zIndex: zIndex_tip - 2, const level = options.level || "common";
top: 0, const autoClose = isNull(options.autoClose) ? true : options.autoClose;
left: 0, const callback = isFunction(options.callback) ? options.callback : emptyFn;
right: 0, const toast = createWidget({
bottom: 0, type: "bi.toast",
opacity: 0.5, cls: "bi-message-animate bi-message-leave",
}) level,
.appendTo("body")); autoClose,
$pop = Widget._renderEngine closable: options.closable,
.createElement("<div class=\"bi-message-depend\">") text: message,
.css({ listeners: [
position: "absolute", {
zIndex: zIndex_tip - 1, eventName: Toast.EVENT_DESTORY,
top: 0, action() {
left: 0, remove(toastStack, toast.element);
right: 0, let _height = SIZE_CONSANTS.TOAST_TOP;
bottom: 0, each(toastStack, (i, element) => {
}) element.css({ top: _height });
.appendTo("body"); _height += element.outerHeight() + 10;
});
function close() { callback();
messageShows[messageShows.length - 1].destroy(); },
messageShows.pop();
if (messageShows.length === 0) {
$mask.remove();
$mask = null;
} }
} ],
});
let height = SIZE_CONSANTS.TOAST_TOP;
each(toastStack, (i, element) => {
height += element.outerHeight() + 10;
});
createWidget({
type: "bi.absolute",
element: context,
items: [
{
el: toast,
left: "50%",
top: height,
}
],
});
toastStack.push(toast.element);
toast.element.css({ "margin-left": (-1 * toast.element.outerWidth()) / 2 });
toast.element.removeClass("bi-message-leave").addClass("bi-message-enter");
autoClose &&
delay(() => {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave");
toast.destroy?.();
}, 5000);
return function() {
toast.element.removeClass("bi-message-enter").addClass("bi-message-leave");
toast.destroy?.();
};
},
};
const controlItems = []; function _show(hasCancel, title, message, callback, config = {}) {
if (hasCancel === true) { config = {
controlItems.push({ buttonHeight: 24,
el: { cancelText: i18nText("BI-Basic_Cancel"),
type: "bi.button", sureText: i18nText("BI-Basic_OK"),
height: config.buttonHeight, level: AlertLevel.WARNING,
text: i18nText("BI-Basic_Cancel"), ...config,
light: true, }
handler() { isNull($mask) &&
($mask = Widget._renderEngine
.createElement("<div class=\"bi-z-index-mask\">")
.css({
position: "absolute",
zIndex: zIndex_tip - 2,
top: 0,
left: 0,
right: 0,
bottom: 0,
opacity: 0.5,
})
.appendTo("body"));
$pop = Widget._renderEngine
.createElement("<div class=\"bi-message-depend\">")
.css({
position: "absolute",
zIndex: zIndex_tip - 1,
top: 0,
left: 0,
right: 0,
bottom: 0,
})
.appendTo("body");
function close() {
messageShows[messageShows.length - 1].destroy();
messageShows.pop();
if (messageShows.length === 0) {
$mask.remove();
$mask = null;
}
}
const controlItems = [];
if (hasCancel === true) {
controlItems.push({
el: {
type: Button.xtype,
height: config.buttonHeight,
text: config.cancelText,
light: true,
handler() {
close();
if (isFunction(callback)) {
callback.apply(null, [false]);
}
},
},
});
}
controlItems.push({
el: {
type: Button.xtype,
height: config.buttonHeight,
text: config.sureText,
handler() {
close();
if (isFunction(callback)) {
callback.apply(null, [true]);
}
},
},
});
const conf = {
element: $pop,
type: CenterAdaptLayout.xtype,
items: [
{
type: VerticalLayout.xtype,
cls: "bi-card bi-border-radius",
width: 450,
hgap: 32,
attributes: {
tabIndex: 1,
},
mounted() {
this.element.keyup(e => {
if (e.keyCode === KeyCode.ENTER) {
close(); close();
if (isFunction(callback)) { if (isFunction(callback)) {
callback.apply(null, [false]); callback.apply(null, [true]);
}
} else if (e.keyCode === KeyCode.ESCAPE) {
close();
if (hasCancel === true) {
if (isFunction(callback)) {
callback.apply(null, [false]);
}
} }
},
},
});
}
controlItems.push({
el: {
type: "bi.button",
height: config.buttonHeight,
text: i18nText("BI-Basic_OK"),
handler() {
close();
if (isFunction(callback)) {
callback.apply(null, [true]);
} }
}, });
try {
this.element.focus();
} catch (e) {
}
}, },
});
const conf = {
element: $pop,
type: "bi.center_adapt",
items: [ items: [
{ {
type: "bi.border", el: {
attributes: { type: HTapeLayout.xtype,
tabIndex: 1, height: 24,
}, items: [
mounted() { {
this.element.keyup(e => { type: IconLabel.xtype,
if (e.keyCode === KeyCode.ENTER) { cls: `${getIconCls(config.level)} icon-size-20`,
close(); width: 24,
if (isFunction(callback)) { height: 24,
callback.apply(null, [true]);
}
} else if (e.keyCode === KeyCode.ESCAPE) {
close();
if (hasCancel === true) {
if (isFunction(callback)) {
callback.apply(null, [false]);
}
}
}
});
try {
this.element.focus();
} catch (e) {
}
},
cls: "bi-card",
items: {
north: {
el: {
type: "bi.border",
cls: "bi-message-title bi-background",
items: {
center: {
el: {
type: "bi.label",
cls: "bi-font-bold",
text: title || i18nText("BI-Basic_Prompt"),
textAlign: "left",
hgap: 20,
height: 40,
},
},
east: {
el: {
type: "bi.icon_button",
cls: "bi-message-close close-font",
// height: 50,
handler() {
close();
if (isFunction(callback)) {
callback.apply(null, [false]);
}
},
},
width: 56,
},
},
}, },
height: 40, {
}, type: Label.xtype,
center: { css: { "font-size": 16 },
el: isPlainObject(message) cls: 'bi-font-bold', // 16px
? message textAlign: 'left',
: { width: 'fill',
type: "bi.label", text: title || i18nText('BI-Basic_Prompt'),
vgap: 10, lgap: 16,
hgap: 20,
whiteSpace: "normal",
text: message,
},
},
south: {
el: {
type: "bi.absolute",
items: [
{
el: {
type: "bi.right_vertical_adapt",
lgap: 10,
items: controlItems,
},
top: 0,
left: 20,
right: 20,
bottom: 0,
}
],
}, },
height: 44, ],
},
tgap: 32,
},
{
el: isPlainObject(message)
? message
: {
type: Label.xtype,
css: { "font-size": 14 },
cls: 'alert-content',
textAlign: 'left',
text: message,
whiteSpace: 'normal',
}, },
height: 'fill',
tgap: 12,
lgap: 40,
},
{
el: config.footer && isFunction(config.footer) ? config.footer(close) : {
type: RightVerticalAdaptLayout.xtype,
lgap: 12,
items: controlItems,
}, },
width: 450, tgap: 32,
height: 200, bgap: 24,
} },
], ],
}; },
],
messageShows[messageShows.length] = createWidget(conf);
},
}; };
})();
messageShows[messageShows.length] = createWidget(conf);
}

48
packages/fineui/src/base/layer/layer.popover.js

@ -64,30 +64,7 @@ export class Popover extends Widget {
// var self = this; // var self = this;
const { header, headerHeight, closable, logic, footer, footerHeight, body, bodyTgap, bodyHgap } = this.options; const { header, headerHeight, closable, logic, footer, footerHeight, body, bodyTgap, bodyHgap } = this.options;
const c = this._constant; const c = this._constant;
this.startX = 0;
this.startY = 0;
const size = this._calculateSize(); const size = this._calculateSize();
const bodyDom = getOuterBody();
this.tracker = new MouseMoveTracker(
(deltaX, deltaY) => {
const W = Widget._renderEngine.createElement(bodyDom).width();
const H = Widget._renderEngine.createElement(bodyDom).height();
this.startX += deltaX;
this.startY += deltaY;
this.element.css({
left: `${clamp(this.startX, 0, W - this.element.width())}px`,
top: `${clamp(this.startY, 0, H - this.element.height())}px`,
});
// BI-12134 没有什么特别好的方法
Resizers._resize({
target: this.element[0],
});
},
() => {
this.tracker.releaseMouseMoves();
},
_global
);
const items = [ const items = [
{ {
el: { el: {
@ -219,7 +196,30 @@ export class Popover extends Widget {
// mounted之后绑定事件 // mounted之后绑定事件
mounted() { mounted() {
this.dragger.element.mousedown(e => { this.startX = 0;
this.startY = 0;
const bodyDom = getOuterBody();
this.tracker = new MouseMoveTracker(
(deltaX, deltaY) => {
const W = Widget._renderEngine.createElement(bodyDom).width();
const H = Widget._renderEngine.createElement(bodyDom).height();
this.startX += deltaX;
this.startY += deltaY;
this.element.css({
left: `${clamp(this.startX, 0, W - this.element.width())}px`,
top: `${clamp(this.startY, 0, H - this.element.height())}px`,
});
// BI-12134 没有什么特别好的方法
Resizers._resize({
target: this.element[0],
});
},
() => {
this.tracker.releaseMouseMoves();
},
_global
);
this.dragger?.element.mousedown(e => {
if (this.options.draggable !== false) { if (this.options.draggable !== false) {
this.startX = this.element[0].offsetLeft; this.startX = this.element[0].offsetLeft;
this.startY = this.element[0].offsetTop; this.startY = this.element[0].offsetTop;

2
packages/fineui/src/case/button/item.multiselect.js

@ -19,6 +19,7 @@ export class MultiSelectItem extends BasicButton {
}, },
height: SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: SIZE_CONSANTS.LIST_ITEM_HEIGHT,
iconWrapperWidth: 26, iconWrapperWidth: 26,
el: {},
}); });
} }
@ -55,6 +56,7 @@ export class MultiSelectItem extends BasicButton {
keyword: o.keyword, keyword: o.keyword,
value: o.value, value: o.value,
py: o.py, py: o.py,
...o.el
}, },
} }
], ],

26
packages/fineui/src/case/button/switch.js

@ -1,15 +1,13 @@
import { AbsoluteLayout, shortcut, i18nText } from "@/core"; import { AbsoluteLayout, shortcut, i18nText } from "@/core";
import { TextButton, Label, BasicButton } from "@/base"; import { TextButton, Label, BasicButton } from "@/base";
const CIRCLE_SIZE = 12;
@shortcut() @shortcut()
export class Switch extends BasicButton { export class Switch extends BasicButton {
static xtype = "bi.switch"; static xtype = "bi.switch";
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
constants = {
CIRCLE_SIZE: 12,
};
props = { props = {
extraCls: "bi-switch", extraCls: "bi-switch",
attributes: { attributes: {
@ -18,12 +16,12 @@ export class Switch extends BasicButton {
height: 20, height: 20,
width: 44, width: 44,
showTip: false, showTip: false,
textGap: 8,
}; };
render() { render() {
const o = this.options, const { selected, width, height, textGap, showTip } = this.options;
c = this.constants; const tgap = (height - CIRCLE_SIZE) / 2;
const tgap = (o.height - c.CIRCLE_SIZE) / 2;
return { return {
type: AbsoluteLayout.xtype, type: AbsoluteLayout.xtype,
@ -39,15 +37,15 @@ export class Switch extends BasicButton {
width: 12, width: 12,
height: 12, height: 12,
top: tgap, top: tgap,
left: o.selected ? 28 : 4, left: selected ? width - height + tgap : tgap,
}, },
{ {
type: Label.xtype, type: Label.xtype,
text: i18nText("BI-Basic_Simple_Open"), text: i18nText("BI-Basic_Simple_Open"),
cls: "content-tip", cls: "content-tip",
left: 8, left: textGap,
top: tgap - 2, top: tgap - 2,
invisible: !(o.showTip && o.selected), invisible: !(showTip && selected),
ref: _ref => { ref: _ref => {
this.openTip = _ref; this.openTip = _ref;
}, },
@ -56,9 +54,9 @@ export class Switch extends BasicButton {
type: Label.xtype, type: Label.xtype,
text: i18nText("BI-Basic_Simple_Close"), text: i18nText("BI-Basic_Simple_Close"),
cls: "content-tip", cls: "content-tip",
right: 8, right: textGap,
top: tgap - 2, top: tgap - 2,
invisible: !(o.showTip && !o.selected), invisible: !(showTip && !selected),
ref: _ref => { ref: _ref => {
this.closeTip = _ref; this.closeTip = _ref;
}, },
@ -78,7 +76,9 @@ export class Switch extends BasicButton {
setSelected(v) { setSelected(v) {
super.setSelected(...arguments); super.setSelected(...arguments);
this.layout.attr("items")[0].left = v ? 28 : 4; const { width, height } = this.options;
const tgap = (height - CIRCLE_SIZE) / 2;
this.layout.attr("items")[0].left = v ? width - height + tgap : tgap;
this.layout.resize(); this.layout.resize();
this.options.showTip && this.openTip.setVisible(v); this.options.showTip && this.openTip.setVisible(v);
this.options.showTip && this.closeTip.setVisible(!v); this.options.showTip && this.closeTip.setVisible(!v);

3
packages/fineui/src/case/colorchooser/colorchooser.js

@ -24,6 +24,7 @@ export class ColorChooser extends Widget {
height: 24, height: 24,
el: {}, el: {},
simple: false, simple: false,
colorBoardHeight: 80,
}); });
} }
@ -62,6 +63,8 @@ export class ColorChooser extends Widget {
el: extend( el: extend(
{ {
type: HexColorChooserPopup.xtype, type: HexColorChooserPopup.xtype,
colorItems: o.colorItems,
colorBoardHeight: o.colorBoardHeight,
recommendColorsGetter: o.recommendColorsGetter, recommendColorsGetter: o.recommendColorsGetter,
ref: _ref => { ref: _ref => {
this.colorPicker = _ref; this.colorPicker = _ref;

4
packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js

@ -47,6 +47,7 @@ export class HexColorChooserPopup extends Widget {
width: 300, width: 300,
recommendColorsGetter: emptyFn, // 推荐色获取接口 recommendColorsGetter: emptyFn, // 推荐色获取接口
simple: false, // 简单模式, popup中没有自动和透明 simple: false, // 简单模式, popup中没有自动和透明
colorBoardHeight: 80,
}; };
render() { render() {
@ -167,6 +168,7 @@ export class HexColorChooserPopup extends Widget {
type: HexColorPicker.xtype, type: HexColorPicker.xtype,
space: true, space: true,
value: o.value, value: o.value,
items: o.colorItems,
listeners: [ listeners: [
{ {
eventName: ColorPicker.EVENT_CHANGE, eventName: ColorPicker.EVENT_CHANGE,
@ -187,7 +189,7 @@ export class HexColorChooserPopup extends Widget {
bottom: 1, bottom: 1,
} }
], ],
height: 80, height: o.colorBoardHeight,
} }
], ],
}, },

2
packages/fineui/src/component/form/form.field.js

@ -69,7 +69,7 @@ export class FormField extends Widget {
return { return {
type: VerticalAdaptLayout.xtype, type: VerticalAdaptLayout.xtype,
columnSize: ["auto", "fill"], columnSize: isKey(o.label) ? ["auto", "fill"] : ["fill"],
verticalAlign: VerticalAlign.Stretch, verticalAlign: VerticalAlign.Stretch,
items: isKey(o.label) items: isKey(o.label)
? [ ? [

6
packages/fineui/src/core/4.widget.js

@ -241,7 +241,8 @@ export class Widget extends OB {
if (beforeRenderResult instanceof Promise) { if (beforeRenderResult instanceof Promise) {
beforeRenderResult.then(render).catch((e) => { beforeRenderResult.then(render).catch((e) => {
_global.console && console.error(e); _global.console && console.error(e);
render(); // 异步render,组件此时可能已经被销毁
!this.isDestroyed() ? render() : _global.console && console.error('Async render error! Widget has been destroyed!');
}); });
} }
} else { } else {
@ -258,7 +259,8 @@ export class Widget extends OB {
if (beforeInitResult instanceof Promise) { if (beforeInitResult instanceof Promise) {
beforeInitResult.then(init).catch((e) => { beforeInitResult.then(init).catch((e) => {
_global.console && console.error(e); _global.console && console.error(e);
init(); // 异步init,组件此时可能已经被销毁
!this.isDestroyed() ? init() : _global.console && console.error('Async init error! Widget has been destroyed!');
}); });
} }
} else { } else {

4
packages/fineui/src/core/platform/web/detectElementResize.js

@ -46,10 +46,14 @@ export const ResizeDetector = {
addResizeListener(widget.element[0], fn); addResizeListener(widget.element[0], fn);
return function () { return function () {
// 如果fn是debounce需要cancel掉
fn?.cancel?.();
removeResizeListener(widget.element[0], fn); removeResizeListener(widget.element[0], fn);
}; };
}, },
removeResizeListener(widget, fn) { removeResizeListener(widget, fn) {
// 如果fn是debounce需要cancel掉
fn?.cancel?.();
removeResizeListener(widget.element[0], fn); removeResizeListener(widget.element[0], fn);
}, },
}; };

6
packages/fineui/src/core/wrapper/layout/layout.table.js

@ -56,10 +56,10 @@ export class TableLayout extends Layout {
"grid-column-gap": this._optimiseGap(o.hgap), "grid-column-gap": this._optimiseGap(o.hgap),
}); });
} }
return { return {
type: "bi.default", type: "bi.default",
ref(_ref) { ref: (_ref) => {
this.layout = _ref; this.layout = _ref;
}, },
items: this._formatItems(items), items: this._formatItems(items),
@ -110,7 +110,7 @@ export class TableLayout extends Layout {
type: "bi.layout", type: "bi.layout",
}), cls); }), cls);
} }
return first(wrapLayout(item), cls); return first(wrapLayout(item), cls);
})), []); })), []);
} }

2
packages/fineui/src/fix/fix.js

@ -1386,7 +1386,7 @@ class Model {
this.$$computed = null; this.$$computed = null;
this.$$state = null; this.$$state = null;
this.$$context = null; this.$$context = null;
this.model = null; this.model = {}; // 一些异步请求里访问model里的属性,这里先变成空对象,保证部分场景下不报错,其他报错会try catch
this._destroyHandler && this._destroyHandler(); this._destroyHandler && this._destroyHandler();
} }
} }

4
packages/fineui/src/less/base/tree/ztree.less

@ -272,7 +272,9 @@
} }
.bi-theme-dark { .bi-theme-dark {
.ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu { .ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu,.ztree.solid li span.button.roots_docu {
background: none;
&:before { &:before {
border-right: 1px solid @border-color-dark-gray-line-theme-dark; border-right: 1px solid @border-color-dark-gray-line-theme-dark;
} }

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

@ -132,3 +132,5 @@
@color-bi-border-warning: @border-color-warning; @color-bi-border-warning: @border-color-warning;
//边框提亮 //边框提亮
@color-bi-border-highlight: @border-color-highlight; @color-bi-border-highlight: @border-color-highlight;
@color-bi-alert-warning: @color-bi-orange;

2
packages/fineui/src/less/lib/constant.less

@ -248,3 +248,5 @@
//box-shadow效果 //box-shadow效果
@box-shadow-toast: 0 6px 20px -2px rgba(9, 30, 64, 0.16); @box-shadow-toast: 0 6px 20px -2px rgba(9, 30, 64, 0.16);
@color-bi-orange: #f0ac3c;

5
packages/fineui/src/less/lib/font.less

@ -58,3 +58,8 @@
@font-key: "e1d0"; @font-key: "e1d0";
@font-add: "e1c7"; @font-add: "e1c7";
@font-alert-warning: 'e755';
@font-alert-success: 'e6de';
@font-alert-info: 'e74b';
@font-alert-error: 'e757';

5
packages/fineui/src/less/resource/font.less

@ -118,3 +118,8 @@
.font(text-align-left-font, @font-align-left); .font(text-align-left-font, @font-align-left);
.font(text-align-center-font, @font-align-center); .font(text-align-center-font, @font-align-center);
.font(text-align-right-font, @font-align-right); .font(text-align-right-font, @font-align-right);
.font(alert-success-font, @font-alert-success, @color-sea-green-100);
.font(alert-warning-font, @font-alert-warning, @color-bi-alert-warning);
.font(alert-error-font, @font-alert-error, @color-red-100);
.font(alert-info-font, @font-alert-info, @color-bi-text-highlight);

7
packages/fineui/src/widget/editor/editor.search.js

@ -10,7 +10,7 @@ import {
Controller, Controller,
Events, Events,
HTapeLayout, HTapeLayout,
isEndWithBlank isEndWithBlank, HorizontalFillLayout
} from "@/core"; } from "@/core";
import { IconButton, Editor, IconLabel } from "@/base"; import { IconButton, Editor, IconLabel } from "@/base";
@ -87,14 +87,15 @@ export class SearchEditor extends Widget {
createWidget({ createWidget({
element: this, element: this,
height: toPix(o.height, o.simple ? 1 : 2), height: toPix(o.height, o.simple ? 1 : 2),
type: HTapeLayout.xtype, type: HorizontalFillLayout.xtype,
columnSize: ["", "fill", ""],
items: [ items: [
{ {
el: { el: {
type: IconLabel.xtype, type: IconLabel.xtype,
cls: "search-font", cls: "search-font",
width: 24,
}, },
width: 24,
}, },
{ {
el: this.editor, el: this.editor,

5
packages/fineui/src/widget/multiselect/multiselect.loader.js

@ -107,7 +107,10 @@ export class MultiSelectLoader extends Widget {
} }
firstItems = self._createItems(json); firstItems = self._createItems(json);
} }
callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); const context = {
tipText: ob.tipText,
};
callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || "", context);
if (op.times === 1 && self.storeValue) { if (op.times === 1 && self.storeValue) {
isKey(startValue) && isKey(startValue) &&
(self.storeValue.type === Selection.All (self.storeValue.type === Selection.All

5
packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js

@ -115,7 +115,10 @@ export class MultiSelectNoBarLoader extends Widget {
} }
firstItems = self._createItems(json); firstItems = self._createItems(json);
} }
callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); const context = {
tipText: ob.tipText,
};
callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || "", context);
if (op.times === 1 && self.storeValue) { if (op.times === 1 && self.storeValue) {
isKey(startValue) && isKey(startValue) &&
(self.storeValue.type === Selection.All (self.storeValue.type === Selection.All

6
packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

@ -120,8 +120,10 @@ export class SearchMultiSelectLoader extends Widget {
} }
firstItems = this._createItems(json); firstItems = this._createItems(json);
} }
const context = {
callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || ""); tipText: ob.tipText,
};
callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || "", context);
if (op.times === 1 && this.storeValue) { if (op.times === 1 && this.storeValue) {
isKey(startValue) && isKey(startValue) &&
(this.storeValue.type === Selection.All (this.storeValue.type === Selection.All

18
packages/fineui/typescript/base/foundation/message.ts

@ -8,13 +8,23 @@ type toastOptions = {
export declare namespace Msg { export declare namespace Msg {
function alert(title: string, message?: string | { function alert(title: string, message?: string | {
[key: string]: any [key: string]: any
}, callback?: (result?: boolean) => void): void }, callback?: (result?: boolean) => void, config?: {
buttonHeight?: number,
sureText?: string,
cancelText?: string,
level?: 'success' | 'warning' | 'error' | 'info',
footer?: (onClose: Function) => Obj;
}): void
function confirm(title: string, message?: string | { function confirm(title: string, message?: string | {
[key: string]: any [key: string]: any
}, callback?: (result: boolean) => void): void }, callback?: (result: boolean) => void, config?: {
buttonHeight?: number,
function prompt(title: string, message?: string, value?: any, callback?: (result: string) => void, minWidth?: number): void sureText?: string,
cancelText?: string,
level?: 'success' | 'warning' | 'error' | 'info',
footer?: (onClose: Function) => Obj;
}): void
function toast(message: string | Obj, options?: toastOptions | string, context?: HTMLElement): Function function toast(message: string | Obj, options?: toastOptions | string, context?: HTMLElement): Function
} }

5
packages/fineui/typescript/case/button/switch.ts

@ -1,6 +1,11 @@
import { BasicButton } from "../../base/single/button/button.basic"; import { BasicButton } from "../../base/single/button/button.basic";
export declare class Switch extends BasicButton { export declare class Switch extends BasicButton {
props: {
textGap: number;
} & BasicButton['props']
static xtype: string; static xtype: string;
static EVENT_CHANGE: string; static EVENT_CHANGE: string;
} }

7
packages/fineui/typescript/case/colorchooser/colorchooser.ts

@ -1,3 +1,4 @@
import { Single } from 'typescript/base/single/single';
import { Widget } from '../../core/widget'; import { Widget } from '../../core/widget';
export declare class ColorChooser extends Widget { export declare class ColorChooser extends Widget {
@ -5,6 +6,12 @@ export declare class ColorChooser extends Widget {
static EVENT_CHANGE: string; static EVENT_CHANGE: string;
static EVENT_AFTER_POPUPVIEW: string; static EVENT_AFTER_POPUPVIEW: string;
props: {
stopEvent?: boolean;
colorBoardHeight?: number;
colorItems?: { value: string }[][];
} & Single["props"];
isViewVisible(): boolean; isViewVisible(): boolean;
hideView(): void; hideView(): void;

12
packages/fineui/typescript/core/base.ts

@ -320,7 +320,17 @@ export declare function once(func: Function): Function;
export declare function partial(func: Function, ...partials: any): Function; export declare function partial(func: Function, ...partials: any): Function;
export declare function debounce<T extends Function>(func: T, wait?: number, options?: any): T;
interface DebouncedFunc<T extends (...args: any[]) => any> {
(...args: Parameters<T>): ReturnType<T> | undefined;
cancel(): void;
flush(): ReturnType<T> | undefined;
}
export declare function debounce<T extends (...args: any[]) => any>(func: T, wait?: number, options?: any): DebouncedFunc<T>;
export declare function throttle<T extends Function>(func: T, wait?: number, options?: any): T; export declare function throttle<T extends Function>(func: T, wait?: number, options?: any): T;

Loading…
Cancel
Save