Browse Source

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

* commit 'feadcf975f2395277c789bcdb42906d399b4ee27':
  BI-150695 fix: 兼容当前元素无parentNode的情况
  BI-150395 fix: safari下拉搜索框定位不对
  BI-147036 feat: 更新图标
  REPORT-122294 lodash 低版本安全漏洞
  BI-143733 fix: 深色预览样式调整
  REPORT-121158 fix:控制台报错
  BI-148724 fix: 树控件查看已选项连发两次请求
  Uploaded files
  REPORT-122294 lodash 低版本安全漏洞
  REPORT-121158 fix:控制台报错
  BI-148724 fix: 树控件查看已选项连发两次请求
  Uploaded files
master
superman 5 months ago
parent
commit
4f842fffdd
  1. 18
      packages/fineui/bi.lessconfig.json
  2. BIN
      packages/fineui/dist/font/iconfont.eot
  3. 64
      packages/fineui/dist/font/iconfont.svg
  4. BIN
      packages/fineui/dist/font/iconfont.ttf
  5. BIN
      packages/fineui/dist/font/iconfont.woff
  6. BIN
      packages/fineui/dist/font/iconfont.woff2
  7. 8
      packages/fineui/src/core/1.lodash.js
  8. 2
      packages/fineui/src/core/5.inject.js
  9. 2
      packages/fineui/src/core/controller/controller.layer.js
  10. 8
      packages/fineui/src/less/base/colorchooser/colorpicker/button.colorshow.less
  11. 12
      packages/fineui/src/less/base/single/button/button.less
  12. 2
      packages/fineui/src/less/base/single/button/switch.less
  13. 6
      packages/fineui/src/less/core/utils/common.less
  14. 6
      packages/fineui/src/less/core/utils/list-item.less
  15. 3
      packages/fineui/src/less/lib/colors.less
  16. 4
      packages/fineui/src/less/lib/theme.less
  17. 2
      packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
  18. 11
      packages/fineui/src/widget/multitree/multi.tree.combo.js

18
packages/fineui/bi.lessconfig.json

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

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

Binary file not shown.

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

@ -14,6 +14,62 @@
/>
<missing-glyph />
<glyph glyph-name="geshishua" unicode="&#60143;" d="M168 480h504V712H168v-232zM96 776a8 8 0 0 0 8 8h632a8 8 0 0 0 8-8v-128h140c24.3 0 44-19.7 44-44v-281.704a44 44 0 0 0-33.656-42.768L498 183.668V-42a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8v247.704a44 44 0 0 0 33.656 42.768L856 344.332V576h-112v-160a8 8 0 0 0-8-8H104a8 8 0 0 0-8 8V776z" horiz-adv-x="1024" />
<glyph glyph-name="a-61-guolvzujianleixingnianzhoushu" unicode="&#60142;" d="M506.248 361.89599999999996a8 8 0 0 0 11.504 0.004l148.212-153.36c4.996-5.168 13.744-1.64 13.752 5.552l0.276 273.916a8 8 0 0 0 8 7.992h56a8 8 0 0 0 8-8.008l-0.352-407.924a8 8 0 0 0-8-7.996h-60.448c-2.264 0-4.424 0.96-5.94 2.644l-159.32 176.584a8 8 0 0 1-11.872 0.008l-159.72-176.672c-1.52-1.68-3.672-2.636-5.932-2.636H280.36a8 8 0 0 0-8 7.992l-0.352 407.928a8 8 0 0 0 8 8.008h56a8 8 0 0 0 8-7.992l0.276-273.912c0.008-7.192 8.76-10.72 13.752-5.552l148.212 153.424zM376 808a8 8 0 0 0 8-8v-88h256V800a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-88h176a16 16 0 0 0 16-16v-720a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V696a16 16 0 0 0 16 16h176V800a8 8 0 0 0 8 8h64z m472-264H176v-520h672V544z" horiz-adv-x="1024" />
<glyph glyph-name="shangjiantou" unicode="&#60140;" d="M517.632 778.386286a8.045714 8.045714 0 0 1-11.264 0L173.714286 446.610286a8.045714 8.045714 0 0 1 0-11.337143l35.328-35.254857a8.045714 8.045714 0 0 1 11.337143 0L474.697143 653.750857v-661.723428c0-4.388571 3.657143-8.045714 8.045714-8.045715h58.294857a8.045714 8.045714 0 0 1 8.045715 8.045715V653.824l254.537142-253.805714a8.045714 8.045714 0 0 1 11.264 0l35.401143 35.254857a8.045714 8.045714 0 0 1 0 11.337143L517.632 778.386286z" horiz-adv-x="1024" />
<glyph glyph-name="xiajiantou" unicode="&#60141;" d="M517.632-10.386286a8.045714 8.045714 0 0 0-11.264 0L173.714286 321.389714a8.045714 8.045714 0 0 0 0 11.337143l35.328 35.254857a8.045714 8.045714 0 0 0 11.337143 0l254.390857-253.732571V776.045714c0 4.388571 3.657143 8.045714 8.045714 8.045715h58.294857c4.388571 0 8.045714-3.657143 8.045714-8.045715v-661.796571l254.537143 253.805714a8.045714 8.045714 0 0 0 11.264 0l35.401143-35.254857a8.045714 8.045714 0 0 0 0-11.337143l-332.726857-331.776z" horiz-adv-x="1024" />
<glyph glyph-name="tianjiawenjianjia" unicode="&#60139;" d="M452.708 752.104A24 24 0 0 1 434.912 760H136a24 24 0 0 1-24-24v-704a24 24 0 0 1 24-24h752a24 24 0 0 1 24 24V624a24 24 0 0 1-24 24h-326.612l-108.68 104.104zM184.564 688h236.58l116.412-108H840V80H184L184.56 688zM476 496a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-140h148a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-148v-140a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8v140H328a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h148v140z" horiz-adv-x="1024" />
<glyph glyph-name="shijianfenzu" unicode="&#60138;" d="M936-48a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-304a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h304zM936 132a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-304a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h304zM525.736 384.008h177.14a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-241.14a8 8 0 0 0-8 8V576a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-191.992zM510.3 800c-229.752 0-416-186.248-416-416 0-229.748 186.248-416 416-416 5.928 0 11.832 0.124 17.7 0.372v80.088a337.296 337.296 0 0 0-17.7-0.46c-185.568 0-336 150.432-336 336s150.432 336 336 336 336-150.432 336-336a337.28 337.28 0 0 0-7.732-72h81.524a418.696 418.696 0 0 1 6.208 72c0 229.752-186.252 416-416 416z" horiz-adv-x="1024" />
<glyph glyph-name="dandianshijianfanwei" unicode="&#60137;" d="M525.736 384.008h177.14a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-241.14a8 8 0 0 0-8 8V576a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-191.992zM508 800c229.752 0 416-186.248 416-416 0-212.916-159.96-388.476-366.26-413.056v80.712C719.72 75.69200000000001 844 215.332 844 384c0 185.568-150.432 336-336 336-170.652 0-311.592-127.224-333.144-292h-80.56C116.28 637.068 293.116 800 508 800zM96 338.668c3.928-36.4 12.644-71.864 25.688-105.528l74.6 28.9a335.56 335.56 0 0 0-20.748 85.208L96 338.668zM173.736 137.812a415.5 415.5 0 0 1 74.88-78.664l50.228 62.268a335.58 335.58 0 0 0-60.464 63.528l-64.644-47.132zM341.372 2.6760000000000446a419.828 419.828 0 0 1 51.14-18.684 419.86 419.86 0 0 1 53.124-11.936l12.424 79.032a339.584 339.584 0 0 0-43.008 9.664 339.976 339.976 0 0 0-41.4 15.12l-32.28-73.196z" horiz-adv-x="1024" />
<glyph glyph-name="wenda-quanbushouqi" unicode="&#60136;" d="M112 726.612C112 731.8 115.58 736 120 736h64c4.42 0 8-4.2 8-9.388v-685.224c0-5.184-3.58-9.388-8-9.388H120c-4.42 0-8 4.204-8 9.388V726.612zM568.196 659.972c11.204 9.548 27.804 1.048 27.804-14.236V432h372c4.42 0 8-3.94 8-8.8v-78.4c0-4.86-3.58-8.8-8-8.8h-372v-213.736c0-15.284-16.6-23.784-27.804-14.236l-305.772 261.736c-8.564 7.3-8.564 21.172 0 28.472l305.772 261.736z" horiz-adv-x="1024" />
<glyph glyph-name="tuijiantishi" unicode="&#60135;" d="M430.496 212.94l-39.112 16.512c-34.892 14.728-66.92 35.94-94.748 63.264C239.28 349.048 208 423.388 208 502.596s31.28 153.548 88.64 209.88C354.032 768.848 430.28 800 512 800c81.708 0 157.944-31.144 215.34-87.5C784.752 656.012 816 581.768 816 502.596c0-79.192-31.264-153.516-88.6-209.844-27.924-27.312-59.988-48.616-94.784-63.3l-39.112-16.512V96h-163.008v116.94z m341.712 545.2C702.728 826.372 610.336 864 512 864c-98.336 0-190.728-37.628-260.208-105.86C182.312 689.908 144 599.172 144 502.596c0-96.572 38.316-187.308 107.792-255.54 33.588-32.984 72.388-58.708 114.704-76.568V32h291.008v138.488c42.316 17.86 81.116 43.7 114.704 76.568C841.684 315.288 880 406.024 880 502.596c0 96.576-38.316 187.192-107.792 255.544zM372 0h276v-64H372zM547.284 522.132l-0.204 144.696c-0.008 4.92-6.196 7.048-9.2 3.168l-160.788-207.784c-2.628-3.396-0.22-8.344 4.056-8.344h95.568l0.204-144.696c0.008-4.916 6.196-7.048 9.2-3.168l160.788 207.784c2.628 3.4 0.22 8.344-4.06 8.344h-95.564z" horiz-adv-x="1024" />
<glyph glyph-name="piliangdaochu" unicode="&#60134;" d="M256 328a16 16 0 0 0 16 16h229.424l-94.108 94.108a16 16 0 0 0 0 22.628l28.284 28.284a16 16 0 0 0 22.628 0l169.708-169.708a16 16 0 0 0 0-22.624l-169.708-169.708a16 16 0 0 0-22.628 0l-28.284 28.284a16 16 0 0 0 0 22.628L501.424 272H272a16 16 0 0 0-16 16v40zM768 0a16 16 0 0 0-16-16H136a16 16 0 0 0-16 16V616a16 16 0 0 0 16 16h120V768a16 16 0 0 0 16 16h616a16 16 0 0 0 16-16v-616a16 16 0 0 0-16-16h-120v-136z m0 208h64V712H328v-80h424a16 16 0 0 0 16-16v-408z m-72-152V560H192v-504h504z" horiz-adv-x="1024" />
<glyph glyph-name="peizhizhuangtai" unicode="&#60133;" d="M512 832C264.576 832 64 631.424 64 384s200.576-448 448-448 448 200.576 448 448S759.424 832 512 832z m-68-192a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-247.46l176.056-123.276a16 16 0 0 0 3.928-22.284l-36.708-52.428a16 16 0 0 0-22.284-3.928l-210.056 147.084a15.976 15.976 0 0 0-6.796 12.16A16.268 16.268 0 0 0 444 352V640z" horiz-adv-x="1024" />
<glyph glyph-name="a-leixingziduanquanxian" unicode="&#60132;" d="M960 384c0-247.424-200.576-448-448-448S64 136.57600000000002 64 384 264.576 832 512 832s448-200.576 448-448zM256 588a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h172v-392a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V516h172a8 8 0 0 1 8 8V580a8 8 0 0 1-8 8H256z m336-192v-56a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8z m0-152v-56a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-192a8 8 0 0 1-8-8z" horiz-adv-x="1024" />
<glyph glyph-name="shujuji-liebiao" unicode="&#60131;" d="M912 768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h172v72H184V712h656v-500h72V768zM752 592a8 8 0 0 1-8 8H280a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h464a8 8 0 0 1 8 8V592zM488 400a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H280a8 8 0 0 0-8 8v64a8 8 0 0 0 8 8h208zM792 354c0-56.304-38.144-103.7-90-117.76v-72.848l71.624-46.424C795.956 138.652 826.42 152 860 152c68.484 0 124-55.516 124-124 0-68.484-55.516-124-124-124-68.484 0-124 55.516-124 124 0 11.8 1.648 23.212 4.728 34.024l-70.396 45.628-67.176-45.216A123.988 123.988 0 0 0 608 28c0-68.484-55.516-124-124-124-68.484 0-124 55.516-124 124 0 68.484 55.516 124 124 124a123.576 123.576 0 0 0 86.04-34.708l67.96 45.744V236.24c-51.856 14.056-90 61.456-90 117.76 0 67.38 54.62 122 122 122s122-54.62 122-122z m-64 0c0 32.032-25.968 58-58 58s-58-25.968-58-58 25.968-58 58-58 58 25.968 58 58zM544 28c0 33.136-26.864 60-60 60-33.136 0-60-26.864-60-60 0-33.136 26.864-60 60-60 33.136 0 60 26.864 60 60z m316-64c35.348 0 64 28.652 64 64s-28.652 64-64 64-64-28.652-64-64 28.652-64 64-64z" horiz-adv-x="1024" />
<glyph glyph-name="a-leixingzhibiao-jisuanziduanzhilianoffyifabuoff" unicode="&#60130;" d="M915.512 785.396a8 8 0 0 1-8.912 8.912l-219.136-26.796c-6.62-0.808-9.4-8.88-4.688-13.6l72.64-72.64-197.664-185.872-138.8 143.14a33.436 33.436 0 0 1-46.2 1.936L99.864 388.28a8 8 0 0 1-0.632-11.1l33.6-38.984a8 8 0 0 1 11.508-0.64l248.412 230.704 139.248-143.608a33.44 33.44 0 0 1 46.704-1.484l224.352 210.46 72.06-72.06c4.716-4.716 12.788-1.932 13.596 4.684l26.796 219.14zM436 432a8 8 0 0 1-8 8H364a8 8 0 0 1-8-8v-440a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V432zM144-8a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v264a8 8 0 0 1-8 8H152a8 8 0 0 1-8-8v-264zM512 176c0 141.384 114.616 256 256 256 141.384 0 256-114.616 256-256 0-141.384-114.616-256-256-256a257.56 257.56 0 0 0-45.152 3.968c0.42 0.664 0.756 1.392 0.988 2.18l7.308 25.128 43.484 200.46h102.452a8.348 8.348 0 0 1 8.348 8.348v39.568A8.348 8.348 0 0 1 877.08 208h-90.128l12.364 54.508c8.068 27.744 34.368 46.928 64.332 46.928h40.316a8.348 8.348 0 0 1 8.348 8.352v38.348a8.348 8.348 0 0 1-8.348 8.348h-40.316c-55.648 0-104.488-35.628-119.472-87.156L728.304 208h-101.956a8.348 8.348 0 0 1-8.348-8.348v-39.568c0-4.608 3.736-8.348 8.348-8.348h89.38l-42.764-193.048-5.368-18.248C576.116-20.52 512 70.252 512 176z" horiz-adv-x="1024" />
<glyph glyph-name="fenqubiao" unicode="&#60129;" d="M600 712h-176v-92a8 8 0 0 0-8-8H360a8 8 0 0 0-8 8V712H184v-92a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-148a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8V712h-168v-92a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8V712zM176 156a8 8 0 0 0 8-8v-92h168v92a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-92h176v92a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-92h168v92a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-148a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v148a8 8 0 0 0 8 8h56z m248 312v-168h176v168h-176z m-72 0H184v-168h168v168z m320-168h168v168h-168v-168z m224 240a16 16 0 0 0 16-16v-280a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V524a16 16 0 0 0 16 16h768z" horiz-adv-x="1024" />
<glyph glyph-name="shouyeshuaxin-ea10" unicode="&#60128;" d="M706.804 691.82a8 8 0 0 1 0 13.504l-187.392 119.132c-5.328 3.388-12.292-0.44-12.292-6.752v-81.74C301.708 733.352 136 566.024 136 359.996c0-207.66 168.34-376 376-376s376 168.34 376 376c0 63.532-15.784 123.472-43.668 176.016-4.14 7.804-13.976 10.344-21.6 5.872l-34.5-20.24c-7.624-4.468-10.136-14.252-6.076-22.1 21.624-41.764 33.844-89.184 33.844-139.548 0-167.896-136.104-304-304-304s-304 136.104-304 304c0 166.264 133.476 301.352 299.12 303.96v-84.52c0-6.308 6.964-10.132 12.292-6.748l187.392 119.132z" horiz-adv-x="1024" />
<glyph glyph-name="yuanchenggonggongshuju" unicode="&#60127;" d="M223.72864 675.84h484.3776A29.17376 29.17376 0 0 0 737.28 646.67136v-90.9056a29.17376 29.17376 0 0 0-29.17376-29.17376H223.72864A29.16864 29.16864 0 0 0 194.56 555.76576V646.66624A29.17376 29.17376 0 0 0 223.72864 675.84z m159.6928-90.9056h295.51616v32.5632H383.42144c0.69632-1.19808 1.09056-2.59072 1.09056-4.0704v-24.4224c0-1.47968-0.39424-2.8672-1.09056-4.0704zM223.72864 479.104h484.3776A29.17376 29.17376 0 0 0 737.28 449.93024v-90.90048a29.17376 29.17376 0 0 0-29.17376-29.17376H223.72864A29.17376 29.17376 0 0 0 194.56 359.02976V449.93024a29.17376 29.17376 0 0 0 29.16864 29.17376z m159.6928-90.9056h295.51616v32.5632H383.42144c0.69632-1.2032 1.09056-2.59072 1.09056-4.0704v-24.4224c0-1.47968-0.39424-2.8672-1.09056-4.0704zM223.72864 282.368H281.6V133.12H223.72864A29.17376 29.17376 0 0 0 194.56 162.29376v90.9056a29.17376 29.17376 0 0 0 29.16864 29.16864zM464.96256 133.12v111.70816h30.98112V133.12h-30.976zM480.52736 259.23072c-4.608 0-8.55552 1.52576-11.8528 4.5824-3.2512 3.10272-4.87424 6.8096-4.87424 11.12576 0 4.26496 1.62304 7.92576 4.87424 10.9824 3.29728 3.10272 7.2448 4.65408 11.8528 4.65408 4.608 0 8.53504-1.55136 11.78112-4.65408 3.29728-3.05664 4.94592-6.71744 4.94592-10.9824 0-4.31616-1.64864-8.02304-4.94592-11.12576-3.24608-3.05664-7.17312-4.5824-11.78112-4.5824zM345.74336 133.12v148.94592H444.3648v-25.96352H377.23648v-35.49184h60.57984v-25.96352H377.2416V133.12h-31.488zM551.74656 133.12v64.58368c0.04608 4.79744 0.94208 8.89344 2.688 12.288 1.79712 3.44576 4.27008 6.06208 7.41888 7.85408 3.2 1.79712 6.8864 2.69312 11.05408 2.69312 6.20544 0 11.07968-1.94048 14.6176-5.82144 3.54304-3.82976 5.28896-9.15968 5.23776-16V133.12h30.98112v71.12704c0 8.6784-1.59744 16.14336-4.79744 22.4-3.2 6.30272-7.68512 11.15136-13.45536 14.54592-5.77024 3.39456-12.53376 5.08928-20.29056 5.08928-8.28928 0-15.34464-1.91488-21.16608-5.74464a31.1808 31.1808 0 0 1-12.43648-15.41632h-1.3056v19.70688h-29.52704V133.12h30.98112zM699.07456 130.93888c-11.4944 0-21.38112 2.32448-29.67552 6.97856-8.2432 4.70528-14.592 11.34592-19.05152 19.93216-4.46464 8.6272-6.69184 18.83136-6.69184 30.6176 0 11.48928 2.2272 21.57568 6.69184 30.25408 4.45952 8.6784 10.73664 15.44192 18.83648 20.29056 8.1408 4.84864 17.69472 7.2704 28.65152 7.2704 7.3728 0 14.2336-1.18784 20.5824-3.56352a45.64992 45.64992 0 0 0 16.72704-10.54208c4.80256-4.70528 8.53504-10.61888 11.20256-17.74592 2.6624-7.08096 3.99872-15.37024 3.99872-24.87296v-8.50944h-76.07296v-0.07168c0-5.5296 1.01888-10.30656 3.05152-14.33088a22.4 22.4 0 0 1 8.80128-9.30816c3.78368-2.18112 8.2688-3.27168 13.45536-3.27168 3.44064 0 6.59456 0.4864 9.45664 1.45408a19.56352 19.56352 0 0 1 7.34208 4.36224c2.03776 1.94048 3.58912 4.31616 4.65408 7.12704l28.65664-1.88928a39.10656 39.10656 0 0 0-8.94464-18.03776c-4.45952-5.08928-10.22976-9.06752-17.31072-11.92448-7.02976-2.816-15.15008-4.21888-24.36096-4.21888z m-21.67296 80.29184a24.18176 24.18176 0 0 1-3.0976-10.9824h46.87872c0 4.45952-0.9728 8.41216-2.90816 11.8528a20.88448 20.88448 0 0 1-8.07424 8.07424c-3.39456 1.98656-7.3472 2.97984-11.8528 2.97984-4.70528 0-8.87296-1.09056-12.51328-3.27168-3.584-2.13504-6.4-5.0176-8.43264-8.6528zM814.78144 179.66592v-38.47168h26.0352v38.47168h38.4768v26.0352h-38.4768v38.47168h-26.0352v-38.47168h-38.47168v-26.0352h38.47168z" horiz-adv-x="1024" />
<glyph glyph-name="weiduzhilian" unicode="&#60126;" d="M87.716 16c-4.264 0-7.716-3.58-7.716-8v-64c0-4.42 3.452-8 7.716-8H936.28c4.264 0 7.716 3.58 7.716 8v64c0 4.42-3.452 8-7.716 8H87.716zM544.008 531.376C612.584 546.072 664 607.032 664 680c0 83.948-68.052 152-152 152-83.944 0-152-68.052-152-152 0-70.104 47.464-129.128 112.008-146.68v-111.268l-103.104-76.94A151.376 151.376 0 0 1 272 380c-83.948 0-152-68.052-152-152s68.052-152 152-152 152 68.052 152 152a151.492 151.492 0 0 1-12.044 59.4l96.364 71.916 108.948-78.948A151.692 151.692 0 0 1 608.008 228c0-83.948 68.052-152 152-152 83.944 0 152 68.052 152 152s-68.056 152-152 152c-39.532 0-75.536-15.088-102.572-39.824l-113.428 82.196v109z m216-387.82c-46.64 0-84.444 37.808-84.444 84.444s37.804 84.444 84.444 84.444c46.636 0 84.444-37.808 84.444-84.444s-37.808-84.444-84.444-84.444zM512 600c-44.18 0-80 35.816-80 80s35.82 80 80 80c44.184 0 80-35.816 80-80s-35.816-80-80-80z m-155.556-372c0-46.636-37.808-84.444-84.444-84.444-46.64 0-84.444 37.808-84.444 84.444S225.36 312.444 272 312.444c46.64 0 84.444-37.808 84.444-84.444z" horiz-adv-x="1024" />
<glyph glyph-name="a-leixingzhibiaozhilianonyifabuoff" unicode="&#60125;" d="M87.716 16c-4.264 0-7.716-3.58-7.716-8v-64c0-4.42 3.452-8 7.716-8H936.28c4.264 0 7.716 3.58 7.716 8v64c0 4.42-3.452 8-7.716 8H87.716zM915.512 785.396a8 8 0 0 1-8.912 8.912l-219.136-26.796c-6.62-0.808-9.4-8.88-4.688-13.6l72.64-72.64-197.664-185.872-138.8 143.14a33.436 33.436 0 0 1-46.2 1.936L99.864 388.28a8 8 0 0 1-0.632-11.1l33.6-38.984a8 8 0 0 1 11.508-0.64l248.412 230.704 139.248-143.608a33.44 33.44 0 0 1 46.704-1.484l224.352 210.46 72.06-72.06c4.716-4.716 12.788-1.932 13.596 4.684l26.796 219.14zM804 80a8 8 0 0 0-8 8V496a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-408a8 8 0 0 0-8-8h-64zM436 432a8 8 0 0 1-8 8H364a8 8 0 0 1-8-8v-344a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v344zM576 88a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v244a8 8 0 0 1-8 8h-64a8 8 0 0 1-8-8v-244zM144 88a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v168a8 8 0 0 1-8 8H152a8 8 0 0 1-8-8v-168z" horiz-adv-x="1024" />
<glyph glyph-name="a-5dengfen" unicode="&#60124;" d="M80 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H80z m800-80v-640H144V704h736zM522.948 458.416c26.836 0 51.332-6.444 73.484-19.328 22.152-12.456 39.616-30.496 52.396-54.12 12.78-23.196 19.172-50.04 19.172-80.54 0-33.072-7.244-61.852-21.728-86.336-14.056-24.052-33.44-42.52-58.148-55.408-24.708-12.456-51.972-18.684-81.792-18.684-35.36 0-66.032 8.16-92.016 24.484-25.56 16.32-43.664 41.02-54.316 74.092l74.764 43.168c5.536-19.328 14.484-33.932 26.836-43.812 12.356-9.88 26.84-14.816 43.452-14.816 20.876 0 36.852 6.872 47.928 20.616 11.5 14.176 17.252 32 17.252 53.476s-5.964 39.304-17.892 53.476c-11.5 14.604-28.116 21.908-49.844 21.908-28.116 0-50.48-13.96-67.092-41.88l-66.456 32.86L400.896 624h245.376v-79.892h-167.416l-12.78-97.288c18.316 7.732 37.272 11.596 56.872 11.596z" horiz-adv-x="1024" />
<glyph glyph-name="gongnenglan-lishibuzhoutubiao" unicode="&#60123;" d="M160 720a16 16 0 0 0 16 16h473.464c4.188 0 8.212-1.64 11.204-4.576l198.536-194.72A16 16 0 0 0 864 525.28V48a16 16 0 0 0-16-16H176a16 16 0 0 0-16 16V720z m476-188V684H212v-600h600V520h-160c-8.836 0-16 3.16-16 12zM678.628 335.716a32.012 32.012 0 0 0 4.46-39.676 31.836 31.836 0 0 0-5.716-7.756l-113.136-113.136a8 8 0 0 0-11.316 0l-28.284 28.284a8 8 0 0 0 0 11.312l67.764 67.764H344a8 8 0 0 0-8 8v40a8 8 0 0 0 8 8h252.636l-70.744 70.748a8 8 0 0 0 0 11.312l28.284 28.284a8 8 0 0 0 11.316 0l113.136-113.136z" horiz-adv-x="1024" />
<glyph glyph-name="yewumoxing-zhilian" unicode="&#60122;" d="M529.452 827.488a35.992 35.992 0 0 1-34.904 0l-316-175.172A36 36 0 0 1 160 620.828v-351.364a36 36 0 0 1 18.544-31.484l316.004-175.172a35.988 35.988 0 0 1 34.904 0l316 175.172a35.996 35.996 0 0 1 18.548 31.484V620.828a35.996 35.996 0 0 1-18.548 31.488l-316 175.168zM512 760l284-157.088v-313.824L512 132l-284 157.088V602.912L512 760zM301.656 516.568a8 8 0 0 0-3.108 10.892l23.368 41.928a8 8 0 0 0 10.868 3.1l176.484-97.872a7.992 7.992 0 0 1 7.76 0l176.48 97.872a8 8 0 0 0 10.868-3.1l23.368-41.928a8 8 0 0 0-3.104-10.892l-175.372-97.256a8.008 8.008 0 0 1-4.12-6.996v-184.684a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v184.684a8 8 0 0 1-4.12 6.996L301.656 516.568zM111.716 16c-4.264 0-7.716-3.58-7.716-8v-64c0-4.42 3.452-8 7.716-8H912.28c4.264 0 7.716 3.58 7.716 8v64c0 4.42-3.452 8-7.716 8H111.716z" horiz-adv-x="1024" />
<glyph glyph-name="ziduanleixing-1" unicode="&#60120;" d="M928.168 848c0 4.42-3.6 8-8.048 8h-40.24a8.02 8.02 0 0 1-8.048-8v-73.036l-63.636 36.52a8.08 8.08 0 0 1-10.996-2.928l-20.12-34.64a7.972 7.972 0 0 1 2.944-10.928l63.636-36.52-63.636-36.52a7.972 7.972 0 0 1-2.944-10.924l20.12-34.64a8.08 8.08 0 0 1 10.996-2.932l63.636 36.52V604c0-4.42 3.6-8 8.048-8h40.24a8.02 8.02 0 0 1 8.048 8V677.972l63.636-36.52a8.08 8.08 0 0 1 10.996 2.928l20.12 34.64a7.972 7.972 0 0 1-2.944 10.928l-63.636 36.52 63.636 36.52a7.972 7.972 0 0 1 2.944 10.928l-20.12 34.64a8.08 8.08 0 0 1-10.996 2.928l-63.636-36.52V848zM472 9.592c-214.288 0-388 173.712-388 388s173.712 388 388 388c198.58 0 362.32-149.184 385.252-341.592h-63.24a306.844 306.844 0 0 1-9.428 0.216C762.044 596.632 630.68 713.592 472 713.592c-174.52 0-316-141.48-316-316 0-174.524 141.48-316 316-316v-72z m146.396 388a311.636 311.636 0 0 1-86.376-80H400a8 8 0 0 0-8 8v272a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-200h146.396zM532 156.288c0 135.476 109.828 245.304 245.304 245.304 135.48 0 245.304-109.828 245.304-245.304 0-135.48-109.824-245.304-245.304-245.304-14.764 0-29.22 1.304-43.268 3.804 0.408 0.632 0.728 1.332 0.948 2.084l7.004 24.08 44.216 201.856h82.84a8 8 0 0 1 8 8v37.916a8 8 0 0 1-8 8h-71.032l9.3 42.456c7.732 26.588 32.932 44.968 61.644 44.968h38.632a8 8 0 0 1 8 8v36.748a8 8 0 0 1-8 8h-38.632c-53.324 0-100.124-34.14-114.48-83.512l-12.664-56.66h-67.028a8 8 0 0 1-8-8v-37.916a8 8 0 0 1 8-8h54.98l-43.524-194.752-5.144-17.488C593.44-32.02 532 54.956 532 156.288z" horiz-adv-x="1024" />
<glyph glyph-name="ziduanleixing" unicode="&#60121;" d="M928.168 848c0 4.42-3.6 8-8.048 8h-40.24a8.02 8.02 0 0 1-8.048-8v-73.036l-63.636 36.52a8.08 8.08 0 0 1-10.996-2.928l-20.12-34.64a7.972 7.972 0 0 1 2.944-10.928l63.636-36.52-63.636-36.52a7.972 7.972 0 0 1-2.944-10.924l20.12-34.64a8.08 8.08 0 0 1 10.996-2.932l63.636 36.52V604c0-4.42 3.6-8 8.048-8h40.24a8.02 8.02 0 0 1 8.048 8V677.972l63.636-36.52a8.08 8.08 0 0 1 10.996 2.928l20.12 34.64a7.972 7.972 0 0 1-2.944 10.928l-63.636 36.52 63.636 36.52a7.972 7.972 0 0 1 2.944 10.928l-20.12 34.64a8.08 8.08 0 0 1-10.996 2.928l-63.636-36.52V848zM864 380c0-214.288-173.712-388-388-388s-388 173.712-388 388 173.712 388 388 388 388-173.712 388-388z m-704 0c0-174.52 141.48-316 316-316s316 141.48 316 316-141.48 316-316 316-316-141.48-316-316z m316 0h184a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-256a8 8 0 0 0-8 8V580a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-200z" horiz-adv-x="1024" />
<glyph glyph-name="zhinengpeizhi" unicode="&#60119;" d="M319.46 805.24c-5.312 14.348-25.608 14.348-30.92 0L239.444 656.552l-132.68-49.096c-14.352-5.312-14.352-25.608 0-30.92l132.68-49.096 49.096-148.68c5.312-14.352 25.608-14.352 30.92 0l49.096 148.68 132.68 49.096c14.352 5.312 14.352 25.608 0 30.92l-132.68 49.096-49.096 148.68z m303.644-191.76c-5.188 14.024-25.02 14.024-30.208 0l-79.508-230.868-214.872-79.508c-14.02-5.188-14.02-25.02 0-30.208l214.872-79.508 79.508-230.872c5.188-14.02 25.02-14.02 30.208 0l79.508 230.872 214.872 79.508c14.02 5.188 14.02 25.02 0 30.208l-214.872 79.508-79.508 230.872z" horiz-adv-x="1024" />
<glyph glyph-name="zhilian" unicode="&#60116;" d="M513.22-30.08c-60.292 60.292-60.292 158.04 0 218.332l53.108 53.108c58.392 58.396 151.928 60.232 212.532 5.512 3.28-2.96 3.268-8.044 0.144-11.168l-41.796-41.796c-3.124-3.124-8.168-3.084-11.588-0.288-31.14 25.476-77.132 23.688-106.184-5.368l-53.108-53.108c-30.964-30.96-30.964-81.156 0-112.116 30.96-30.96 81.156-30.96 112.116 0l42.728 42.728a7.996 7.996 0 0 0 11.316 0l41.792-41.792a8 8 0 0 0 0-11.316l-42.728-42.728c-60.292-60.292-158.044-60.292-218.332 0zM918.904 402.164c61.104-61.104 61.104-160.176 0-221.284l-50.156-50.156c-59.212-59.208-154.064-61.048-215.488-5.512-3.276 2.964-3.264 8.044-0.14 11.168l41.796 41.796c3.124 3.124 8.168 3.088 11.58 0.28 31.96-26.284 79.276-24.492 109.144 5.376l50.156 50.156c31.776 31.776 31.776 83.296 0 115.068-31.776 31.776-83.292 31.776-115.068 0l-39.484-39.484a8 8 0 0 0-11.312 0l-41.796 41.796a8 8 0 0 0 0 11.312l39.484 39.484c61.108 61.108 160.18 61.108 221.284 0zM500 824c211.344 0 389.452-78.872 391.972-176.592H892v-176.676l-64.9 21.848v44.96c-73.032-43.088-180.788-70.928-327.1-70.928-130.312 0-250.068 27.84-323.1 70.928v-143.336c0-6.828 3.308-16.572 16.476-28.952 13.332-12.532 34.648-25.552 64.204-37.304 58.96-23.444 147.228-42.856 242.42-42.856 16.916 0 33.024 0.448 48.384 1.292l-68.76-68.76c-95.996 2.02-187.2 18.236-253.688 44.672-17.524 6.968-34.04 14.828-49.04 23.608v-137.108c0-6.828 3.312-16.572 16.48-28.952 13.332-12.532 34.648-29.556 64.204-41.308 43.372-17.24 102.6-34.472 168.776-42.376l34.724-67.348c-85.74 3.648-157.12 19.416-219.14 44.072-35.512 14.12-66.848 31.9-89.908 53.572C128.812 88.284 112 116.148 112 148.796V647.408h0.028C114.548 745.128 280.656 824 500 824z m327.1-178.692c0 3.4-16.476 40.96-71.12 66.06C698 738 626 764.32 500 764.32S306 742 248.02 711.368c-63.18-33.38-71.12-62.664-71.12-66.06 0-3.4 5.88-28.92 71.12-58.06C307.3 560.76 398.876 542.296 500 542.296c117.12 0 196.704 18.468 255.98 44.952 65.244 29.144 71.12 54.66 71.12 58.06z" horiz-adv-x="1024" />
<glyph glyph-name="chouqu" unicode="&#60117;" d="M728.264 247.056a8 8 0 0 0 0-11.312l-33.94-33.944a8 8 0 0 0-11.316 0l-137.988 137.992v-369.088a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v368.516L343.596 201.8a8 8 0 0 0-11.312 0l-33.94 33.94a8 8 0 0 0 0 11.316l175.284 175.284 0.076 0.08 33.944 33.94a8 8 0 0 0 11.312 0l209.304-209.304zM97.252 414.156c-21.832-38.216-33.28-81.212-33.252-124.924 0-135.424 107.672-246.388 244.336-257.232l31.664 0.06V104h-23.272l-7.228 0.528c-39.5 2.956-77.028 17.948-107.224 42.84-30.192 24.892-51.512 58.408-60.912 95.76a177.4 177.4 0 0 0 8.584 112.232c14.976 35.6 41.16 65.692 74.812 85.984l33.62 20.392 5.012 38.184C271.2 558.548 300.736 612.412 346.48 651.44 392.228 690.476 451.052 712 511.96 712c60.908 0 119.732-21.528 165.48-60.56 45.744-39.028 75.284-92.892 83.088-151.52l5.012-38.184 33.708-20.392c33.652-20.292 59.836-50.392 74.808-85.992a177.412 177.412 0 0 0 8.576-112.24c-9.404-37.356-30.732-70.872-60.932-95.76-30.2-24.888-67.736-39.876-107.24-42.824l-7.224-0.528H684v-71.308l31.564 0.06c55.628 4.152 108.48 25.276 151.016 60.356 42.536 35.08 72.576 82.328 85.836 134.988a250.436 250.436 0 0 1-12.008 158.252c-21.064 50.204-57.908 92.656-105.28 121.296-10.08 76.376-48.452 146.56-107.936 197.432C667.708 755.94 591.188 784 511.952 784c-79.236 0-155.756-28.06-215.24-78.924C237.228 654.208 198.856 584.02 188.776 507.64c-38.192-23.092-69.692-55.268-91.52-93.488z" horiz-adv-x="1024" />
<glyph glyph-name="kuozhanziduan" unicode="&#60118;" d="M712 616H272v-64h188v-336h64V552h188V616zM712 352a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-168h168a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-168v-168a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v168h-176a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h176v168zM112 768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-424h-64V720H176v-672h368v-64H128a16 16 0 0 0-16 16V768z" horiz-adv-x="1024" />
<glyph glyph-name="anniuzu" unicode="&#60115;" d="M136 672h716V736a8 8 0 0 1-8 8H72a8 8 0 0 1-8-8v-560a8 8 0 0 1 8-8h64V672zM252 540h636v-452H252V540zM188 612a8 8 0 0 1-8-8v-580a8 8 0 0 1 8-8h764a8 8 0 0 1 8 8V604a8 8 0 0 1-8 8H188zM376.852 456c47.948 0 86.216-16.276 86.216-71.552 0-25.512-11.552-53.28-30.216-62.184v-1.596c23.332-7.704 41.064-29.364 41.064-67.628 0-58.732-40.132-85.04-90.532-85.04H296v288h80.852z m270.66 0v-57.6h-58.824V168h-55.708v230.4h-58.532V456h173.064z m69.264 0l57.516-137.988 22.748-63.78h1.52c-2.8 30.564-7.468 71.884-7.468 106.3V456H844v-288h-56.584l-57.284 138.784-22.748 62.984h-1.516c2.508-32.092 7.172-71.488 7.172-106.3V168h-52.908v288h56.644zM379.36 290.908h-27.712v-69.96h27.712c26.772 0 40.424 11.96 40.424 36.74 0 23.584-13.416 33.22-40.424 33.22z m-4.668 112.076h-23.04v-61.452h23.04c23.624 0 34.24 12.756 34.24 32.42 0 20.528-10.908 29.032-34.24 29.032z" horiz-adv-x="1024" />
<glyph glyph-name="yichuyixuan" unicode="&#60114;" d="M512 50.793651c-184.023365 0-333.206349 149.182984-333.206349 333.206349s149.182984 333.206349 333.206349 333.206349 333.206349-149.182984 333.206349-333.206349-149.182984-333.206349-333.206349-333.206349z m0-73.142857c224.41854 0 406.349206 181.930667 406.349206 406.349206S736.41854 790.349206 512 790.349206 105.650794 608.41854 105.650794 384s181.930667-406.349206 406.349206-406.349206zM382.699683 565.020444a8.126984 8.126984 0 0 1-11.491556 0l-40.228571-40.228571a8.126984 8.126984 0 0 1 0-11.491556l129.300317-129.300317-129.300317-129.300317a8.126984 8.126984 0 0 1 0-11.491556l40.228571-40.228571a8.126984 8.126984 0 0 1 11.491556 0l129.300317 129.300317 129.300317-129.300317a8.126984 8.126984 0 0 1 11.491556 0l40.228571 40.228571a8.126984 8.126984 0 0 1 0 11.491556L563.720127 384l129.300317 129.300317a8.126984 8.126984 0 0 1 0 11.491556l-40.228571 40.228571a8.126984 8.126984 0 0 1-11.491556 0L512 435.720127l-129.300317 129.300317z" horiz-adv-x="1024" />
@ -26,7 +82,7 @@
<glyph glyph-name="a-2_1" unicode="&#60107;" d="M80 784h864a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16z m800-80H144v-640h736V704zM596 704h80v-640h-80V704z" horiz-adv-x="1024" />
<glyph glyph-name="sidengfen" unicode="&#60108;" d="M80 784h864a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16z m800-80H144v-640h736V704zM268 704h80v-640H268V704zM472 704h80v-640h-80V704zM676 704h80v-640h-80V704z" horiz-adv-x="1024" />
<glyph glyph-name="sidengfen" unicode="&#60108;" d="M80 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h864a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H80z m800-80v-640H144V704h736zM625.924 433.06v-108.248H688v-78.492h-62.076V152h-89.036v94.32H340v62.668L498.012 616h95.308l-151.116-291.188h94.684v108.248h89.036z" horiz-adv-x="1024" />
<glyph glyph-name="sandengfen" unicode="&#60109;" d="M80 784h864a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H80a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16z m800-80H144v-640h736V704zM336 704h80v-640H336V704zM608 704h80v-640h-80V704z" horiz-adv-x="1024" />
@ -48,15 +104,15 @@
<glyph glyph-name="yewumoxing1" unicode="&#60102;" d="M529.452 807.488a35.992 35.992 0 0 1-34.904 0l-352-195.128A36 36 0 0 1 124 580.872v-391.452a36 36 0 0 1 18.544-31.484l352.004-195.128a35.988 35.988 0 0 1 34.904 0l352 195.128a35.996 35.996 0 0 1 18.548 31.484V580.872a35.996 35.996 0 0 1-18.548 31.488l-352 195.124z m-278.08-304.424l23.276 41.98a8 8 0 0 0 10.876 3.116l226.48-125.6 226.472 125.6a8 8 0 0 0 10.876-3.12l23.28-41.976a8 8 0 0 0-3.116-10.876l-225.512-125.064v-246.668a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8v246.668l-225.52 125.064a8 8 0 0 0-3.116 10.88z" horiz-adv-x="1024" />
<glyph glyph-name="weidu1" unicode="&#60092;" d="M598.14 159.992c32.812-24.428 78.876-20.464 107.176 9.112 28.304 29.62 30.36 76.096 4.812 108.136-25.544 32.04-71.084 40.052-105.952 18.704l-3.28-2.024-81.192 51.056v92.4l4.68 1.232c39.68 10.256 65.708 48.852 60.544 89.74-5.16 40.84-39.896 71.652-80.84 71.652-41.12 0-75.9-30.808-81.06-71.652-5.164-40.932 20.864-79.484 60.588-89.74l4.68-1.188v-92.444l-81.192-51.056-3.28 2.024c-34.824 21.348-80.408 13.292-105.956-18.704-25.544-32.04-23.488-78.516 4.816-108.136 28.3-29.576 74.364-33.54 107.176-9.112 32.808 24.384 42.608 69.848 22.792 105.76l-2.888 5.192L504 317.6l74.236-46.656-2.888-5.192c-19.86-35.912-10.06-81.376 22.792-105.76zM136 804a16 16 0 0 1-16-16v-808a16 16 0 0 1 16-16h752a16 16 0 0 1 16 16V593.28a16 16 0 0 1-4.796 11.424l-198.536 194.72A16.004 16.004 0 0 1 689.464 804H136z m536-56v-148a16 16 0 0 1 16-16h160v-564H176V748h496z" horiz-adv-x="1024" />
<glyph glyph-name="weidu1" unicode="&#60092;" d="M544 475.044c77.48 14.944 136 83.116 136 164.956 0 92.784-75.216 168-168 168S344 732.784 344 640c0-79 54.528-145.264 128-163.208v-134.74l-127.148-94.884A161.348 161.348 0 0 1 242 284C152.532 284 80 211.47199999999998 80 122S152.532-40 242-40c89.472 0 162 72.528 162 162a161.376 161.376 0 0 1-15.036 68.248l119.352 89.068 125.772-91.14A161.452 161.452 0 0 1 620 122c0-89.472 72.528-162 162-162s162 72.528 162 162-72.528 162-162 162a161.36 161.36 0 0 1-104.604-38.292L544 342.37199999999996v132.672zM608 640c0-53.02-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM332 122c0-49.704-40.296-90-90-90S152 72.29600000000005 152 122 192.296 212 242 212 332 171.70399999999995 332 122zM782 32c-49.704 0-90 40.296-90 90s40.296 90 90 90 90-40.296 90-90-40.296-90-90-90z" horiz-adv-x="1024" />
<glyph glyph-name="zhibiao1" unicode="&#60095;" d="M472 576a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-420a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8V576zM300 440a8 8 0 0 1-8-8v-276a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v276a8 8 0 0 1-8 8H300zM652 348a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-192a8 8 0 0 0-8-8h-64a8 8 0 0 0-8 8v192zM136 804a16 16 0 0 1-16-16v-808a16 16 0 0 1 16-16h752a16 16 0 0 1 16 16V593.28a16 16 0 0 1-4.796 11.424l-198.536 194.72A16.004 16.004 0 0 1 689.464 804H136z m536-56v-148a16 16 0 0 1 16-16h160v-564H176V748h496z" horiz-adv-x="1024" />
<glyph glyph-name="zhibiao1" unicode="&#60095;" d="M915.512 785.396a8 8 0 0 1-8.912 8.912l-219.136-26.796c-6.62-0.808-9.4-8.88-4.688-13.6l72.64-72.64-197.664-185.872-138.8 143.14a33.436 33.436 0 0 1-46.2 1.936L99.864 388.28a8 8 0 0 1-0.632-11.1l33.6-38.984a8 8 0 0 1 11.508-0.64l248.412 230.704 139.248-143.608a33.44 33.44 0 0 1 46.704-1.484l224.352 210.46 72.06-72.06c4.716-4.716 12.788-1.932 13.596 4.684l26.796 219.14zM804-16a8 8 0 0 0-8 8V496a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-504a8 8 0 0 0-8-8h-64zM436 432a8 8 0 0 1-8 8H364a8 8 0 0 1-8-8v-440a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V432zM576-8a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v340a8 8 0 0 1-8 8h-64a8 8 0 0 1-8-8v-340zM144-8a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v264a8 8 0 0 1-8 8H152a8 8 0 0 1-8-8v-264z" horiz-adv-x="1024" />
<glyph glyph-name="gengxinyuce" unicode="&#60093;" d="M464 832c220.912 0 400-179.088 400-400 0-96.052-33.856-184.196-90.284-253.148l179.752-179.752a8 8 0 0 0 0-11.316l-45.252-45.256a8 8 0 0 0-11.316 0l-179.752 179.756C648.196 65.856 560.052 32 464 32c-220.912 0-400 179.088-400 400S243.088 832 464 832z m0-80c-176.732 0-320-143.268-320-320s143.268-320 320-320 320 143.268 320 320-143.268 320-320 320zM707.172 515.632a8 8 0 0 0 0-11.312l-173.516-173.516a8 8 0 0 0-11.312 0l-131.372 131.372-129.72-129.712a7.992 7.992 0 0 0-11.312 0l-39.6 39.596a8 8 0 0 0 0 11.312l174.972 174.972a8 8 0 0 0 11.316 0L528 426.972l128.26 128.26a8 8 0 0 0 11.312 0l39.6-39.6z" horiz-adv-x="1024" />
<glyph glyph-name="quanjushitu" unicode="&#60094;" d="M904 512a8 8 0 0 1 8 8V768a16 16 0 0 1-16 16h-248a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h192v-192a8 8 0 0 1 8-8h56zM384 776a8 8 0 0 1-8 8H128a16 16 0 0 1-16-16v-248a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V712h192a8 8 0 0 1 8 8V776zM112 248a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-192h192a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H128a16 16 0 0 0-16 16v248zM648-16a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h192v192a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-248a16 16 0 0 0-16-16h-248zM698.668 552a16 16 0 0 1-16 16H352a16 16 0 0 1-16-16v-330.668a16 16 0 0 1 16-16h330.668a16 16 0 0 1 16 16V552zM408 496h218.668v-218.668H408V496z" horiz-adv-x="1024" />
<glyph glyph-name="yewumoxing" unicode="&#60096;" d="M494.336 811.432a36.432 36.432 0 0 0 35.328 0l356.244-197.48a36.436 36.436 0 0 0 18.772-31.868v-396.168a36.44 36.44 0 0 0-18.772-31.868l-356.244-197.48a36.428 36.428 0 0 0-35.328 0l-356.244 197.48a36.44 36.44 0 0 0-18.772 31.868V582.084a36.432 36.432 0 0 0 18.772 31.868l356.244 197.48zM512 756.424L176 570.16v-372.328l336-186.26 336.004 186.26V570.164L512 756.424zM251.38 492.332a8.096 8.096 0 0 0-3.156 11.008l23.56 42.48a8.096 8.096 0 0 0 11.008 3.16l229.212-127.12 229.204 127.12a8.096 8.096 0 0 0 11.008-3.16l23.56-42.48c2.168-3.912 0.756-8.84-3.152-11.008l-228.232-126.576v-249.64a8.1 8.1 0 0 0-8.1-8.096h-48.576a8.096 8.096 0 0 0-8.096 8.096v249.64l-228.24 126.576z" horiz-adv-x="1024" />
<glyph glyph-name="yewumoxing" unicode="&#60096;" d="M529.664 811.432a36.432 36.432 0 0 1-35.328 0l-356.244-197.48a36.432 36.432 0 0 1-18.772-31.868v-396.168a36.44 36.44 0 0 1 18.772-31.868l356.244-197.48a36.428 36.428 0 0 1 35.328 0l356.244 197.48a36.432 36.432 0 0 1 18.768 31.868V582.0840000000001a36.432 36.432 0 0 1-18.768 31.868l-356.244 197.48zM188 563.952L512 744l324-180.048v-359.904L512 24l-324 180.048V563.952zM272.648 480.536a8 8 0 0 0-3.116 10.884l23.7 42.624a8 8 0 0 0 10.872 3.108L512 421.86l207.888 115.292a8 8 0 0 0 10.872-3.108l23.7-42.624a8 8 0 0 0-3.112-10.884l-206.964-114.78v-233.64a8.1 8.1 0 0 0-8.096-8.1h-48.58a8.1 8.1 0 0 0-8.096 8.1v233.64l-206.968 114.78z" horiz-adv-x="1024" />
<glyph glyph-name="a-leixingweiduxuanzhongoff" unicode="&#60097;" d="M184 48h-8V776a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-776a16 16 0 0 1 16-16h776a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H184zM840 720h8v-568a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8V768a16 16 0 0 1-16 16H280a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h560zM640 520h8v-368a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8V568a16 16 0 0 1-16 16H280a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h360zM440 320h8v-168a8 8 0 0 1 8-8h48a8 8 0 0 1 8 8v216a16 16 0 0 1-16 16H280a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h160z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

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.

8
packages/fineui/src/core/1.lodash.js

@ -14,7 +14,7 @@
var undefined;
/** Used as the semantic version number. */
var VERSION = '4.17.5';
var VERSION = '4.17.21';
/** Used as the size to enable large array optimizations. */
var LARGE_ARRAY_SIZE = 200;
@ -899,7 +899,7 @@
}
/**
* Gets the value at `key`, unless `key` is "__proto__".
* Gets the value at `key`, unless `key` is "__proto__" or "constructor".
*
* @private
* @param {Object} object The object to query.
@ -907,6 +907,10 @@
* @returns {*} Returns the property value.
*/
function safeGet(object, key) {
if (key === 'constructor' && typeof object[key] === 'function') {
return;
}
return key == '__proto__'
? undefined
: object[key];

2
packages/fineui/src/core/5.inject.js

@ -427,7 +427,7 @@ const providers = {},
export const Providers = {
getProvider: (type, config) => {
if (!providerInjection[type]) {
_global.console && console.error(`provider: [${type}] undefined`);
_global.console && console.warn(`provider: [${type}] undefined`);
}
runConfigFunction(type);
if (!providers[type]) {

2
packages/fineui/src/core/controller/controller.layer.js

@ -108,7 +108,7 @@ export class LayerController extends Controller {
height: offset.height || (w.outerHeight() - (offset.top || 0) - (offset.bottom || 0)) || "",
};
const { top, left, scaleY, scaleX } = getPositionRelativeContainingBlockRect(layout.element[0]);
const { top, left, scaleY, scaleX } = getPositionRelativeContainingBlockRect(layout.element[0].parentNode || layout.element[0]);
css.top = (css.top - top) / scaleY;
css.left = (css.left - left) / scaleX;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js

@ -10,6 +10,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
static EVENT_TRIGGER_COMBO = "EVENT_TRIGGER_COMBO";
_defaultConfig() {
return extend(super._defaultConfig(...arguments), {
@ -48,6 +49,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
itemsCreator: o.itemsCreator,
onClickContinueSelect() {
self.switcher.hideView();
self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO);
},
ref(_ref) {
self.checkPane = _ref;

11
packages/fineui/src/widget/multitree/multi.tree.combo.js

@ -182,6 +182,7 @@ export class MultiTreeCombo extends Single {
return self.combo.isViewVisible();
}
let shouldComboPopulate = true;
this.trigger.on(MultiSelectTrigger.EVENT_FOCUS, () => {
self.fireEvent(MultiTreeCombo.EVENT_FOCUS);
});
@ -259,7 +260,7 @@ export class MultiTreeCombo extends Single {
}
self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
self.populate();
shouldComboPopulate && self.populate();
self.fireEvent(MultiTreeCombo.EVENT_BEFORE_POPUPVIEW);
});
this.combo.on(Combo.EVENT_BEFORE_HIDEVIEW, () => {
@ -316,10 +317,18 @@ export class MultiTreeCombo extends Single {
valueFormatter: o.valueFormatter,
value: { value: o.value || {} },
});
this.numberCounter.on(
MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO,
() => {
self.populate();
shouldComboPopulate = true;
}
);
this.numberCounter.on(
MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE,
() => {
if (!self.combo.isViewVisible()) {
shouldComboPopulate = false;
self.combo.showView();
}
}

Loading…
Cancel
Save