Browse Source

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

* commit '8bb5bcda717a55e26e732d78288d590e9c864585': (48 commits)
  REPORT-111844 fix:【填报-预览】更换FR样式后,预览时间不同(可复现)
  无JIRA .bi-theme-dark 同级类名控制
  无JIRA 删掉
  BI-139672 fix: 修改高度后文本未上下居中
  KERNEL-16950 fix: 当listview在父组件tab里,且隐藏的状态,父组件watch刷新listview是否执行?如果应该要执行,这里得去掉,如果不要执行,父组件中写法就得手动setselect listview的tab后主动再刷新下;这里listview隐藏状态下选择执行
  无jia任务 多提交
  无jia任务 回退,暂时去不掉
  无jia任务 这么改看下问题
  KERNEL-16950 fix: options中对象不会被释放
  无jia任务 ref销毁
  无jia任务 先回退
  BI-133648 feat:日期过滤控件加预览模式
  无JIRA 组件销毁的时候ref处理
  KERNEL-16950 fix: 内存泄露问题
  BI-133648 feat:日期过滤控件加预览模式
  BI-140151 fix: 图标更新
  BI-133648 fix:日期过滤控件加预览模式
  BI-139113 fix: 优化subs销毁
  BI-138644 fix: 灰化的分秒可设置值
  无JIRA 更新subs实现
  ...
research/test
superman 6 months ago
parent
commit
d4a5061109
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 56
      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. 2
      packages/fineui/package.json
  7. 6
      packages/fineui/src/base/collection/collection.js
  8. 1
      packages/fineui/src/base/combination/bubble.js
  9. 5
      packages/fineui/src/base/list/listview.js
  10. 20
      packages/fineui/src/base/list/virtualgrouplist.js
  11. 3
      packages/fineui/src/case/colorchooser/colorchooser.trigger.long.js
  12. 11
      packages/fineui/src/core/2.base.js
  13. 2
      packages/fineui/src/core/4.widget.js
  14. 115
      packages/fineui/src/core/constant/writable.var.js
  15. 132
      packages/fineui/src/core/element/element.js
  16. 779
      packages/fineui/src/fix/fix.js
  17. 112
      packages/fineui/src/less/base/single/button/button.less
  18. 3
      packages/fineui/src/less/base/single/input/radio.less
  19. 81
      packages/fineui/src/less/core/utils/common.less
  20. 2
      packages/fineui/src/less/visual.less
  21. 3
      packages/fineui/src/less/widget/intervalslider/intervalslider.label.less
  22. 3
      packages/fineui/src/less/widget/intervalslider/intervalslider.less
  23. 67
      packages/fineui/src/widget/datepane/datepane.js
  24. 50
      packages/fineui/src/widget/downlist/popup.downlist.js
  25. 2
      packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js
  26. 18
      packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js
  27. 2
      packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js
  28. 19
      packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js
  29. 18
      packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js
  30. 56
      packages/fineui/src/widget/intervalslider/intervalslider.js
  31. 1
      packages/fineui/src/widget/multiselect/search/multiselect.search.loader.js
  32. 17
      packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js
  33. 4
      packages/fineui/src/widget/singleslider/button/editor.sign.text.js
  34. 2
      packages/fineui/src/widget/timeinterval/dateinterval.js
  35. 2
      packages/fineui/src/widget/timeinterval/timeinterval.js
  36. 2
      packages/fineui/src/widget/year/combo.year.js
  37. 10
      packages/fineui/src/widget/year/popup.year.js
  38. 2
      packages/fineui/src/widget/yearmonth/combo.yearmonth.js
  39. 16
      packages/fineui/src/widget/yearmonth/popup.yearmonth.js
  40. 2
      packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js
  41. 2
      packages/fineui/src/widget/yearquarter/combo.yearquarter.js
  42. 27
      packages/fineui/src/widget/yearquarter/popup.yearquarter.js

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

Binary file not shown.

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

@ -14,6 +14,48 @@
/>
<missing-glyph />
<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="a-Property1shangyou" unicode="&#60073;" d="M273.392 498.968a8 8 0 0 0-11.316 0L106.344 654.704a8 8 0 0 0 0 11.312l39.6 39.6a8.24 8.24 0 0 0 0.288 0.276L263.224 822.88a8 8 0 0 0 11.316 0l39.596-39.6a8 8 0 0 0 0-11.312L234.164 692H532a8 8 0 0 0 8-8V558.8c0-6.312-6.972-10.14-12.296-6.748l-56 35.652a8 8 0 0 0-3.704 6.748V620H242.868l70.12-70.12a8 8 0 0 0 0-11.312l-39.6-39.6zM540 201.204c0 6.316-6.972 10.14-12.296 6.748l-56-35.652a7.996 7.996 0 0 1-3.704-6.748V140H359.508c-14.944 55.308-65.476 96-125.508 96-71.8 0-130-58.204-130-130 0-71.796 58.2-130 130-130 58.576 0 108.104 38.744 124.36 92h307.284c16.252-53.256 65.78-92 124.356-92 71.796 0 130 58.204 130 130 0 71.796-58.204 130-130 130-60.032 0-110.564-40.692-125.508-96H540v61.204z m-140 11.288c0-9.836 10.836-15.804 19.124-10.524l263.104 167.504c7.696 4.9 7.696 16.156 0 21.056l-263.104 167.508c-8.288 5.276-19.124-0.692-19.124-10.528v-335.016zM292 106c0-32.032-25.968-58-58-58S176 73.968 176 106 201.968 164 234 164 292 138.032 292 106z m556 0c0-32.032-25.968-58-58-58s-58 25.968-58 58 25.968 58 58 58 58-25.968 58-58z" horiz-adv-x="1024" />
<glyph glyph-name="fenqujianshezhi" unicode="&#60072;" d="M120 168a8 8 0 0 1-8-8v-160a16 16 0 0 1 16-16h268a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8H184v104a8 8 0 0 1-8 8H120zM544 720a8 8 0 0 1 8-8h208v-192a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V768a16 16 0 0 1-16 16h-264a8 8 0 0 1-8-8v-56zM112 778.544c0 3.016 2.44 5.456 5.456 5.456H292c99.412 0 180-80.588 180-180s-80.588-180-180-180H184v-176a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V778.544z m72-69.816v-209.456c0-1.808 1.464-3.272 3.272-3.272H292c59.648 0 108 48.352 108 108S351.648 712 292 712H187.272a3.272 3.272 0 0 1-3.272-3.272z m313.964-628.708a240.964 240.964 0 0 0-21.644 49.84c-1.06 3.464 0.6 7.12 3.672 9.04a71.932 71.932 0 0 1 23.212 23.452 72.216 72.216 0 0 1 0.028 75.248 71.904 71.904 0 0 1-23.212 23.48c-3.06 1.916-4.72 5.564-3.668 9.02a239.864 239.864 0 0 0 53.768 93.584c2.472 2.664 6.484 3.056 9.692 1.344a71.504 71.504 0 0 1 69.596 1.196 71.848 71.848 0 0 1 27.184 28.012 72.16 72.16 0 0 1 8.644 31.916c0.12 3.62 2.456 6.888 5.984 7.708a238.056 238.056 0 0 0 107.652-0.048c3.524-0.82 5.856-4.084 5.98-7.7a72.204 72.204 0 0 1 8.656-31.92 71.844 71.844 0 0 1 27.196-28 71.544 71.544 0 0 1 69.592-1.168c3.204 1.712 7.22 1.324 9.692-1.344a239.72 239.72 0 0 0 32.156-43.7 240.116 240.116 0 0 0 21.652-49.848c1.052-3.46-0.604-7.112-3.676-9.032a71.868 71.868 0 0 1-23.216-23.452 72.176 72.176 0 0 1-0.028-75.248 71.892 71.892 0 0 1 23.208-23.48c3.064-1.916 4.72-5.564 3.672-9.02a239.864 239.864 0 0 0-53.768-93.584c-2.472-2.664-6.484-3.056-9.692-1.344a71.556 71.556 0 0 1-31.828 8.428 71.552 71.552 0 0 1-37.768-9.624 71.848 71.848 0 0 1-27.184-28.012 72.16 72.16 0 0 1-8.644-31.916c-0.12-3.62-2.456-6.888-5.984-7.708a238.056 238.056 0 0 0-107.652 0.048c-3.524 0.82-5.856 4.084-5.98 7.7a72.204 72.204 0 0 1-8.656 31.92 71.844 71.844 0 0 1-27.196 28 71.544 71.544 0 0 1-69.588 1.172c-3.208-1.716-7.224-1.324-9.7 1.344a240.28 240.28 0 0 0-32.152 43.696z m190.396-62.06c11.108-1.076 22.26-1.096 33.368-0.024 8.536 26.72 26.38 49.26 50.108 63.3 23.716 14.084 51.66 18.684 78.472 12.912a182.592 182.592 0 0 1 16.652 29.664c-18.268 20.944-28.36 48.076-28.34 76.188 0 28.792 10.464 55.692 28.34 76.188a187.052 187.052 0 0 1-16.696 29.664c-26.796-5.768-54.724-1.176-78.428 12.888-23.72 14.044-41.556 36.588-50.088 63.3a173.188 173.188 0 0 1-33.368 0.024c-8.536-26.72-26.38-49.26-50.108-63.3-23.712-14.084-51.66-18.684-78.472-12.912a184.136 184.136 0 0 1-16.652-29.664c18.268-20.944 28.36-48.076 28.34-76.188 0-28.792-10.464-55.692-28.34-76.188a187.052 187.052 0 0 1 16.696-29.664c26.796 5.768 54.724 1.176 78.428-12.888 23.72-14.044 41.556-36.588 50.088-63.3z m18.6 105.848a76.192 76.192 0 1 1-0.008 152.38 76.192 76.192 0 0 1 0.008-152.38z m0 45.716a30.48 30.48 0 1 0 0 60.96 30.48 30.48 0 0 0 0-60.96z" horiz-adv-x="1024" />
<glyph glyph-name="quxiaoyingshe" unicode="&#60071;" d="M180 52V716h224v-52a8 8 0 0 1 8-8h52a8 8 0 0 1 8 8V768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h328a16 16 0 0 1 16 16v104a8 8 0 0 1-8 8h-52a8 8 0 0 1-8-8v-52H180z m372-52v104a8 8 0 0 0 8 8h52a8 8 0 0 0 8-8v-52h224V716h-224v-52a8 8 0 0 0-8-8h-52a8 8 0 0 0-8 8V768a16 16 0 0 0 16 16h328a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16h-328a16 16 0 0 0-16 16zM362.808 577.568a8 8 0 0 0 11.316 0l139.12-139.124 139.124 139.12a8 8 0 0 0 11.312 0L708.052 533.2a8 8 0 0 0 0-11.316l-139.124-139.12 139.124-139.124a8 8 0 0 0 0-11.316l-44.368-44.368a8 8 0 0 0-11.316 0l-139.124 139.124-139.12-139.124a8 8 0 0 0-11.32 0L318.44 232.32a8 8 0 0 0 0 11.316l139.124 139.124-139.12 139.12a8 8 0 0 0 0 11.316l44.368 44.372z" horiz-adv-x="1024" />
<glyph glyph-name="a-yibiaobancaozuoyibiaoban_shengcheng" unicode="&#60070;" d="M384 768v-304a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h240a16 16 0 0 0 16-16zM176 720v-208h144V720H176zM472 368a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-368a16 16 0 0 1 16-16h328a16 16 0 0 1 16 16v368z m-296-48h232v-272H176v272zM912 768a16 16 0 0 1-16 16H464a16 16 0 0 1-16-16v-256a16 16 0 0 1 16-16h432a16 16 0 0 1 16 16V768z m-64-48v-160h-336V720h336zM512 32a16 16 0 0 0 16 16h368a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-368a16 16 0 0 0-16 16v32zM672 368a16 16 0 0 0 16 16h208a16 16 0 0 0 16-16v-208a16 16 0 0 0-16-16h-32a16 16 0 0 0-16 16v115.416l-157.54-157.54a16 16 0 0 0-22.628 0l-22.624 22.628a15.996 15.996 0 0 0 0 22.628L802.076 320H688a16 16 0 0 0-16 16v32z" horiz-adv-x="1024" />
<glyph glyph-name="cunchuguocheng" unicode="&#60069;" d="M128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h504a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8H184V712h474.744L840 526.744V392a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V550.628c0 4.24-1.684 8.312-4.688 11.312l-217.372 217.372A15.992 15.992 0 0 1 678.628 784H128z m638.352-821.96a7.992 7.992 0 0 1 11.312 0l192.336 192.332a8 8 0 0 1 0 11.312l-33.944 33.94-0.08 0.08-158.312 158.316a8 8 0 0 1-11.316 0l-33.94-33.944a8 8 0 0 1 0-11.312l120.452-120.452h-273.544a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h274.116l-121.02-121.02a8 8 0 0 1 0-11.312l33.94-33.94zM285.456 648C282.44 648 280 645.56 280 642.544V112a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8v176h108c99.412 0 180 80.588 180 180s-80.588 180-180 180H285.456z m69.816-72H460c59.648 0 108-48.352 108-108s-48.352-108-108-108H355.272a3.272 3.272 0 0 0-3.272 3.272V572.728c0 1.808 1.464 3.272 3.272 3.272z" horiz-adv-x="1024" />
<glyph glyph-name="Variant3" unicode="&#60068;" d="M80 768a16 16 0 0 0 16 16h566.628c4.244 0 8.312-1.684 11.312-4.688l217.372-217.372A15.988 15.988 0 0 0 896 550.628V456h-72V526.744L642.744 712H152v-656h104v396a16 16 0 0 0 16 16h216v-72H328v-340h112v-72H96a16 16 0 0 0-16 16V768zM474.16 47.024a287.66 287.66 0 0 0-25.804 59.752c-1.188 3.924 0.692 8.064 4.188 10.24a85.532 85.532 0 0 1 27.836 28.12 86.252 86.252 0 0 1 12.572 44.832 86.252 86.252 0 0 1-12.54 44.84 85.464 85.464 0 0 1-27.832 28.152c-3.484 2.172-5.364 6.304-4.184 10.224a286.22 286.22 0 0 0 64.104 112.06c2.836 3.056 7.456 3.508 11.128 1.524a84.736 84.736 0 0 1 37.992-10.152 84.72 84.72 0 0 1 44.836 11.464 85.544 85.544 0 0 1 32.272 33.384 86.224 86.224 0 0 1 10.268 38.388c0.12 4.112 2.784 7.82 6.804 8.76a281.6 281.6 0 0 0 128.376-0.052c4.016-0.944 6.676-4.648 6.796-8.756a86.28 86.28 0 0 1 10.288-38.392 85.496 85.496 0 0 1 32.284-33.364 84.64 84.64 0 0 1 82.82-1.284c3.672 1.984 8.296 1.536 11.128-1.524a285.98 285.98 0 0 0 38.344-52.264 286.668 286.668 0 0 0 25.808-59.756c1.188-3.924-0.696-8.06-4.188-10.232a85.48 85.48 0 0 1-27.84-28.124 86.252 86.252 0 0 1-12.572-44.832 86.224 86.224 0 0 1 12.54-44.84 85.424 85.424 0 0 1 27.832-28.152c3.484-2.172 5.364-6.304 4.184-10.224a286.18 286.18 0 0 0-64.108-112.06c-2.832-3.056-7.452-3.508-11.124-1.524a84.736 84.736 0 0 1-37.996 10.152 84.72 84.72 0 0 1-44.832-11.464 85.488 85.488 0 0 1-32.272-33.384 86.28 86.28 0 0 1-10.272-38.388c-0.12-4.112-2.78-7.82-6.8-8.76a281.62 281.62 0 0 0-128.38 0.052c-4.016 0.944-6.672 4.648-6.792 8.756a86.316 86.316 0 0 1-10.288 38.392 85.496 85.496 0 0 1-32.284 33.364 84.652 84.652 0 0 1-82.816 1.288c-3.676-1.988-8.304-1.536-11.136 1.528a286.504 286.504 0 0 0-38.34 52.256z m224.372-72.72a209.28 209.28 0 0 1 39.92-0.028c10.212 31.66 31.56 58.368 59.952 75.004a131.096 131.096 0 0 0 93.876 15.3 215.772 215.772 0 0 1 19.924 35.148c-21.856 24.816-33.928 56.964-33.904 90.276 0 34.116 12.516 65.988 33.904 90.276a221.108 221.108 0 0 1-19.976 35.144 131.096 131.096 0 0 0-93.824 15.272c-28.38 16.644-49.72 43.352-59.924 75.004a209.28 209.28 0 0 1-39.92 0.028c-10.212-31.656-31.56-58.368-59.952-75.004a131.096 131.096 0 0 0-93.876-15.3 217.396 217.396 0 0 1-19.924-35.144c21.856-24.82 33.928-56.968 33.904-90.276 0-34.12-12.516-65.988-33.904-90.276a221.148 221.148 0 0 1 19.976-35.148 131.096 131.096 0 0 0 93.824-15.272c28.38-16.644 49.72-43.352 59.924-75.004zM653.58 125.256a89.296 89.296 0 0 1 63.004-25.98 89.312 89.312 0 0 1 63.008 25.98 88.504 88.504 0 0 1 26.1 62.728 88.496 88.496 0 0 1-26.1 62.724 89.316 89.316 0 0 1-63.008 25.984 89.3 89.3 0 0 1-63.004-25.984 88.496 88.496 0 0 1-26.1-62.724 88.504 88.504 0 0 1 26.1-62.728z m88.78 37.068a36.524 36.524 0 0 0-25.776-10.628 36.516 36.516 0 0 0-25.772 10.628 36.208 36.208 0 0 0-10.68 25.66c0 9.624 3.844 18.856 10.68 25.66a36.532 36.532 0 0 0 25.772 10.628c9.668 0 18.94-3.824 25.776-10.628a36.204 36.204 0 0 0 10.676-25.66c0-9.624-3.84-18.856-10.676-25.66z" horiz-adv-x="1024" />
<glyph glyph-name="weidu" unicode="&#60067;" 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" />
<glyph glyph-name="zhibiao" unicode="&#60066;" d="M112 772a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-772a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v167h72V56h656V716H184v-330H112V772zM739.944 560.104c1.592 5.948-3.852 11.392-9.8 9.8l-187.38-50.212c-5.948-1.592-7.94-9.028-3.584-13.384l43.096-43.096-148.772-140.32-127.972 116.512a8 8 0 0 1-10.704 0.06l-176.852-157.44a8 8 0 0 1-0.656-11.296l37.236-41.828a8 8 0 0 1 11.292-0.656l133.82 119.132 129.22-117.648a8 8 0 0 1 10.876 0.096l193.444 182.456 43.144-43.144c4.352-4.352 11.788-2.36 13.384 3.588l50.208 187.38z" horiz-adv-x="1024" />
<glyph glyph-name="a-bofangtingzhichadui" unicode="&#60065;" d="M88 784h304v-72H144v-340h248v-72H88a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16zM879.44 372H640v-72h295.44a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H640v-72h239.44v-340zM728.264 540.352a8 8 0 0 0 0-11.312l-39.596-39.6a8 8 0 0 0-11.316 0L548 618.796V56h196a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8H280a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h196V616.188L349.256 489.44a8 8 0 0 0-11.316 0l-39.6 39.6a8 8 0 0 0 0 11.312l209.308 209.304a7.996 7.996 0 0 0 11.312 0l209.304-209.304z" horiz-adv-x="1024" />
<glyph glyph-name="xiangguanzhibiao" unicode="&#60064;" d="M795.052 551.148a7.992 7.992 0 0 0 0-11.316l-196.14-196.14a8 8 0 0 0-11.316 0l-153.996 154-152.344-152.344a8 8 0 0 0-11.316 0l-39.6 39.596a8 8 0 0 0 0 11.316l197.6 197.6a8 8 0 0 0 11.316 0l154-154.004 150.888 150.888a8 8 0 0 0 11.312 0l39.596-39.6zM896 784a16 16 0 0 0 16-16v-624a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h768zM184 712v-512h656V712H184zM324 44a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h372a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H324z" horiz-adv-x="1024" />
<glyph glyph-name="guanlian" unicode="&#60063;" d="M600 520H376c-53.02 0-96-42.98-96-96v-328c0-53.02 42.98-96 96-96h488c53.02 0 96 42.98 96 96v328c0 53.02-42.98 96-96 96h-48v-72h32c22.092 0 40-17.908 40-40v-296c0-22.092-17.908-40-40-40H392c-22.092 0-40 17.908-40 40v296c0 22.092 17.908 40 40 40h208V520zM136 656c0 22.092 17.908 40 40 40h456c22.092 0 40-17.908 40-40v-296c0-22.092-17.908-40-40-40h-208v-72h224c53.02 0 96 42.98 96 96V672c0 53.02-42.98 96-96 96H160c-53.02 0-96-42.98-96-96v-344c0-44.184 35.816-80 80-80h64v72h-32c-22.092 0-40 17.908-40 40V656z" horiz-adv-x="1024" />
<glyph glyph-name="yanchi" unicode="&#60061;" d="M548 76v-66.3a375.024 375.024 0 0 1 49.928 8.164c5.108 1.192 10.072-2.632 10.072-7.876v-57.236c0-3.76-2.616-7.02-6.304-7.772A450.136 450.136 0 0 0 512-64c-247.424 0-448 200.576-448 448S264.576 832 512 832c213.92 0 392.82-149.932 437.348-350.444 1.092-4.924-2.692-9.556-7.74-9.556h-57.652a8.128 8.128 0 0 0-7.836 6.132c-38.888 150.864-169.064 265.06-328.12 280.168V692a4 4 0 0 0-4-4h-64a4 4 0 0 0-4 4V758.3C297.08 741.3 154.696 598.92 137.7 420H204a4 4 0 0 0 4-4v-64a4 4 0 0 0-4-4H137.7c17-178.924 159.376-321.304 338.3-338.3V76a4 4 0 0 0 4 4h64a4 4 0 0 0 4-4z m-16.136 550.028a9.616 9.616 0 0 1-18.912 0.212l-45.784-232.348a11.98 11.98 0 0 0-3.16-6.036l-183.376-189.02a10.44 10.44 0 0 1 12.96-16.172l277.952 170.672a12 12 0 0 1 5.544 12.28l-45.224 260.412zM736 284v60h160v-60c0-44.184-35.816-80-80-80s-80 35.816-80 80z m170.516-112c32.624 26.4 53.484 66.764 53.484 112v113.692a10.308 10.308 0 0 1-10.308 10.308h-267.384a10.308 10.308 0 0 1-10.308-10.308V284c0-45.236 20.86-85.6 53.484-112-32.624-26.4-53.484-66.764-53.484-112v-113.692a10.308 10.308 0 0 1 10.308-10.308h267.384a10.308 10.308 0 0 1 10.308 10.308V60c0 45.236-20.86 85.6-53.484 112z" horiz-adv-x="1024" />
<glyph glyph-name="guolv-biaoge" unicode="&#60062;" d="M194.936 719.64c-6.536 10.66 1.136 24.36 13.64 24.36h606.848c12.504 0 20.176-13.7 13.64-24.36l-196.096-319.836a32.004 32.004 0 0 1-4.716-16.724v-307.204a16 16 0 0 0-10.768-15.12l-200.5-69.404c-10.392-3.6-21.232 4.12-21.232 15.12V383.08a31.988 31.988 0 0 1-4.72 16.724L194.936 719.636z" horiz-adv-x="1024" />
<glyph glyph-name="shuchu1" unicode="&#60060;" d="M128 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h376a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8H184V712h329.336v-240a16 16 0 0 1 16-16H848a16 16 0 0 1 16 16V520.752c0 4.46-1.864 8.72-5.144 11.752l-267.6 247.248A16.008 16.008 0 0 1 580.396 784H128z m629.636-256h-172.3V687.192L757.636 528zM695.9-12.948a8 8 0 0 1 11.312 0l203.644 203.644a8 8 0 0 1 0.004 11.316l-39.6 39.596a2.724 2.724 0 0 1-0.152 0.152l-163.9 163.896a8 8 0 0 1-11.312 0l-39.596-39.596a8 8 0 0 1 0-11.316l125.22-125.22H392a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h383.86l-119.56-119.56a8 8 0 0 1 0-11.316l39.6-39.596z" horiz-adv-x="1024" />
<glyph glyph-name="zidingyi" unicode="&#60059;" d="M406.464 32.21199999999999a16.012 16.012 0 0 1 9.072 4.528l97.604 97.608 192.336-192.336a16 16 0 0 1 22.628 0l226.276 226.28a16 16 0 0 1 0 22.624l-192.332 192.336 175.356 175.36a16 16 0 0 1 0 22.624L713.96 804.684a15.996 15.996 0 0 1-22.624 0l-175.36-175.36-197.992 197.988a16 16 0 0 1-22.628 0L69.08 601.04a16 16 0 0 1 0-22.624l197.992-197.992-98.78-98.776a16.008 16.008 0 0 1-4.556-9.264l-26.416-242.692c-2.032-15.72 11.468-29.056 27.16-26.836l241.984 29.36z m197.184 113.448l-39.596 39.596 149.908 149.908 152.732-152.736-149.904-149.908-62.228 62.228 84.852 84.852-50.908 50.912-84.856-84.852zM309.492 739.6279999999999l158.396-158.392-149.908-149.904-39.6 39.596L363.24 555.78 312.32 606.692 227.468 521.8399999999999l-67.88 67.88 149.904 149.908z m65.392-641.716l-168.456-26.328 23.116 169.488L702.648 714.172l144.248-144.248L374.884 97.91200000000003z" horiz-adv-x="1024" />
<glyph glyph-name="youxiang" unicode="&#60058;" d="M864 506.88c0 4.88-2.228 9.496-6.056 12.532l-384 304.696a15.996 15.996 0 0 1-19.888 0l-384-304.696A16 16 0 0 1 64 506.88v-511.728a16 16 0 0 1 16-16h475.044l-0.58 64H145.68L464 354.396l96.956-94.8 1.172-1.148 0.216-0.212L614 300l2.648-0.012L800 439.684v-140.592l64-0.312V506.88z m-87.436-4.592l-209.232-159.416L464 443.904l-106.828-104.452-209.54 159.816L464 750.3l312.564-248.012zM128 433.752l182.924-139.52L128 115.372v318.38zM624 240a8 8 0 0 1-8-8v-44a8 8 0 0 1 8-8h296a8 8 0 0 1 8 8v44a8 8 0 0 1-8 8h-296z m-8-128a8 8 0 0 0 8 8h296a8 8 0 0 0 8-8v-44a8 8 0 0 0-8-8h-296a8 8 0 0 0-8 8v44z m8-112a8 8 0 0 1-8-8v-44a8 8 0 0 1 8-8h296a8 8 0 0 1 8 8v44a8 8 0 0 1-8 8h-296z" horiz-adv-x="1024" />
<glyph glyph-name="gengduohengxiang-dahao" unicode="&#60057;" d="M112 440a16 16 0 0 0 16 16h112a16 16 0 0 0 16-16v-112a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v112z m328 0a16 16 0 0 0 16 16h112a16 16 0 0 0 16-16v-112a16 16 0 0 0-16-16h-112a16 16 0 0 0-16 16v112z m344 16a16 16 0 0 1-16-16v-112a16 16 0 0 1 16-16h112a16 16 0 0 1 16 16v112a16 16 0 0 1-16 16h-112z" horiz-adv-x="1024" />
<glyph glyph-name="caogao" unicode="&#60056;" d="M111.981714 696.027429c0 26.477714 21.504 47.981714 48.054857 47.981714h703.926858c26.550857 0 48.054857-21.504 48.054857-47.981714v-624.054858a47.981714 47.981714 0 0 0-47.981715-47.981714H159.963429a47.981714 47.981714 0 0 0-47.981715 47.981714V696.027429zM384 471.990857a128 128 0 0 1 256 0h192V663.990857h-640v-192H384z" horiz-adv-x="1024" />
<glyph glyph-name="shijiangeshitiaozheng" unicode="&#60055;" d="M740 784a8 8 0 0 0 8-8v-239.936a8 8 0 0 0-8-8h-47.604a8 8 0 0 0-8 8V720H436v-252a8 8 0 0 0-8-8H167.604v-388h236.484a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H112a8 8 0 0 0-8 8V538.392a8 8 0 0 0 2.476 5.784l248.864 237.612A8 8 0 0 0 360.864 784H740zM372 709.468L177.748 524H372V709.468zM680 48c97.204 0 176 78.796 176 176s-78.796 176-176 176-176-78.796-176-176 78.796-176 176-176z m0-64c-132.548 0-240 107.452-240 240s107.452 240 240 240 240-107.452 240-240-107.452-240-240-240zM644 324a8 8 0 0 1-8-8v-148a8 8 0 0 1 8-8h128a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8h-72v92a8 8 0 0 1-8 8h-48z" horiz-adv-x="1024" />
<glyph glyph-name="a-yibiaobanon1" unicode="&#60054;" d="M64 760a16 16 0 0 0 16 16h752a16 16 0 0 0 16-16v-319.412a512.868 512.868 0 0 1-64 23.076V496H128v-440h122.88c1.384-1.384 2.784-2.772 4.196-4.156 20.868-20.48 44.452-40.848 70.872-59.844H80a16 16 0 0 0-16 16V760z m64-200h656V712H128v-152zM693.764 154.64a90.808 90.808 0 0 1 6.308 33.36c0 50.624-41.352 91.66-92.36 91.66-17.52 0-33.904-4.84-47.86-13.248l-108.104 90.228c43.24 23.468 95.068 39.36 156.252 39.36 114.392 0 196.076-55.544 250.072-112.32 27.06-28.46 46.884-56.98 59.892-78.324A416.532 416.532 0 0 0 928 188a416.532 416.532 0 0 0-10.036-17.356c-13.008-21.344-32.832-49.864-59.892-78.324a410.2 410.2 0 0 0-42.748-39.14l-121.56 101.46zM386.148 310.748a419.988 419.988 0 0 1-28.22-27.068c-27.06-28.46-46.88-56.98-59.892-78.324A420.464 420.464 0 0 1 288 188a420.464 420.464 0 0 1 10.036-17.356c13.008-21.344 32.832-49.864 59.892-78.324C411.924 35.54 493.608-20 608-20c52.884 0 98.78 11.872 138.18 30.248l-108.896 90.892a92.884 92.884 0 0 0-29.572-4.8c-51.008 0-92.36 41.036-92.36 91.66 0 4.764 0.364 9.444 1.072 14.016l-130.28 108.732z" horiz-adv-x="1024" />
<glyph glyph-name="yanshimoshi" unicode="&#60052;" d="M779.444 546.72a8 8 0 0 0 0.052-11.312l-195.292-196.988a8 8 0 0 0-11.316-0.048l-148.984 147.696-126.336-127.432a8 8 0 0 0-11.312-0.052l-39.768 39.428a8 8 0 0 0-0.052 11.312l171.396 172.888a8 8 0 0 0 11.316 0.048l148.984-147.7 150.232 151.54a8 8 0 0 0 11.312 0.048l39.768-39.428zM72 756a8 8 0 0 1-8-8v-52a8 8 0 0 1 8-8h56v-492a16 16 0 0 1 16-16h296l-122.344-122.344a8 8 0 0 1 0-11.312l33.944-33.94a7.992 7.992 0 0 1 11.312 0l150.528 150.524 148.516-148.516a8 8 0 0 1 11.312 0l33.94 33.94a7.996 7.996 0 0 1 0 11.316L586.876 180H880a16 16 0 0 1 16 16V688h56a8 8 0 0 1 8 8V748a8 8 0 0 1-8 8H72z m128-72h624v-432H200V684z" horiz-adv-x="1024" />
@ -22,7 +64,7 @@
<glyph glyph-name="a-fangxiangzhijiaosanjiaochicunzhengchang" unicode="&#60051;" d="M230.628 64c-14.256 0-21.392 17.236-11.312 27.316L804.684 676.688c10.08 10.08 27.312 2.94 27.312-11.312V80a16 16 0 0 0-16-16H230.628z" horiz-adv-x="1024" />
<glyph glyph-name="yiguolv3" unicode="&#60008;" d="M828 784a8 8 0 0 1-8 8H48a8 8 0 0 1-8-8v-80a8 8 0 0 1 8-8h112l171.048-324.448c0.624-1.164 0.952-2.464 0.952-3.784v-440.02a8 8 0 0 1 8.416-7.992c1.056 0.056 2.012 0.572 2.856 1.208l110.16 83.156C419.688 54.39599999999996 400 114.89999999999998 400 180c0 124.976 72.552 233.008 177.836 284.276L700 696h120a8 8 0 0 1 8 8V784zM984 180c0-148.012-119.988-268-268-268s-268 119.988-268 268 119.988 268 268 268 268-119.988 268-268z m-114.204 141.392l-204.564-204.572-105.82 105.82-52.48-52.476 158.3-158.3 257.044 257.048-52.48 52.48z" horiz-adv-x="1024" />
<glyph glyph-name="yiguolv3" unicode="&#60008;" d="M984 180c0-148.012-119.988-268-268-268s-268 119.988-268 268 119.988 268 268 268 268-119.988 268-268z m-111.968 141.172l-198.456-198.464-102.664 102.66L520 174.46000000000004l153.576-153.576 249.372 249.372-50.916 50.916zM856 784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-104l-112.3-229.396a310.896 310.896 0 0 1-115.104-56.196L660.796 712H251.204l151.876-321.54c0.604-1.148 0.92-2.428 0.92-3.724v-426.764L341.996-80A8 8 0 0 0 332-72.25199999999995V359.76800000000003c0 1.32-0.328 2.62-0.952 3.784L160 712H56a8 8 0 0 0-8 8V776a8 8 0 0 0 8 8h800z" horiz-adv-x="1024" />
<glyph glyph-name="zichanxiangqing" unicode="&#60050;" d="M914.672 30.24A231.996 231.996 0 0 1 728 400a232 232 0 1 1 135.448-420.36l80.592-80.592a8 8 0 0 1 11.316 0l39.596 39.596a8 8 0 0 1 0 11.316l-80.28 80.28z m-305.464 18.964a168 168 0 1 0 237.588 237.592 168 168 0 0 0-237.588-237.592zM509.268 819.156a8 8 0 0 0 7.156 0l444-213.904c5.896-2.948 5.896-11.36 0-14.312l-444-211.788a8.016 8.016 0 0 0-7.156 0L64.424 590.94c-5.9 2.948-5.9 11.36 0 14.312l444.844 213.904zM216 598.096L512.844 460 808 598.096 512.844 740 216 598.096zM94.04 177.684a8 8 0 0 1-11.508-7.188v-61.824a8 8 0 0 1 4.428-7.156L440-71.544v83.516l-345.96 165.712z m345.96-15.068l-353 170.484a8.008 8.008 0 0 0-4.464 7.18v64.656a8 8 0 0 0 11.5 7.192L440 246.776v-84.16z" horiz-adv-x="1024" />
@ -32,7 +74,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="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.948c125.92 0 228-102.08 228-228.004 0-125.92-102.08-228-228-228h-176c-125.92 0-228 102.08-228 228 0 125.924 102.08 228 228 228h176z m-176 72c-165.684 0-300-134.316-300-300.004 0-165.684 134.316-300 300-300h176c165.684 0 300 134.316 300 300 0 165.688-134.316 300-300 300h-176zM668.128 731.772c-9.384-21.732-4.916-45.96 9.492-62.812l-41.332-67.132a298.22 298.22 0 0 0 60.524-13.792l21.048 60.172c25.1-2.252 49.9 11.592 60.436 35.992 13.136 30.42-0.876 65.732-31.296 78.868-30.424 13.136-65.736-0.876-78.872-31.296zM308.796 581.08l-23.48 67.128c-25.104-2.252-49.9 11.592-60.44 35.992-13.132 30.42 0.88 65.732 31.3 78.868 30.424 13.136 65.732-0.876 78.872-31.296 9.384-21.732 4.912-45.96-9.496-62.812l43.132-70.048c-20.8-3.88-40.84-9.9-59.888-17.828z" 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="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" />
@ -1562,7 +1604,7 @@
<glyph glyph-name="zhibiaojuhe-hengzhou" unicode="&#58982;" d="M72 736a8 8 0 0 1-8-8v-32a8 8 0 0 1 8-8h88v-608H72a8 8 0 0 1-8-8v-32a8 8 0 0 1 8-8h88v-88a8 8 0 0 1 8-8h32a8 8 0 0 1 8 8v88h696a8 8 0 0 1 8 8v32a8 8 0 0 1-8 8H208V688h696a8 8 0 0 1 8 8v32a8 8 0 0 1-8 8H208V824a8 8 0 0 1-8 8h-32a8 8 0 0 1-8-8v-88H72zM336.328 307.11199999999997a8 8 0 0 0-0.176 10.652l129.592 150.044a8 8 0 0 1-0.18 10.66L347.808 605.832a8 8 0 0 0 0.444 11.304l23.496 21.724a8 8 0 0 0 11.304-0.44l146.876-158.86a8 8 0 0 0 0.18-10.66l-129.628-150.092a8 8 0 0 1 0.172-10.652l123.568-134.004a8 8 0 0 0-0.456-11.304l-23.528-21.696a8 8 0 0 0-11.304 0.46l-152.604 165.5zM604.328 307.11199999999997a8 8 0 0 0-0.176 10.652l129.592 150.044a8 8 0 0 1-0.18 10.66l-117.756 127.364a8 8 0 0 0 0.444 11.304l23.496 21.724a8 8 0 0 0 11.304-0.44l146.876-158.86a8 8 0 0 0 0.18-10.66l-129.628-150.092a8 8 0 0 1 0.172-10.652l123.568-134.004a8 8 0 0 0-0.456-11.304l-23.524-21.696a8.008 8.008 0 0 0-11.308 0.46l-152.604 165.5z" horiz-adv-x="1024" />
<glyph glyph-name="chaolianjie" unicode="&#59448;" d="M565.284 749.912l235.556-136-120-207.844-55.424 32-40-69.284 110.852-64a16 16 0 0 1 21.856 5.856l184 318.7a16 16 0 0 1-5.856 21.856l-346.412 200A16 16 0 0 1 528 845.34l-184-318.7a16 16 0 0 1 5.856-21.856l110.852-64 40 69.28-55.424 32 120 207.848zM436.708 399.216l-110.852 64A16 16 0 0 1 304 457.36L120 138.664a16 16 0 0 1 5.856-21.86l346.412-200a16 16 0 0 1 21.856 5.86l184 318.696a16 16 0 0 1-5.856 21.856l-110.852 64-40-69.284 55.424-32-120-207.844-235.56 136 120 207.844 55.428-32 40 69.284zM579.346 566.277l55.426-32q6.928-4 2.928-10.929l-184-318.697q-4-6.928-10.928-2.928l-55.426 32q-6.928 4-2.928 10.928l184 318.697q4 6.929 10.928 2.929z" horiz-adv-x="1024" />
<glyph glyph-name="chaolianjie" unicode="&#59448;" d="M776 240a8 8 0 0 1-8-8v-104h-104a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h104v-104a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v104h104a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-104v104a8 8 0 0 1-8 8h-64zM539.576 513.072a12 12 0 0 0 16.908 1.48l42.896-35.996a12 12 0 0 0 1.48-16.908l-167.688-199.844a12 12 0 0 0-16.908-1.476l-42.896 35.996a12 12 0 0 0-1.48 16.904l167.688 199.844zM425.536 532.736l159.284 189.828 214.492-179.98-159.284-189.832 61.284-51.42 205.564 244.984a8 8 0 0 1-0.984 11.272l-324.804 272.54a8 8 0 0 1-11.272-0.988L364.252 584.1600000000001l61.284-51.42zM335.232 425.116l-61.284 51.42-208.076-247.972a8 8 0 0 1 0.988-11.272l324.8-272.54a8 8 0 0 1 11.272 0.984l208.076 247.976-61.284 51.424-161.796-192.82-214.492 179.98 161.796 192.82z" horiz-adv-x="1024" />
<glyph glyph-name="normal36" unicode="&#59114;" d="M112 768a16 16 0 0 0 16 16h200a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768z m72-56v-656h88V712H184zM628 536a8 8 0 0 1-8-8v-108h-108a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h108v-108a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8v108h108a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8h-108V528a8 8 0 0 1-8 8h-56zM416 784a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h480a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H416z m56-728V712h368v-656h-368z" horiz-adv-x="1024" />
@ -1782,7 +1824,7 @@
<glyph glyph-name="zhankai" unicode="&#59150;" d="M312 676a8 8 0 0 1-8 8H240a8 8 0 0 1-8-8v-584a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v252h233.612v-181.452c0-13.416 15.52-20.872 25.996-12.492l278.388 222.712a16 16 0 0 1 0 24.984l-278.388 222.712c-10.476 8.38-25.996 0.92-25.996-12.492V424H312V676z" horiz-adv-x="1024" />
<glyph glyph-name="normal108" unicode="&#59286;" d="M344 424a8 8 0 0 1-8 8H256a8 8 0 0 1-8-8v-80a8 8 0 0 1 8-8h80a8 8 0 0 1 8 8v80z m208 8a8 8 0 0 0 8-8v-80a8 8 0 0 0-8-8h-80a8 8 0 0 0-8 8v80a8 8 0 0 0 8 8h80z m224-8a8 8 0 0 1-8 8h-80a8 8 0 0 1-8-8v-80a8 8 0 0 1 8-8h80a8 8 0 0 1 8 8v80z" horiz-adv-x="1024" />
<glyph glyph-name="normal108" unicode="&#59286;" d="M156 334a10 10 0 0 1 10-10h100a10 10 0 0 1 10 10v100a10 10 0 0 1-10 10h-100a10 10 0 0 1-10-10v-100zM758 324a10 10 0 0 0-10 10v100a10 10 0 0 0 10 10h100a10 10 0 0 0 10-10v-100a10 10 0 0 0-10-10h-100zM462 324a10 10 0 0 0-10 10v100a10 10 0 0 0 10 10h100a10 10 0 0 0 10-10v-100a10 10 0 0 0-10-10h-100z" horiz-adv-x="1024" />
<glyph glyph-name="shujukaifa" unicode="&#59487;" d="M855.976 607.408C853.628 705.1279999999999 687.988 784 484 784S114.372 705.1279999999999 112.024 607.408H112V164.79999999999995c0-32.648 15.64-60.512 37.232-82.34 21.44-21.672 50.588-39.452 83.612-53.572C299.032 0.5879999999999654 387.856-16 484-16c9.408 0 18.748 0.16 28 0.472V60.200000000000045c-9.208-0.344-18.544-0.52-28-0.52-88.528 0-166.896 15.416-221.732 38.856-27.484 11.752-47.312 24.776-59.708 37.308-12.248 12.38-15.324 22.124-15.324 28.952v113.108c13.952-8.78 29.304-16.64 45.608-23.608 66.188-28.3 155.012-44.888 251.156-44.888 9.408 0 18.748 0.16 28 0.472v75.728c-9.208-0.34-18.544-0.516-28-0.516-88.528 0-166.896 15.412-221.732 38.856-27.484 11.752-47.312 24.772-59.708 37.304-12.248 12.38-15.324 22.124-15.324 28.952V497.54c67.92-43.088 175.576-70.928 296.764-70.928 121.192 0 228.844 27.84 296.764 70.928V400H856V607.408h-0.024z m-141.352-60.16C659.492 520.76 578.044 502.296 484 502.296c-94.04 0-175.492 18.468-230.624 44.952C192.704 576.392 187.24 601.908 187.24 605.308c0 3.4 5.468 28.916 66.14 58.06C308.508 689.848 389.96 708.3199999999999 484 708.3199999999999c94.044 0 175.492-18.472 230.624-44.952 60.672-29.144 66.14-54.664 66.14-58.06 0-3.4-5.468-28.92-66.14-58.06zM761.664 334.304a8 8 0 0 1-11.316 0l-33.94-33.94a8 8 0 0 1 0-11.312l121.02-121.02h-274.116a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h273.544l-120.448-120.452a8 8 0 0 1 0-11.312l33.94-33.944a8 8 0 0 1 11.316 0l158.312 158.316 0.08 0.076 33.94 33.944a8 8 0 0 1 0 11.312l-192.332 192.332z" horiz-adv-x="1024" />
@ -1938,7 +1980,7 @@
<glyph glyph-name="zaiExcelbiaozhongfenxi" unicode="&#59511;" d="M315.64 649.068a8 8 0 0 0 7.568 10.6h51.148a8 8 0 0 0 7.52-5.26l51.244-140.484a33.612 33.612 0 0 1 25.996-21.996c1.284 0.048 2.572 0.072 3.864 0.072h96.244c2.204 0 4.392-0.072 6.568-0.212a33.616 33.616 0 0 1 27 22.468l46.988 140.284A8.004 8.004 0 0 0 647.368 660h53.544a8 8 0 0 0 7.592-10.52l-52.168-157.048a101.064 101.064 0 0 0-20.888-35.448 101.116 101.116 0 0 0 18.748-32.416l54.164-157.636a8 8 0 0 0-7.568-10.6h-51.148a7.996 7.996 0 0 0-7.516 5.26l-51.248 140.484a33.608 33.608 0 0 1-25.996 21.996c-1.284-0.048-2.572-0.072-3.864-0.072h-96.244a102.24 102.24 0 0 0-6.568 0.212 33.62 33.62 0 0 1-27-22.468l-46.992-140.284A8 8 0 0 0 376.636 256H323.088a8 8 0 0 0-7.592 10.52l52.168 157.048a101.064 101.064 0 0 0 20.888 35.448 101.096 101.096 0 0 0-18.748 32.416l-54.16 157.636zM128 784a16 16 0 0 1-16-16v-624a16 16 0 0 1 16-16h768a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128z m56-584V712h656v-512H184zM696 48a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H324a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8h372z" horiz-adv-x="1024" />
<glyph glyph-name="qiehuanweidu" unicode="&#59176;" d="M474.912 594.344a8 8 0 0 1 0 11.312L301.656 778.912a8 8 0 0 1-11.312 0L117.088 605.656a8 8 0 0 1 0-11.312l45.256-45.256a8 8 0 0 1 11.312 0l83.68 83.676V-8a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8V630.1l81.008-81.012a8 8 0 0 1 11.312 0l45.256 45.256zM766.668 135.236l83.676 83.676a8 8 0 0 0 11.312 0l45.256-45.256a8 8 0 0 0 0-11.312l-173.256-173.256a8 8 0 0 0-11.312 0l-173.256 173.256a8 8 0 0 0 0 11.312l45.256 45.256a8 8 0 0 0 11.312 0l81.012-81.012V776a8 8 0 0 0 8 8h64a8 8 0 0 0 8-8v-640.764z" horiz-adv-x="1024" />
<glyph glyph-name="qiehuanweidu" unicode="&#59176;" d="M296 773.256L122.744 600 168 554.744 261.332 648.08V0h72V645.412L424 554.744 469.256 600 296 773.256zM762.668 119.91999999999996L856 213.25199999999995 901.252 168 728-5.255999999999972 554.744 168 600 213.25199999999995l90.668-90.664V770h72v-650.08z" horiz-adv-x="1024" />
<glyph glyph-name="wenzijiacu" unicode="&#59031;" d="M640 784H388c-88.364 0-160-71.636-160-160v-480c0-88.364 71.636-160 160-160h252c88.364 0 160 71.636 160 160v120c0 47.788-20.948 90.684-54.168 120C779.052 413.316 800 456.212 800 504V624c0 88.364-71.636 160-160 160zM308 344h332.244c44.072-0.132 79.756-35.9 79.756-80v-120c0-44.184-35.816-80-80-80H388c-44.184 0-80 35.816-80 80v200z m332.244 80H308V624c0 44.184 35.816 80 80 80h252c44.184 0 80-35.816 80-80v-120c0-44.1-35.684-79.868-79.756-80z" horiz-adv-x="1024" />
@ -2078,7 +2120,7 @@
<glyph glyph-name="Pythonfenxi" unicode="&#59045;" d="M728 768a16 16 0 0 1-16 16H312a16 16 0 0 1-16-16v-192H128a16 16 0 0 1-16-16v-352a16 16 0 0 1 16-16h104a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H176V512h424a8 8 0 0 1 8 8V568a8 8 0 0 1-8 8H360V720h304v-304H312a16 16 0 0 1-16-16v-400a16 16 0 0 1 16-16h400a16 16 0 0 1 16 16v192h168a16 16 0 0 1 16 16V560a16 16 0 0 1-16 16h-104a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h56v-256H424a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h240v-144H360v304h352a16 16 0 0 1 16 16V768zM468 621.332c0-2.944-2.388-5.332-5.332-5.332h-53.336A5.332 5.332 0 0 0 404 621.332V674.668c0 2.944 2.388 5.332 5.332 5.332h53.336c2.944 0 5.332-2.388 5.332-5.332v-53.336zM614.668 88c2.944 0 5.332 2.388 5.332 5.332v53.336c0 2.944-2.388 5.332-5.332 5.332h-53.336c-2.944 0-5.332-2.388-5.332-5.332v-53.336c0-2.944 2.388-5.332 5.332-5.332h53.336z" horiz-adv-x="1024" />
<glyph glyph-name="yunhangjiedianjixiayou" unicode="&#59536;" d="M354.868 628C339.316 574.832 290.192 536 232 536c-70.692 0-128 57.308-128 128 0 70.692 57.308 128 128 128 58.192 0 107.316-38.832 122.868-92h314.264c15.552 53.168 64.676 92 122.868 92 70.692 0 128-57.308 128-128 0-70.692-57.308-128-128-128-58.192 0-107.316 38.832-122.868 92H520v-83.272a4 4 0 0 0-6.148-3.376l-62.148 39.568a8 8 0 0 0-3.704 6.748V628H354.868zM288 664c0 30.928-25.072 56-56 56s-56-25.072-56-56 25.072-56 56-56 56 25.072 56 56z m560 0c0 30.928-25.072 56-56 56s-56-25.072-56-56 25.072-56 56-56 56 25.072 56 56zM792-24c-58.192 0-107.316 38.832-122.868 92H448v81.772c0 2.732 1.396 5.276 3.704 6.748l62.148 39.564a4 4 0 0 0 6.148-3.372V140h149.132c15.552 53.168 64.676 92 122.868 92 70.692 0 128-57.308 128-128 0-70.692-57.308-128-128-128z m0 72c30.928 0 56 25.072 56 56s-25.072 56-56 56-56-25.072-56-56 25.072-56 56-56zM387.124 546.0360000000001C378.84 551.312 368 545.344 368 535.508v-335.016c0-9.836 10.84-15.804 19.124-10.528l263.104 167.508c7.696 4.9 7.696 16.156 0 21.056L387.124 546.0360000000001z" horiz-adv-x="1024" />
<glyph glyph-name="yunhangjiedianjixiayou" unicode="&#59536;" d="M292 662C292 629.9680000000001 266.032 604 234 604S176 629.9680000000001 176 662 201.968 720 234 720 292 694.032 292 662zM234 532c58.576 0 108.104 38.744 124.36 92H448v-38.24a8 8 0 0 1 3.704-6.752l56-35.652c5.324-3.392 12.296 0.436 12.296 6.748V624h145.64c16.256-53.256 65.784-92 124.36-92 71.796 0 130 58.2 130 130S861.796 792 790 792c-60.032 0-110.564-40.692-125.508-96H359.508C344.564 751.308 294.032 792 234 792 162.2 792 104 733.8 104 662S162.2 532 234 532zM848 662c0-32.032-25.968-58-58-58S732 629.9680000000001 732 662 757.968 720 790 720 848 694.032 848 662zM368 200.49199999999996c0-9.836 10.84-15.804 19.124-10.528l263.104 167.508c7.696 4.9 7.696 16.156 0 21.056L387.124 546.0360000000001C378.84 551.312 368 545.344 368 535.508v-335.016z m83.704-43.5a8 8 0 0 1-3.704-6.748v-75.472a8 8 0 0 1 8-8h289.132l-70.12-70.12a8 8 0 0 1 0-11.312l39.596-39.6a8 8 0 0 1 11.316 0l155.732 155.736a8 8 0 0 1 0 11.312l-39.596 39.6a6.288 6.288 0 0 1-0.292 0.276l-116.992 116.992a8 8 0 0 1-11.312 0l-39.6-39.596a8 8 0 0 1 0-11.316l79.972-79.972H520v47.124c0 6.312-6.972 10.14-12.296 6.748l-56-35.652z" horiz-adv-x="1024" />
<glyph glyph-name="yewubaogengxin" unicode="&#59180;" d="M960 384c0 247.424-200.576 448-448 448-157.568 0-296.136-81.344-376-204.328V776a8 8 0 0 1-8 8H72a8 8 0 0 1-8-8v-256a8 8 0 0 1 7.948-8H328a8 8 0 0 1 8 8V576a8 8 0 0 1-8 8H193.544C260.092 689.736 377.84 760 512 760c207.66 0 376-168.34 376-376s-168.34-376-376-376c-204.976 0-371.644 164.02-375.916 367.972C135.992 380.39200000000005 132.42 384 128 384H72a7.92 7.92 0 0 1-7.928-8.028C68.352 132.25199999999995 267.26-64 512-64c247.424 0 448 200.576 448 448zM502.224 632.688a16 16 0 0 0 22.628 0l232.568-232.568a8 8 0 0 0 0-11.316l-39.596-39.596a8 8 0 0 0-11.316 0L548 507.716V136a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8V504.64l-155.432-155.432a8 8 0 0 0-11.316 0l-39.6 39.596a8 8 0 0 0 0 11.316l232.572 232.568z" horiz-adv-x="1024" />
@ -2192,7 +2234,7 @@
<glyph glyph-name="normal95" unicode="&#59199;" d="M99.456 305.216c0-11.52 5.696-22.144 14.976-27.904 9.216-5.76 20.608-5.76 29.824 0a32.832 32.832 0 0 1 14.976 27.904 32.64 32.64 0 0 1-14.976 27.84 27.968 27.968 0 0 1-29.824 0 32.64 32.64 0 0 1-14.976-27.84z m0 138.624c0-11.52 5.696-22.08 14.976-27.84 9.216-5.76 20.608-5.76 29.824 0a32.832 32.832 0 0 1 14.976 27.84 32.64 32.64 0 0 1-14.976 27.904 27.968 27.968 0 0 1-29.824 0 32.64 32.64 0 0 1-14.976-27.904z m55.488-266.88v-80.896c0-35.392 26.688-64.192 59.52-64.192h593.6c32.768 0 59.52 28.8 59.52 64.192V673.152c0 35.392-26.752 64.192-59.52 64.192l-593.536-1.728c-32.768 0-59.52-28.8-59.52-64.192v-80.192c0-17.728-13.312-32.128-29.824-32.128s-29.824 14.4-29.824 32.128l0.064 2.432V671.296c0 70.912 53.184 128.32 118.848 128.32l594.24 1.664c65.536 0 118.72-57.536 118.72-128.32v-575.36c0-70.912-53.12-128.32-118.848-128.32H214.208c-65.664 0-118.848 57.408-118.848 128.32v77.056c-0.128 0.832-0.128 1.6-0.128 2.432 0 17.664 13.376 32 29.888 32s29.824-14.336 29.824-32.064z m416.192 22.912a28.352 28.352 0 0 1 42.176 0l125.76 135.68 0.832 0.832 0.768 0.704a33.472 33.472 0 0 1 0 44.8L614.4 518.2080000000001a27.84 27.84 0 0 1-41.6 0l-0.64-0.704a33.472 33.472 0 0 1 0-44.8l76.16-82.176H302.848c-16.128 0-29.312-14.208-29.312-31.616 0-17.344 13.184-31.552 29.312-31.552h344.32l-75.84-82.048a33.92 33.92 0 0 1-0.192-45.44z" horiz-adv-x="1024" />
<glyph glyph-name="qiehuansuanfa" unicode="&#59052;" d="M722.344 421.088a8 8 0 0 1 11.312 0l173.256 173.256a8 8 0 0 1 0 11.312l-173.256 173.256a8 8 0 0 1-11.312 0l-45.256-45.256a8 8 0 0 1 0-11.312l83.676-83.68H120a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h638.1l-81.012-81.008a8 8 0 0 1 0-11.312l45.256-45.256zM263.236 129.332l83.676-83.676a8 8 0 0 0 0-11.312l-45.256-45.256a8 8 0 0 0-11.312 0l-173.256 173.256a8 8 0 0 0 0 11.312l173.256 173.256a8 8 0 0 0 11.312 0l45.256-45.256a8 8 0 0 0 0-11.312l-81.012-81.012H904a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H263.236z" horiz-adv-x="1024" />
<glyph glyph-name="qiehuansuanfa" unicode="&#59052;" d="M901.256 600L728 773.256 682.744 728l93.332-93.332H128v-72h645.412L682.744 472 728 426.744 901.256 600zM247.92 133.332L341.26 40 296-5.255999999999972 122.744 168 296 341.256 341.256 296l-90.668-90.668H898v-72H247.92z" horiz-adv-x="1024" />
<glyph glyph-name="zhujian" unicode="&#59200;" d="M264.44 605.6759999999999a8 8 0 0 0 0 11.312l45.256 45.256a8 8 0 0 0 11.312 0l285.252-285.252c78.568 41.404 178.056 29.06 244.148-37.036 81.272-81.272 81.272-213.04 0-294.312-81.272-81.272-213.04-81.272-294.312 0-76.904 76.904-81.04 199.016-12.408 280.78l-63.6 63.6-88.24-88.24a8 8 0 0 0-11.312 0L335.28 347.03999999999996a8 8 0 0 0 0 11.312l88.24 88.244-45.256 45.252-88.24-88.24a8 8 0 0 0-11.312 0l-45.256 45.256a8 8 0 0 0 0 11.316l88.24 88.24L264.44 605.6759999999999z m529.4-322.288c-50.032 50.032-131.144 50.032-181.176 0-50.032-50.028-50.032-131.144 0-181.176 50.032-50.028 131.144-50.028 181.176 0 50.032 50.032 50.032 131.148 0 181.176zM126.712-16a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-312a8 8 0 0 0-8-8h-48a8 8 0 0 0-8 8V720h-672v-672h280a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-328z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 985 KiB

After

Width:  |  Height:  |  Size: 1010 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.

2
packages/fineui/package.json

@ -1,6 +1,6 @@
{
"name": "@fui/core",
"version": "3.0.20230727164622",
"version": "3.0.20231204103846",
"description": "fineui",
"main": "dist/fineui.min.js",
"module": "dist/lib/index.js",

6
packages/fineui/src/base/collection/collection.js

@ -124,6 +124,12 @@ export class CollectionView extends Widget {
this.element.scrollLeft(scrollLeft);
}
}
destroyed() {
each(this.renderedCells, (i, cell) => {
cell.el._destroy();
});
}
_calculateSizeAndPositionData() {
const { items, cellSizeAndPositionGetter } = this.options;

1
packages/fineui/src/base/combination/bubble.js

@ -520,6 +520,7 @@ export class Bubble extends Widget {
this.combo.setValue(v);
if (isNull(this.popupView)) {
this.options.popup.value = v;
!isNull(this.options.popup.el) && (this.options.popup.el.value = v);
} else {
this.popupView.setValue(v);
}

5
packages/fineui/src/base/list/listview.js

@ -111,11 +111,6 @@ export class ListView extends Widget {
}
}
_calculateBlocksToRender() {
// BI-115750 不可见状态下依赖元素实际尺寸构造的线段树会分段错误,所以不进行后续计算和线段树的初始化。
// 这样从不可见状态变为可见状态能够重新触发线段树初始化
if (!this.element.is(":visible")) {
return;
}
this._renderMoreIf();
}

20
packages/fineui/src/base/list/virtualgrouplist.js

@ -25,6 +25,7 @@ export class VirtualGroupList extends Widget {
}
init() {
this._calculateSummaryHeight();
this.renderedIndex = -1;
}
@ -44,7 +45,7 @@ export class VirtualGroupList extends Widget {
},
{
type: VirtualGroup.xtype,
height: rowHeight * items.length,
height: this.summaryHeight,
ref: (ref) => {
this.container = ref;
},
@ -169,6 +170,16 @@ export class VirtualGroupList extends Widget {
);
}
}
_calculateSummaryHeight() {
const o = this.options;
if (isFunction(o.rowHeight)) {
this.summaryHeight = sum(o.items, o.rowHeight);
} else {
this.summaryHeight = this._isAutoHeight() ? 0 : o.rowHeight * o.items.length;
}
}
_populate(items) {
const { blockSize, rowHeight, scrollTop } = this.options;
if (items && this.options.items !== items) {
@ -198,13 +209,8 @@ export class VirtualGroupList extends Widget {
}
_restore() {
const o = this.options;
this.renderedIndex = -1;
if (isFunction(o.rowHeight)) {
this.summaryHeight = sum(o.items, o.rowHeight);
} else {
this.summaryHeight = this._isAutoHeight() ? 0 : o.rowHeight * o.items.length;
}
this._calculateSummaryHeight();
// 依赖于cache的占位元素也要初始化
this.topBlank.setHeight(0);
this.bottomBlank.setHeight(0);

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

@ -27,6 +27,7 @@ export class LongColorChooserTrigger extends Trigger {
}
_init() {
const {height} = this.options;
super._init(...arguments);
this.colorContainer = createWidget({
type: HTapeLayout.xtype,
@ -51,7 +52,7 @@ export class LongColorChooserTrigger extends Trigger {
},
textAlign: "left",
hgap: 5,
height: 18,
height: height - 4,
text: i18nText("BI-Basic_Auto"),
},
}

11
packages/fineui/src/core/2.base.js

@ -912,7 +912,8 @@ export const delay = lodashFns.delay;
export const defer = lodashFns.defer;
export const wrap = lodashFns.wrap;
export const nextTick = (function () {
export let nextTick = /*!PURE*/(function () {
const callbacks = [];
let pending = false;
let timerFunc = void 0;
@ -971,7 +972,7 @@ export const nextTick = (function () {
pending = true;
timerFunc();
}
// $flow-disable-line
if (!cb && typeof Promise !== "undefined") {
return new Promise((resolve, reject) => {
_resolve = resolve;
@ -980,6 +981,10 @@ export const nextTick = (function () {
};
})();
export const setNextTick = (fn) => {
nextTick = fn;
}
// 数字相关方法
_.each(["random"], name => {
lodashFns[name] = _apply(name);
@ -1362,7 +1367,7 @@ export function parseDateTime(str, fmt) {
m = today.getMonth();
}
if (_global.isNaN(d)) {
d = Math.min(getMonthDays(getDate(y, m)), today.getDate());
d = 1;
}
if (_global.isNaN(hr)) {
hr = today.getHours();

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

@ -868,13 +868,13 @@ export class Widget extends OB {
callLifeHook(this, "destroyed");
this.destroyed = null;
this._isDestroyed = true;
// this._purgeRef(); // 清除ref的时机还是要仔细考虑一下
}
_unMount() {
this._assetMounted();
this.__destroy();
this.fireEvent(Events.UNMOUNT);
// this._purgeRef(); // 子组件unmount ref置为null了,父组件拿不到ref,导致报错
this.purgeListeners();
}

115
packages/fineui/src/core/constant/writable.var.js

@ -1,51 +1,50 @@
/**
* 可写的常量
*/
import { isNumber } from "../2.base";
import { isNumber, nextTick, setNextTick } from "../2.base";
import { _global } from "../0.foundation";
import { Cache } from "../structure";
import { Element, setElement } from "../element/element";
import { setDom, DOM } from "../utils";
const PropertyDescriptors = {};
export function _defineVarProperties(libName) {
Object.defineProperties(libName, PropertyDescriptors);
}
function addDescriptor(key, options) {
options.enumerable = options.enumerable === undefined ? true : options.enumerable;
options.configurable = options.configurable === undefined ? true : options.configurable;
PropertyDescriptors[key] = options;
}
export let EVENT_RESPONSE_TIME = 200;
export const setEventResponseTime = v => {
EVENT_RESPONSE_TIME = v;
};
PropertyDescriptors["EVENT_RESPONSE_TIME"] = {
enumerable: true,
configurable: true,
get: function() {
return EVENT_RESPONSE_TIME;
},
addDescriptor("EVENT_RESPONSE_TIME", {
get: () => EVENT_RESPONSE_TIME,
set: setEventResponseTime,
};
});
export let pixUnit = "px";
export const setPixUnit = v => {
pixUnit = v;
};
PropertyDescriptors["pixUnit"] = {
enumerable: true,
configurable: true,
get: function() {
return pixUnit;
},
addDescriptor("pixUnit", {
get: () => pixUnit,
set: setPixUnit,
};
});
export let pixRatio = 1;
export const setPixRatio = v => {
pixRatio = v;
};
PropertyDescriptors["pixRatio"] = {
enumerable: true,
configurable: true,
get: function() {
return pixRatio;
},
addDescriptor("pixRatio", {
get: () => pixRatio,
set: setPixRatio,
};
});
export let StartOfWeek = 1;
export const setStartOfWeek = v => {
@ -55,27 +54,19 @@ export const setStartOfWeek = v => {
}
StartOfWeek = v;
};
PropertyDescriptors["StartOfWeek"] = {
enumerable: true,
configurable: true,
get: function() {
return StartOfWeek;
},
addDescriptor("StartOfWeek", {
get: () => StartOfWeek,
set: setStartOfWeek,
};
});
export let BlankSplitChar = "\u200b \u200b";
export const setBlankSplitChar = v => {
BlankSplitChar = v;
};
PropertyDescriptors["BlankSplitChar"] = {
enumerable: true,
configurable: true,
get: function() {
return BlankSplitChar;
},
addDescriptor("BlankSplitChar", {
get: () => BlankSplitChar,
set: setBlankSplitChar,
};
});
// 一定返回最终的单位
export let pixFormat = (pix, border) => {
@ -95,14 +86,10 @@ export let pixFormat = (pix, border) => {
export const setPixFormat = v => {
pixFormat = v;
};
PropertyDescriptors["pixFormat"] = {
enumerable: true,
configurable: true,
get: function() {
return pixFormat;
},
addDescriptor("pixFormat", {
get: () => pixFormat,
set: setPixFormat,
};
});
export let toPix = (pix, border) => {
if (!isNumber(pix)) {
@ -120,14 +107,10 @@ export let toPix = (pix, border) => {
export let setToPix = v => {
toPix = v;
};
PropertyDescriptors["toPix"] = {
enumerable: true,
configurable: true,
get: function() {
return toPix;
},
addDescriptor("toPix", {
get: () => toPix,
set: setToPix,
};
});
const getCacheItem = key => {
Cache.getItem(key, { typeConversion: true, defaultValue: true });
@ -137,24 +120,22 @@ export const setEventBlur = v => {
EVENT_BLUR = v;
Cache.setItem("event.blur", v);
};
PropertyDescriptors["EVENT_BLUR"] = {
enumerable: true,
configurable: true,
get: function() {
return EVENT_BLUR;
},
addDescriptor("EVENT_BLUR", {
get: () => EVENT_BLUR,
set: setEventBlur,
};
});
addDescriptor("Element", {
get: () => Element,
set: setElement,
});
PropertyDescriptors["DOM"] = {
enumerable: true,
configurable: true,
get: function() {
return DOM;
},
addDescriptor("DOM", {
get: () => DOM,
set: setDom,
};
});
export function _defineVarProperties(libName) {
Object.defineProperties(libName, PropertyDescriptors);
}
addDescriptor("nextTick", {
get: () => nextTick,
set: setNextTick,
});

132
packages/fineui/src/core/element/element.js

@ -1,76 +1,78 @@
import { registFunction } from "./plugins";
import { isWidget, isString } from "../2.base";
export function Element(widget, attribs) {
this.l = this.r = this.t = this.b = 0; // 边框
this.marginLeft = this.marginRight = this.marginTop = this.marginBottom = 0; // 间距
this.position = {};
this.classMap = {};
this.classList = [];
this.children = [];
this.attribs = attribs || {};
this.styles = {};
// 兼容处理
this["0"] = this;
this.style = {};
if (!widget) {
this.nodeName = "body";
this.position.x = 0;
this.position.y = 0;
this.attribs.id = "body";
} else if (isWidget(widget)) {
this.widget = widget;
this.nodeName = widget.options.tagName;
this.textBaseLine = widget.options.textBaseLine;
} else if (isString(widget)) {
this.nodeName = widget;
export let Element = class {
constructor(widget, attribs) {
this.l = this.r = this.t = this.b = 0; // 边框
this.marginLeft = this.marginRight = this.marginTop = this.marginBottom = 0; // 间距
this.position = {};
this.classMap = {};
this.classList = [];
this.children = [];
this.attribs = attribs || {};
this.styles = {};
// 兼容处理
this["0"] = this;
this.style = {};
if (!widget) {
this.nodeName = "body";
this.position.x = 0;
this.position.y = 0;
this.attribs.id = "body";
} else if (isWidget(widget)) {
this.widget = widget;
this.nodeName = widget.options.tagName;
this.textBaseLine = widget.options.textBaseLine;
} else if (isString(widget)) {
this.nodeName = widget;
}
}
}
initElement(Element);
registFunction(Element);
appendChild(child) {
child.parent = this;
if (this.children.push(child) !== 1) {
const sibling = this.children[this.children.length - 2];
sibling.next = child;
child.prev = sibling;
child.next = null;
}
}
append(child) {
child.parent = this;
if (this.children.push(child) !== 1) {
const sibling = this.children[this.children.length - 2];
sibling.next = child;
child.prev = sibling;
child.next = null;
}
}
function initElement(element) {
element.prototype = {
appendChild(child) {
child.parent = this;
if (this.children.push(child) !== 1) {
const sibling = this.children[this.children.length - 2];
sibling.next = child;
child.prev = sibling;
child.next = null;
}
},
append(child) {
child.parent = this;
if (this.children.push(child) !== 1) {
const sibling = this.children[this.children.length - 2];
sibling.next = child;
child.prev = sibling;
child.next = null;
}
},
getParent() {
return this.parent;
},
getSiblings() {
const parent = this.getParent();
return parent ? parent.getChildren() : [this];
},
getChildren() {
return this.children;
},
getParent() {
return this.parent;
}
getBounds() {
return {};
},
getSiblings() {
const parent = this.getParent();
width() {
return parent ? parent.getChildren() : [this];
}
},
height() {
getChildren() {
return this.children;
}
getBounds() {
return {};
}
width() {}
height() {}
}
registFunction(Element);
},
};
export function setElement(element) {
Element = element;
}

779
packages/fineui/src/fix/fix.js

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,5 @@
@import "../../../index.less";
@hoverVal: opacity .3s ease;
@activeVal: transform .5s ease, opacity 1s ease;
@activeStopVal: transform 0s;
@ -6,6 +7,7 @@ body .bi-button, #body .bi-button {
&.hack {
.border-radius(0px);
}
.border-radius(2px);
outline: 0;
border: 1px solid @color-bi-border-button;
@ -14,41 +16,51 @@ body .bi-button, #body .bi-button {
text-align: center;
vertical-align: middle;
cursor: pointer;
&.loading {
cursor: not-allowed;
}
&.block {
font-size: inherit;
border-width: 0;
.border-radius(0px);
}
&.clear {
font-size: inherit;
border-width: 0;
background-color: transparent;
&:hover, &:focus {
.opacity(0.8);
}
&:active {
.opacity(1);
}
&:after {
display: none;
}
}
&.plain {
font-size: inherit;
border-width: 0;
background-color: transparent;
}
&.ghost {
font-size: inherit;
background-color: transparent;
}
&.button-common {
&, & .b-font:before {
color: @color-bi-text-common-button;
}
&.light {
border-width: 0;
background-color: @color-bi-background-common-light-button;
@ -65,81 +77,101 @@ body .bi-button, #body .bi-button {
background-color: @color-bi-background-active-common-light-button;
}
}
&.clear, &.clear .b-font:before {
color: @color-bi-text-common-clear-button;
}
&.plain, &.plain .b-font:before {
background-color: transparent;
color: @color-bi-text-common-plain-button;
}
&.plain {
&:hover {
background-color: @color-bi-background-hover-plain-button;
}
&:focus {
background-color: @color-bi-background-active-plain-button;
}
}
&.ghost {
&, & .b-font:before {
color: @color-bi-text-common-ghost-button;
}
&:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
color: @color-bi-text;
background-color: @color-bi-background-hover-common-ghost-button;
}
&:active {
background-color: @color-bi-background-active-common-ghost-button;
}
}
}
&.button-ignore {
& {
background-color: @color-bi-background-ignore-button;
&:not(.clear, .ghost) {
border-color: @color-bi-border-ignore-button;
}
}
&:not(.clear, .ghost) {
&, & .b-font:before {
color: @color-bi-text-ignore-button;
}
}
&.clear {
background-color: transparent;
border-width: 0;
}
&.ghost {
&:hover, &:focus {
border-color: @color-bi-border-ignore-button;
&, & .b-font:before {
color: @color-bi-text-ignore-button;
}
}
background-color: transparent;
border-color: @color-bi-border-dark-gray-line;
}
&.plain, &.plain .b-font:before {
background-color: transparent;
color: @color-bi-text-ignore-plain-button;
}
&.plain {
&:hover {
background-color: @color-bi-background-hover-plain-button;
}
&:focus {
background-color: @color-bi-background-active-plain-button;
}
}
}
&.button-success {
& {
&, & .b-font:before {
color: @color-bi-text-success-button;
}
background-color: @color-bi-background-success-button;
border-color: @color-bi-border-success-button;
}
&.light {
border-width: 0;
background-color: @color-bi-background-success-light-button;
@ -156,47 +188,59 @@ body .bi-button, #body .bi-button {
background-color: @color-bi-background-active-success-light-button;
}
}
&.clear {
&, & .b-font:before {
color: @color-bi-text-success-clear-button;
}
background-color: transparent;
border-width: 0;
}
&.ghost {
&, & .b-font:before {
color: @color-bi-text-success-ghost-button;
}
background-color: transparent;
&:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
color: @color-bi-text;
background-color: @color-bi-background-success-button;
}
&:active {
background-color: @color-bi-background-success-button;
}
}
&.plain, &.plain .b-font:before {
background-color: transparent;
color: @color-bi-text-success-plain-button;
}
&.plain {
&:hover {
background-color: @color-bi-background-hover-plain-button;
}
&:focus {
background-color: @color-bi-background-active-plain-button;
}
}
}
&.button-warning {
& {
&, & .b-font:before {
color: @color-bi-text-warning-button;
}
background-color: @color-bi-background-warning-button;
border-color: @color-bi-border-warning-button;
}
&.light {
border-width: 0;
background-color: @color-bi-background-warning-light-button;
@ -213,47 +257,59 @@ body .bi-button, #body .bi-button {
background-color: @color-bi-background-active-warning-light-button;
}
}
&.clear {
&, & .b-font:before {
color: @color-bi-text-warning-clear-button;
}
background-color: transparent;
border-width: 0;
}
&.ghost {
&, & .b-font:before {
color: @color-bi-text-warning-ghost-button;
}
background-color: transparent;
&:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
color: @color-bi-text;
background-color: @color-bi-background-warning-button;
}
&:active {
background-color: @color-bi-background-warning-button;
}
}
&.plain, &.plain .b-font:before {
background-color: transparent;
color: @color-bi-text-warning-plain-button;
}
&.plain {
&:hover {
background-color: @color-bi-background-hover-plain-button;
}
&:focus {
background-color: @color-bi-background-active-plain-button;
}
}
}
&.button-error {
& {
&, & .b-font:before {
color: @color-bi-text-error-button;
}
background-color: @color-bi-background-error-button;
border-color: @color-bi-border-error-button;
}
&.light {
border-width: 0;
background-color: @color-bi-background-error-light-button;
@ -270,39 +326,49 @@ body .bi-button, #body .bi-button {
background-color: @color-bi-background-active-error-light-button;
}
}
&.clear {
&, & .b-font:before {
color: @color-bi-text-error-clear-button;
}
background-color: transparent;
border-width: 0;
}
&.ghost {
&, & .b-font:before {
color: @color-bi-text-error-ghost-button;
}
background-color: transparent;
&:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
color: @color-bi-text;
background-color: @color-bi-background-error-button;
}
&:active {
background-color: @color-bi-background-error-button;
}
}
&.plain, &.plain .b-font:before {
background-color: transparent;
color: @color-bi-text-error-plain-button;
}
&.plain {
&:hover {
background-color: @color-bi-background-hover-plain-button;
}
&:focus {
background-color: @color-bi-background-active-plain-button;
}
}
}
&.button-common.disabled,
&.button-success.disabled,
&.button-error.disabled,
@ -311,25 +377,30 @@ body .bi-button, #body .bi-button {
&, & .b-font:before {
color: @color-bi-text-disabled-button !important;
}
background-color: fade(@color-bi-background-disabled-button, 20%) !important;
@ieColor: argb(fade(@color-bi-background-disabled-button, 20%));
filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
border-color: @color-bi-border-disabled-button !important;
}
&:after {
display: none;
}
}
&.button-ignore.disabled {
&, & .b-font:before {
color: @color-bi-text-disabled-ignore-button !important;
}
background: @color-bi-background-disabled-ignore-button !important;
border-color: @color-bi-border-disabled-ignore-button !important;
&:after {
display: none;
}
}
&.button-common.disabled,
&.button-success.disabled,
&.button-warning.disabled,
@ -339,65 +410,81 @@ body .bi-button, #body .bi-button {
&, & .b-font:before {
color: @color-bi-text-disabled-ignore-clear-button !important;
}
background: transparent !important;
border-width: 0 !important;
&:hover, &:focus, &:active {
.opacity(1);
}
}
&.plain {
&, & .b-font:before {
color: @color-bi-text-disabled-plain-clear-button !important;
}
background: transparent !important;
border-width: 0 !important;
&:hover, &:focus, &:active {
.opacity(1);
}
}
&.ghost {
&, & .b-font:before {
// color: @color-bi-text-disabled-ignore-ghost-button !important;
}
background: transparent !important;
// border-color: @color-bi-border-disabled-ignore-ghost-button !important;
.opacity(0.5);
}
}
&.button-ignore.disabled {
&.ghost {
.opacity(1);
}
}
&.button-common.disabled {
&.ghost {
&, & .b-font:before {
color: @color-bi-text-disabled-common-ghost-button !important;
}
border-color: @color-bi-border-disabled-common-ghost-button !important;
}
}
&.button-success.disabled {
&.ghost {
&, & .b-font:before {
color: @color-bi-text-disabled-success-ghost-button !important;
}
border-color: @color-bi-border-disabled-success-ghost-button !important;
}
}
&.button-warning.disabled {
&.ghost {
&, & .b-font:before {
color: @color-bi-text-disabled-warning-ghost-button !important;
}
border-color: @color-bi-border-disabled-warning-ghost-button !important;
}
}
&.button-error.disabled {
&.ghost {
&, & .b-font:before {
color: @color-bi-text-disabled-error-ghost-button !important;
}
border-color: @color-bi-border-disabled-error-ghost-button !important;
}
}
@ -424,14 +511,17 @@ body .bi-button, #body .bi-button {
top: 0;
pointer-events: none;
}
&.hack:after {
content: none;
}
&:active:after {
transform: scale(0, 1);
.opacity(0.1);
.transition(@activeStopVal)
}
&:hover, &:focus {
& .bi-button-mask {
.opacity(0.1);
@ -440,6 +530,7 @@ body .bi-button, #body .bi-button {
}
}
}
&.button-ignore {
&:after {
content: "";
@ -456,24 +547,30 @@ body .bi-button, #body .bi-button {
top: 0;
pointer-events: none;
}
&.hack:after {
content: none;
}
&:active:after {
transform: scale(0, 1);
.opacity(0.1);
.transition(@activeStopVal)
}
&:hover, &:focus {
&:not(.clear, .ghost) {
background-color: @color-bi-background-hover-ignore-button-mask;
}
.transition(@hoverVal);
}
}
& .popup-content{
& .popup-content {
font-size: @font-size-14;
}
.bi-button-mask {
pointer-events: none;
}
@ -483,15 +580,19 @@ body .bi-button, #body .bi-button {
.bi-button {
&.button-ignore {
background-color: @color-bi-background-ignore-button-theme-dark;
&:hover, &:focus {
background-color: @color-bi-background-hover-ignore-button-theme-dark;
}
&:active {
background-color: @color-bi-background-active-ignore-button-theme-dark;
}
&.clear {
background-color: transparent;
}
&.ghost {
border-color: @color-bi-border-dark-gray-line-theme-dark;
}
@ -506,31 +607,36 @@ body .bi-button, #body .bi-button {
border-color: @color-bi-border-dark-gray-line-theme-dark !important;
background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important;
@ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%));
filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
&.clear {
background-color: transparent !important;
}
&.ghost {
// 深色系下灰化就统一用灰化色
&, & .b-font:before {
color: @color-bi-text-disabled-theme-dark !important;
}
background: transparent !important;
.opacity(1);
}
}
}
&.button-ignore.disabled {
&, &.base-disabled {
&, & .b-font:before {
color: @color-bi-text-disabled-theme-dark !important;
}
border-color: @color-bi-border-dark-gray-line-theme-dark !important;
background-color: @color-bi-background-ignore-button-theme-dark !important;
&.clear {
background-color: transparent !important;
}
&.ghost {
background: transparent !important;
.opacity(1);

3
packages/fineui/src/less/base/single/input/radio.less

@ -15,6 +15,9 @@
border-color: @color-bi-border-hover-active-radio;
}
}
.bi-radio-icon {
background-color: @color-bi-background-active-radio-content;
}
&.active {
& .radio-content, &.radio-content {
border-color: @color-bi-border-hover-active-radio;

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

@ -2,16 +2,20 @@
.base-disabled {
cursor: not-allowed !important;
.cursor-pointer {
cursor: not-allowed !important;
}
.cursor-default {
cursor: not-allowed !important;
}
.cursor-move {
cursor: not-allowed !important;
}
.cursor-text{
.cursor-text {
cursor: not-allowed !important;
}
@ -54,16 +58,20 @@
.base-invalid {
cursor: default !important;
.cursor-pointer {
cursor: default !important;
}
.cursor-default {
cursor: default !important;
}
.cursor-move {
cursor: default !important;
}
.cursor-text{
.cursor-text {
cursor: default !important;
}
}
@ -73,6 +81,7 @@
&:focus, &:hover {
border-color: @color-bi-border-highlight;
}
// ie下不支持focus-within, 和上面写在一起会导致ie下:hover不生效
&:focus-within {
border-color: @color-bi-border-highlight;
@ -125,6 +134,7 @@
& .bi-input {
color: @color-bi-text-background;
}
& .bi-textarea {
color: @color-bi-text-background;
}
@ -134,9 +144,11 @@
.bi-background {
background-color: @color-bi-background-normal-theme-dark;
color: @color-bi-text-background-theme-dark;
& .bi-input {
color: @color-bi-text-background-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-background-theme-dark;
}
@ -146,9 +158,11 @@
.bi-header-background {
background-color: @color-bi-background-header-background;
color: @color-bi-text-header-background;
& .bi-input {
color: @color-bi-text-header-background;
}
& .bi-textarea {
color: @color-bi-text-header-background;
}
@ -158,9 +172,11 @@
.bi-header-background {
background-color: @color-bi-background-header-background-theme-dark;
color: @color-bi-text-header-background-theme-dark;
& .bi-input {
color: @color-bi-text-header-background-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-header-background-theme-dark;
}
@ -171,12 +187,15 @@
.bi-card {
background-color: @color-bi-background-card;
color: @color-bi-text-card;
& .bi-input {
color: @color-bi-text-card;
}
& .bi-textarea {
color: @color-bi-text-card;
}
&.bi-primary {
background-color: @background-color-card-primary;
color: @color-card-primary;
@ -184,12 +203,14 @@
}
.bi-theme-dark {
.bi-card {
.bi-card, &.bi-card {
background-color: @color-bi-background-card-theme-dark;
color: @color-bi-text-card-theme-dark;
& .bi-input {
color: @color-bi-text-card-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-card-theme-dark;
}
@ -199,20 +220,24 @@
//灰化
.bi-disabled {
color: @color-bi-text-disabled;
& .bi-input {
color: @color-bi-text-disabled;
}
& .bi-textarea {
color: @color-bi-text-disabled;
}
}
.bi-theme-dark {
.bi-disabled {
.bi-disabled, &.bi-disabled {
color: @color-bi-text-disabled-theme-dark;
& .bi-input {
color: @color-bi-text-disabled-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-disabled-theme-dark;
}
@ -222,20 +247,24 @@
// 提示区域, 灰色字体
.bi-tips {
color: @color-bi-text-tips;
& .bi-input {
color: @color-bi-text-tips;
}
& .bi-textarea {
color: @color-bi-text-tips;
}
}
.bi-theme-dark {
.bi-tips {
.bi-tips, &.bi-tips {
color: @color-bi-text-tips-theme-dark;
& .bi-input {
color: @color-bi-text-tips-theme-dark;;
}
& .bi-textarea {
color: @color-bi-text-tips-theme-dark;
}
@ -245,9 +274,11 @@
// 边框
.bi-border {
border: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
&.error {
border-color: @border-color-negative;
}
@ -255,9 +286,11 @@
.bi-border-top {
border-top: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
&.error {
border-color: @border-color-negative;
}
@ -265,9 +298,11 @@
.bi-border-right {
border-right: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
&.error {
border-color: @border-color-negative;
}
@ -275,9 +310,11 @@
.bi-border-bottom {
border-bottom: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
&.error {
border-color: @border-color-negative;
}
@ -285,9 +322,11 @@
.bi-border-left {
border-left: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
&.error {
border-color: @border-color-negative;
}
@ -296,6 +335,7 @@
.bi-theme-dark {
.bi-border {
border: 1px solid @color-bi-border-line-theme-dark;
&.disabled {
border-color: @color-bi-border-disabled-theme-dark !important;
}
@ -303,6 +343,7 @@
.bi-border-top {
border-top: 1px solid @color-bi-border-line-theme-dark;
&.disabled {
border-color: @color-bi-border-disabled-theme-dark !important;
}
@ -310,6 +351,7 @@
.bi-border-right {
border-right: 1px solid @color-bi-border-line-theme-dark;
&.disabled {
border-color: @color-bi-border-disabled-theme-dark !important;
}
@ -317,6 +359,7 @@
.bi-border-bottom {
border-bottom: 1px solid @color-bi-border-line-theme-dark;
&.disabled {
border-color: @color-bi-border-disabled-theme-dark !important;
}
@ -324,6 +367,7 @@
.bi-border-left {
border-left: 1px solid @color-bi-border-line-theme-dark;
&.disabled {
border-color: @color-bi-border-disabled-theme-dark !important;
}
@ -421,9 +465,11 @@
// 标红
.bi-keyword-red-mark {
color: @color-bi-text-redmark;
& .bi-input {
color: @color-bi-text-redmark;
}
& .bi-textarea {
color: @color-bi-text-redmark;
}
@ -432,9 +478,11 @@
// 高亮
.bi-high-light {
color: @color-bi-text-highlight;
& .bi-input {
color: @color-bi-text-highlight;
}
& .bi-textarea {
color: @color-bi-text-highlight;
}
@ -442,9 +490,11 @@
.bi-error {
color: @color-bi-text-failure;
& .bi-input {
color: @color-bi-text-failure;
}
& .bi-textarea {
color: @color-bi-text-failure;
}
@ -453,9 +503,11 @@
.bi-high-light-background {
background-color: @color-bi-background-highlight;
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
@ -464,9 +516,11 @@
.bi-error-background {
background-color: @color-bi-background-failure;
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
@ -474,6 +528,7 @@
.bi-high-light-border {
border: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
@ -481,6 +536,7 @@
.bi-high-light-border-top {
border-top: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
@ -488,6 +544,7 @@
.bi-high-light-border-right {
border-right: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
@ -495,6 +552,7 @@
.bi-high-light-border-bottom {
border-bottom: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
@ -502,6 +560,7 @@
.bi-high-light-border-left {
border-left: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
@ -512,9 +571,11 @@
color: @color-bi-text-water-mark;
cursor: text;
.user-select-disable();
& .bi-input {
color: @color-bi-text-water-mark;
}
& .bi-textarea {
color: @color-bi-text-water-mark;
}
@ -523,9 +584,11 @@
.bi-theme-dark {
.bi-water-mark {
color: @color-bi-text-water-mark-theme-dark;
& .bi-input {
color: @color-bi-text-water-mark-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-water-mark-theme-dark;
}
@ -548,24 +611,30 @@
// 蒙板
.bi-mask {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
.background-color(@color-bi-background-black, 20%);
}
.bi-theme-dark {
.bi-mask {
color: @color-bi-text-white-theme-dark;
& .bi-input {
color: @color-bi-text-white-theme-dark;
}
& .bi-textarea {
color: @color-bi-text-white-theme-dark;
}
.background-color(@color-bi-background-default, 20%);
}
}
@ -576,7 +645,7 @@
}
.bi-theme-dark {
.bi-z-index-mask {
.bi-z-index-mask, &.bi-z-index-mask {
//color: @color-bi-background-default;
//& .bi-input {
// color: @color-bi-background-default;

2
packages/fineui/src/less/visual.less

@ -43,13 +43,11 @@
.background-color(@color, @alpha) {
background-color: fade(@color, @alpha);
@ieColor: argb(fade(@color, @alpha));
filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
}
.opacity(@opa) {
opacity: @opa;
@opa-ie: @opa*100;
filter: ~'alpha(opacity=@{opa-ie})';
}
.transition(@transition) {

3
packages/fineui/src/less/widget/intervalslider/intervalslider.label.less

@ -1,3 +0,0 @@
.bi-interval-slider-label {
min-height: 50px;
}

3
packages/fineui/src/less/widget/intervalslider/intervalslider.less

@ -1,3 +0,0 @@
.bi-interval-slider {
min-height: 50px;
}

67
packages/fineui/src/widget/datepane/datepane.js

@ -30,6 +30,7 @@ export class DynamicDatePane extends Widget {
minDate: "1900-01-01",
maxDate: "2099-12-31",
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
render() {
@ -63,17 +64,11 @@ export class DynamicDatePane extends Widget {
{
eventName: ButtonGroup.EVENT_CHANGE,
action: () => {
let date;
const value = this.switcher.getValue()[0];
this.dateTab.setSelect(value);
switch (value) {
case DynamicDatePane.Static:
date = DynamicDateHelper.getCalculation(this.dynamicPane.getValue());
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
});
this._setStaticValueByDynamicValue(this.dynamicPane.getValue());
break;
case DynamicDatePane.Dynamic:
this.dynamicPane.setValue({
@ -195,7 +190,7 @@ export class DynamicDatePane extends Widget {
}
created() {
this.setValue(this.options.value);
this._initValue(this.options.value);
}
_checkValueValid(value) {
@ -212,6 +207,31 @@ export class DynamicDatePane extends Widget {
}
}
_initValue(v) {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
const { isPreview } = this.options;
// 如果是初始化且是预览状态 直接打开静态页面
this.switcher.setValue(isPreview ? DynamicDateCombo.Static : type);
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
if (isPreview) {
this._setStaticValueByDynamicValue(value);
} else {
this.dynamicPane.setValue(value);
}
break;
case DynamicDateCombo.Static:
default:
this._setStaticValue(value);
break;
}
}
setMinDate(minDate) {
if (this.options.minDate !== minDate) {
this.options.minDate = minDate;
@ -238,19 +258,32 @@ export class DynamicDatePane extends Widget {
break;
case DynamicDateCombo.Static:
default:
if (this._checkValueValid(value)) {
const date = getDate();
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
});
} else {
this.ymd.setValue(value);
}
this._setStaticValue(value);
break;
}
}
_setStaticValue(value) {
if (this._checkValueValid(value)) {
const date = getDate();
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
});
} else {
this.ymd.setValue(value);
}
}
_setStaticValueByDynamicValue(value) {
const date = DynamicDateHelper.getCalculation(value);
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
});
}
getValue() {
const type = this.dateTab.getSelect();

50
packages/fineui/src/widget/downlist/popup.downlist.js

@ -1,23 +1,23 @@
import { ButtonTree, Pane } from "@/base";
import {
Selection,
VerticalLayout,
Layout,
shortcut,
extend,
createWidget,
createItems,
isNotNull,
BlankSplitChar,
contains,
createItems,
createWidget,
deepClone,
each,
extend,
isEmpty,
map,
isNotEmptyString,
isNotEmptyArray,
some,
deepClone,
isNotEmptyString,
isNotNull,
Layout,
map,
Selection,
shortcut,
SIZE_CONSANTS,
BlankSplitChar
some,
VerticalLayout,
} from "@/core";
import { DownListGroup } from "./group.downlist";
@ -63,14 +63,14 @@ export class DownListPopup extends Pane {
{},
{
adjustLength: -2,
}
},
),
layouts: [
{
type: VerticalLayout.xtype,
hgap: this.constants.hgap,
vgap: this.constants.vgap,
}
},
],
value: this._digest(o.value),
chooseType: o.chooseType,
@ -142,7 +142,7 @@ export class DownListPopup extends Pane {
layouts: [
{
type: VerticalLayout.xtype,
}
},
],
},
innerVgap: 5,
@ -163,11 +163,9 @@ export class DownListPopup extends Pane {
item_done.items.push(el_done);
storeItem.push(item);
});
if (this._isGroup(item_done.items)) {
each(item_done.items, (i, item) => {
this.singleValues.push(item.el.value);
});
}
each(item_done.items, (i, item) => {
this.singleValues.push(item.el.value);
});
result.push(item_done);
this.items.push(storeItem);
@ -181,7 +179,7 @@ export class DownListPopup extends Pane {
cls: "bi-down-list-spliter bi-split-top cursor-pointer",
height: 0,
},
}
},
],
cls: "bi-down-list-spliter-container cursor-pointer",
vgap: 5,
@ -220,10 +218,6 @@ export class DownListPopup extends Pane {
});
}
_isGroup(i) {
return i.length > 1;
}
_needSpliter(i, itemLength) {
return i < itemLength - 1;
}
@ -276,7 +270,7 @@ export class DownListPopup extends Pane {
return true;
}
})
}),
);
return value;
@ -295,7 +289,7 @@ export class DownListPopup extends Pane {
{},
{
adjustLength: -2,
}
},
);
this.popup.populate(popupItem);
}

2
packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js

@ -53,6 +53,7 @@ export class DynamicDateCombo extends Single {
},
isNeedAdjustHeight: false,
isNeedAdjustWidth: false,
isPreview: false, // 是否是预览状态
};
_init() {
@ -200,6 +201,7 @@ export class DynamicDateCombo extends Single {
popup: {
el: {
type: DynamicDatePopup.xtype,
isPreview: opts.isPreview,
width: opts.isNeedAdjustWidth ? opts.width : undefined,
supportDynamic: opts.supportDynamic,
behaviors: opts.behaviors,

18
packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js

@ -34,6 +34,7 @@ export class DynamicDatePopup extends Widget {
baseCls: "bi-dynamic-date-popup",
width: 272,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
static EVENT_CHANGE = "EVENT_CHANGE";
@ -282,10 +283,23 @@ export class DynamicDatePopup extends Widget {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
this.dateTab.setSelect(type);
const { isPreview } = this.options;
let date;
// 如果是预览状态 直接打开静态页面
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
this.dynamicPane.setValue(value);
if (isPreview) {
date = DynamicDateHelper.getCalculation(value);
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
});
} else {
this.dynamicPane.setValue(value);
}
this._setInnerValue();
break;
case DynamicDateCombo.Static:

2
packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js

@ -44,6 +44,7 @@ export class DynamicDateTimeCombo extends Single {
},
isNeedAdjustHeight: false,
isNeedAdjustWidth: false,
isPreview: false, // 是否是预览状态
};
static EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
@ -207,6 +208,7 @@ export class DynamicDateTimeCombo extends Single {
popup: {
el: {
type: DynamicDateTimePopup.xtype,
isPreview: opts.isPreview,
timeSelectTypes: opts.timeSelectTypes,
width: opts.isNeedAdjustWidth ? opts.width : undefined,
supportDynamic: opts.supportDynamic,

19
packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -36,6 +36,7 @@ export class DynamicDateTimePopup extends Widget {
baseCls: "bi-dynamic-date-time-popup",
width: 272,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
static EVENT_CHANGE = "EVENT_CHANGE";
@ -292,10 +293,24 @@ export class DynamicDateTimePopup extends Widget {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
this.dateTab.setSelect(type);
const { isPreview } = this.options;
let date;
// 如果是预览状态 直接打开静态页面
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
this.dynamicPane.setValue(value);
if (isPreview) {
date = DynamicDateHelper.getCalculation(value);
this.ymd.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
});
this.timeSelect.setValue();
} else {
this.dynamicPane.setValue(value);
}
this._setInnerValue();
break;
case DynamicDateCombo.Static:

18
packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js

@ -181,18 +181,24 @@ export class DynamicDateTimeSelect extends Widget {
}
_checkHour(value) {
this.hour.setDownEnable(parseInt(value) > 0);
this.hour.setUpEnable(parseInt(value) < 23);
const { timeSelectTypes } = this.options;
const canSelect = timeSelectTypes.includes(DynamicDateTimeSelect.HOUR);
this.hour.setDownEnable(canSelect && parseInt(value) > 0);
this.hour.setUpEnable(canSelect && parseInt(value) < 23);
}
_checkMinute(value) {
this.minute.setDownEnable(parseInt(value) > 0);
this.minute.setUpEnable(parseInt(value) < 59);
const { timeSelectTypes } = this.options;
const canSelect = timeSelectTypes.includes(DynamicDateTimeSelect.MINUTE);
this.minute.setDownEnable(canSelect && parseInt(value) > 0);
this.minute.setUpEnable(canSelect && parseInt(value) < 59);
}
_checkSecond(value) {
this.second.setDownEnable(parseInt(value) > 0);
this.second.setUpEnable(parseInt(value) < 59);
const { timeSelectTypes } = this.options;
const canSelect = timeSelectTypes.includes(DynamicDateTimeSelect.SECOND);
this.second.setDownEnable(canSelect && parseInt(value) > 0);
this.second.setUpEnable(canSelect && parseInt(value) < 59);
}
_autoSwitch(v, type) {

56
packages/fineui/src/widget/intervalslider/intervalslider.js

@ -23,19 +23,17 @@ import { Single, Editor } from "@/base";
import { AccurateCalculationModel } from "./model.accuratecalculation";
import { SignTextEditor, SliderIconButton } from "../singleslider";
const CONSTANTS = {
EDITOR_WIDTH: 58,
EDITOR_HEIGHT: 20,
LABEL_HEIGHT: 30,
SLIDER_HEIGHT: 30,
};
@shortcut()
export class IntervalSlider extends Single {
static xtype = "bi.interval_slider";
_constant = {
EDITOR_WIDTH: 58,
EDITOR_R_GAP: 60,
EDITOR_HEIGHT: 20,
SLIDER_WIDTH_HALF: 15,
LABEL_HEIGHT: 30,
SLIDER_WIDTH: 30,
SLIDER_HEIGHT: 30,
TRACK_HEIGHT: 24,
};
props = {
baseCls: "bi-interval-slider bi-slider-track",
digit: false,
@ -45,6 +43,8 @@ export class IntervalSlider extends Single {
value: { min: "", max: "" },
lAlign: "center",
rAlign: "center",
labelHeight: CONSTANTS.LABEL_HEIGHT,
sliderHeight: CONSTANTS.SLIDER_HEIGHT,
};
static EVENT_CHANGE = "EVENT_CHANGE";
@ -59,8 +59,11 @@ export class IntervalSlider extends Single {
this.populate();
}
getConstant() {
return CONSTANTS;
}
render() {
const c = this._constant;
const o = this.options;
this.enable = false;
this.valueOne = "";
@ -86,8 +89,8 @@ export class IntervalSlider extends Single {
text: unit,
allowBlank: false,
textAlign: lAlign,
width: BI.isNull(editorWidth) ? BI.toPix(c.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2),
height: toPix(c.EDITOR_HEIGHT, 2),
width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2),
height: toPix(CONSTANTS.EDITOR_HEIGHT, 2),
validationChecker: v => this._checkValidation(v),
});
this.labelOne.element.hover(
@ -116,8 +119,8 @@ export class IntervalSlider extends Single {
text: unit,
allowBlank: false,
textAlign: rAlign,
width: BI.isNull(editorWidth) ? BI.toPix(c.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2),
height: toPix(c.EDITOR_HEIGHT, 2),
width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2),
height: toPix(CONSTANTS.EDITOR_HEIGHT, 2),
validationChecker: v => this._checkValidation(v),
});
this.labelTwo.element.hover(
@ -152,7 +155,7 @@ export class IntervalSlider extends Single {
return {
type: VerticalFillLayout.xtype,
rowSize: [o.labelHeight || c.LABEL_HEIGHT, o.sliderHeight || c.SLIDER_HEIGHT],
rowSize: [o.labelHeight, o.sliderHeight],
items: [
this._createLabelWrapper(),
{
@ -253,7 +256,6 @@ export class IntervalSlider extends Single {
_createLabelWrapper() {
const o = this.options;
const c = this._constant;
return {
el: {
@ -275,7 +277,7 @@ export class IntervalSlider extends Single {
],
},
],
height: o.labelHeight || c.LABEL_HEIGHT,
height: o.labelHeight,
},
top: 0,
left: 0,
@ -372,24 +374,6 @@ export class IntervalSlider extends Single {
return valid;
}
_checkOverlap() {
const labelOneLeft = this.labelOne.element[0].offsetLeft;
const labelTwoLeft = this.labelTwo.element[0].offsetLeft;
if (labelOneLeft <= labelTwoLeft) {
if (labelTwoLeft - labelOneLeft < 90) {
this.labelTwo.element.css({ top: 40 });
} else {
this.labelTwo.element.css({ top: 0 });
}
} else {
if (labelOneLeft - labelTwoLeft < 90) {
this.labelTwo.element.css({ top: 40 });
} else {
this.labelTwo.element.css({ top: 0 });
}
}
}
_checkLabelPosition(oldValueOne, oldValueTwo, valueOne, valueTwo, isLeft) {
oldValueOne = parseFloat(oldValueOne);
oldValueTwo = parseFloat(oldValueTwo);

1
packages/fineui/src/widget/multiselect/search/multiselect.search.loader.js

@ -191,6 +191,7 @@ export class MultiSelectSearchLoader extends Widget {
return {
text: o.valueFormatter(v) || v,
value: v,
keyword: keyword,
};
});
if (isKey(keyword)) {

17
packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js

@ -1,4 +1,17 @@
import { shortcut, Widget, extend, emptyFn, i18nText, createWidget, isNotNull, isEmptyArray, size, each, BlankSplitChar, Selection } from "@/core";
import {
shortcut,
Widget,
extend,
emptyFn,
i18nText,
createWidget,
isNotNull,
isEmptyArray,
size,
each,
BlankSplitChar,
Selection
} from "@/core";
import { MultiSelectEditor } from "./editor.multiselect";
import { Searcher } from "@/base";
import { MultiSelectSearchInsertPane } from "../search/multiselect.search.insert.pane";
@ -80,7 +93,7 @@ export class MultiSelectInsertSearcher extends Widget {
op.keywords = [keyword];
this.setKeyword(keyword);
o.itemsCreator(op, function () {
if (keyword === self.editor.getValue()) {
if (keyword === self.editor.getKeyword()) {
callback(...arguments);
}
});

4
packages/fineui/src/widget/singleslider/button/editor.sign.text.js

@ -106,7 +106,7 @@ export class SignTextEditor extends Widget {
_checkText() {
const o = this.options;
nextTick(
bind(() => {
() => {
if (this.editor.getValue() === "") {
this.text.setValue(o.watermark || "");
this.text.element.addClass("bi-water-mark");
@ -116,7 +116,7 @@ export class SignTextEditor extends Widget {
this.text.setValue(v);
this.text.element.removeClass("bi-water-mark");
}
}, this)
}
);
}

2
packages/fineui/src/widget/timeinterval/dateinterval.js

@ -23,6 +23,7 @@ export class DateInterval extends Single {
lgap: 15,
offset: 0,
timeErrorCls: "time-error",
isPreview: false, // 是否是预览状态
};
static EVENT_VALID = "EVENT_VALID";
@ -78,6 +79,7 @@ export class DateInterval extends Single {
const o = this.options;
const combo = createWidget({
type: DynamicDateCombo.xtype,
isPreview: o.isPreview,
supportDynamic: o.supportDynamic,
minDate: o.minDate,
maxDate: o.maxDate,

2
packages/fineui/src/widget/timeinterval/timeinterval.js

@ -23,6 +23,7 @@ export class TimeInterval extends Single {
lgap: 15,
offset: 0,
timeErrorCls: "time-error",
isPreview: false, // 是否是预览状态
};
static EVENT_VALID = "EVENT_VALID";
@ -76,6 +77,7 @@ export class TimeInterval extends Single {
const o = this.options;
const combo = createWidget({
type: DynamicDateTimeCombo.xtype,
isPreview: o.isPreview,
timeSelectTypes: o.timeSelectTypes,
simple: o.simple,
supportDynamic: o.supportDynamic,

2
packages/fineui/src/widget/year/combo.year.js

@ -27,6 +27,7 @@ export class DynamicYearCombo extends Widget {
maxDate: "2099-12-31", // 最大日期
height: 24,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
_init() {
@ -95,6 +96,7 @@ export class DynamicYearCombo extends Widget {
el: {
type: DynamicYearPopup.xtype,
supportDynamic: o.supportDynamic,
isPreview: o.isPreview,
ref: _ref => {
this.popup = _ref;
},

10
packages/fineui/src/widget/year/popup.year.js

@ -30,6 +30,7 @@ export class DynamicYearPopup extends Widget {
max: "2099-12-31",
width: 180,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
constants = {
tabHeight: 40,
@ -266,10 +267,15 @@ export class DynamicYearPopup extends Widget {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
this.dateTab.setSelect(type);
const { isPreview } = this.options;
// 如果是预览状态 直接打开静态页面
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
this.dynamicPane.setValue(value);
isPreview
? this.year.setValue({ year: DynamicDateHelper.getCalculation(value).getFullYear() })
: this.dynamicPane.setValue(value);
this._setInnerValue();
break;
case DynamicDateCombo.Static:

2
packages/fineui/src/widget/yearmonth/combo.yearmonth.js

@ -38,6 +38,7 @@ export class DynamicYearMonthCombo extends Single {
supportDynamic: true,
isNeedAdjustHeight: false,
isNeedAdjustWidth: false,
isPreview: false, // 是否是预览状态
};
_init() {
@ -106,6 +107,7 @@ export class DynamicYearMonthCombo extends Single {
type: DynamicYearMonthPopup.xtype,
width: o.isNeedAdjustWidth ? o.width : undefined,
supportDynamic: o.supportDynamic,
isPreview: o.isPreview,
ref: _ref => {
this.popup = _ref;
},

16
packages/fineui/src/widget/yearmonth/popup.yearmonth.js

@ -31,6 +31,7 @@ export class DynamicYearMonthPopup extends Widget {
max: "2099-12-31",
width: 180,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
static BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
@ -262,11 +263,22 @@ export class DynamicYearMonthPopup extends Widget {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
const { isPreview } = this.options;
let date;
this.dateTab.setSelect(type);
// 如果是预览状态 直接打开静态页面
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
this.dynamicPane.setValue(value);
if (isPreview) {
date = DynamicDateHelper.getCalculation(value);
this.year.setValue({
year: date.getFullYear(),
month: date.getMonth() + 1,
});
} else {
this.dynamicPane.setValue(value);
}
this._setInnerValue();
break;
case DynamicDateCombo.Static:

2
packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js

@ -34,6 +34,7 @@ export class YearMonthInterval extends Single {
supportDynamic: true,
height: 24,
simple: false,
isPreview: false, // 是否是预览状态
};
render() {
@ -71,6 +72,7 @@ export class YearMonthInterval extends Single {
const o = this.options;
const combo = createWidget({
type: DynamicYearMonthCombo.xtype,
isPreview: o.isPreview,
simple: o.simple,
supportDynamic: o.supportDynamic,
height: o.height,

2
packages/fineui/src/widget/yearquarter/combo.yearquarter.js

@ -33,6 +33,7 @@ export class DynamicYearQuarterCombo extends Widget {
supportDynamic: true,
isNeedAdjustHeight: false,
isNeedAdjustWidth: false,
isPreview: false, // 是否是预览状态
};
static EVENT_CONFIRM = "EVENT_CONFIRM";
@ -109,6 +110,7 @@ export class DynamicYearQuarterCombo extends Widget {
type: DynamicYearQuarterPopup.xtype,
width: o.isNeedAdjustWidth ? o.width : undefined,
supportDynamic: o.supportDynamic,
isPreview: o.isPreview,
ref: _ref => {
this.popup = _ref;
},

27
packages/fineui/src/widget/yearquarter/popup.yearquarter.js

@ -32,6 +32,7 @@ export class DynamicYearQuarterPopup extends Widget {
max: "2099-12-31",
width: 180,
supportDynamic: true,
isPreview: false, // 是否是预览状态
};
static BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
@ -41,7 +42,7 @@ export class DynamicYearQuarterPopup extends Widget {
render() {
this.storeValue = { type: DynamicYearQuarterCombo.Static };
return {
type: VerticalLayout.xtype,
items: [
@ -157,7 +158,7 @@ export class DynamicYearQuarterPopup extends Widget {
_checkTodayValid() {
const o = this.options;
const today = getDate();
return !!checkDateVoid(
today.getFullYear(),
today.getMonth() + 1,
@ -169,7 +170,7 @@ export class DynamicYearQuarterPopup extends Widget {
_getTabJson() {
const o = this.options;
return {
type: Tab.xtype,
logic: {
@ -263,8 +264,8 @@ export class DynamicYearQuarterPopup extends Widget {
default:
if (
this.storeValue &&
this.storeValue.type ===
DynamicYearQuarterCombo.Dynamic
this.storeValue.type ===
DynamicYearQuarterCombo.Dynamic
) {
this.dynamicPane.setValue(
this.storeValue.value
@ -304,10 +305,22 @@ export class DynamicYearQuarterPopup extends Widget {
v = v || {};
const type = v.type || DynamicDateCombo.Static;
const value = v.value || v;
this.dateTab.setSelect(type);
const { isPreview } = this.options;
let date;
// 如果是预览状态 直接打开静态页面
this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
switch (type) {
case DynamicDateCombo.Dynamic:
this.dynamicPane.setValue(value);
if (isPreview) {
date = DynamicDateHelper.getCalculation(value);
this.year.setValue({
year: date.getFullYear(),
quarter: getQuarter(date),
});
} else {
this.dynamicPane.setValue(value);
}
this._setInnerValue();
break;
case DynamicDateCombo.Static:

Loading…
Cancel
Save