Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

# Conflicts:
#	src/less/widget/multitree/trigger/multi.tree.button.checkselected.less

dist/font/iconfont.svg

@@ -14,6 +14,62 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="a-leixingshujubiaozhilianoffyifabuon" unicode="&#59848;" d="M56 864a16 16 0 0 1-16-16v-808a16 16 0 0 1 16-16h455.232a282.52 282.52 0 0 0-12.972 56H96V808h496v-148a16 16 0 0 1 16-16h160v-244.248a285.964 285.964 0 0 0 56-3.14V653.28a16 16 0 0 1-4.796 11.424l-198.536 194.72A16.004 16.004 0 0 1 609.464 864H56zM493.596 355.344L613.432 500l49.284-40.828-134.672-162.568-3.988-5.168a32 32 0 0 0-44.88-5.796l-112.196 86.536-117.696-140.556L200 272.448l131.816 157.6 4.672 6.06a32 32 0 0 0 44.88 5.796l112.228-86.56zM1020 116c0-132.548-107.452-240-240-240s-240 107.452-240 240 107.452 240 240 240 240-107.452 240-240z m-104.296 116.508c1.464 4.444-2.752 8.66-7.196 7.196l-284.596-93.912a5.696 5.696 0 0 1-2.24-9.436l72.14-72.14 91.08 44.436-44.436-91.08 71.9-71.9c3-3 8.108-1.788 9.436 2.244l93.912 284.592z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-leixingshujubiaozhilianonyifabuon" unicode="&#59849;" d="M40 848a16 16 0 0 0 16 16h553.464c4.188 0 8.212-1.64 11.204-4.576l198.536-194.72A16 16 0 0 0 824 653.28v-256.668a285.964 285.964 0 0 1-56 3.14V644h-160a16 16 0 0 0-16 16V808H96v-728h402.26a282.52 282.52 0 0 1 12.972-56H56a16 16 0 0 0-16 16V848zM176 216h338.104a282.16 282.16 0 0 1-15.844-64H176a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8zM613.432 580l-119.836-144.656-112.224 86.56a32 32 0 0 1-44.884-5.796l-4.672-6.06L200 352.448l49.284-40.828 117.696 140.556 112.196-86.536a32 32 0 0 1 44.88 5.796l3.988 5.168 134.672 162.568L613.432 580zM1020 116c0-132.548-107.452-240-240-240s-240 107.452-240 240 107.452 240 240 240 240-107.452 240-240z m-104.296 116.508c1.464 4.444-2.752 8.66-7.196 7.196l-284.596-93.912a5.696 5.696 0 0 1-2.24-9.436l72.14-72.14 91.08 44.436-44.436-91.08 71.9-71.9c3-3 8.108-1.788 9.436 2.244l93.912 284.592z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="shouye2" unicode="&#59847;" d="M131.82 363.06l39.452 35.052v-414.464a16 16 0 0 1 16-16h232a16 16 0 0 1 16 16v134a8 8 0 0 0 8 8h140a8 8 0 0 0 8-8v-134a16 16 0 0 1 16-16h228a16 16 0 0 1 16 16V398.9l39.216-35.524a8 8 0 0 1 11.3 0.556l42.968 47.432a8 8 0 0 1-0.556 11.3L536.808 791.716a32 32 0 0 1-42.736 0.208L78.688 422.86a8 8 0 0 1-0.668-11.292l42.508-47.848a8 8 0 0 1 11.292-0.664z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1cha" unicode="&#59846;" d="M512 832c247.424 0 448-200.576 448-448s-200.576-448-448-448S64 136.576 64 384 264.576 832 512 832z m0-72c-207.66 0-376-168.34-376-376s168.34-376 376-376 376 168.34 376 376-168.34 376-376 376zM322.36 559.692a8 8 0 0 1-1.148-11.256l313.364-384.472a8.004 8.004 0 0 1 11.256-1.148l55.812 45.492a7.996 7.996 0 0 1 1.144 11.252l-313.36 384.476a8 8 0 0 1-11.256 1.144L322.36 559.692z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="canshushuchu" unicode="&#59845;" d="M80 800a16 16 0 0 0 16 16h832a16 16 0 0 0 16-16V379.708a304.06 304.06 0 0 1-72 43.692V556H152v-532h320.6a304.06 304.06 0 0 1 43.692-72H96a16 16 0 0 0-16 16V800z m652-352v-0.648c-86.768-5.636-163.616-47.672-215.416-110.996A88.264 88.264 0 0 0 463.676 384H196a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h267.676c13.76 30.652 44.548 52 80.324 52 35.776 0 66.564-21.348 80.324-52H724a8 8 0 0 0 8-8z m-319.676-232h44.252A304.824 304.824 0 0 1 448 144h-35.676c-13.76-30.652-44.548-52-80.324-52-35.776 0-66.564 21.348-80.32 52H196a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h55.68c13.756 30.652 44.544 52 80.32 52 35.776 0 66.564-21.348 80.324-52zM992 144c0-132.548-107.452-240-240-240s-240 107.452-240 240 107.452 240 240 240 240-107.452 240-240z m-261.808-85.356a8 8 0 0 1 0-11.312l33.94-33.94a8 8 0 0 1 11.312 0l120.82 120.82a16 16 0 0 1 0 22.624l-120.82 120.82a8 8 0 0 1-11.312 0l-33.94-33.94a8 8 0 0 1 0-11.312l49.088-49.092H608a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h174.856l-52.664-52.668z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="wenjianshuru" unicode="&#59844;" d="M99.5 760A19.5 19.5 0 0 1 80 740.5V284.4l36.884 204.92a68.256 68.256 0 0 0 67.176 56.164h676V623.488a19.5 19.5 0 0 1-19.5 19.504h-291.9a39.012 39.012 0 0 0-26.456 10.344l-104.348 96.32A39 39 0 0 1 391.4 760H99.5z m84.56-263.264c-9.44 0-17.52-6.76-19.192-16.048L84.132 32.152a19.5 19.5 0 0 1 19.192-22.956h411.656C563.352-66.108 647.848-116 744-116c150.22 0 272 121.78 272 272 0 81.532-35.872 154.688-92.696 204.54l20.38 113.24c2.156 11.96-7.04 22.956-19.192 22.956H184.06zM744-52c-114.876 0-208 93.124-208 208s93.124 208 208 208 208-93.124 208-208-93.124-208-208-208z m-83.192 197.9l132.628 139.648a33.576 33.576 0 0 0 47.488 1.208l45.388-47.432c12.52-13.068 12.408-33.732-0.256-46.684l-139.824-143.044-92.012-32.004a28.772 28.772 0 0 0-37.916 23.028 28.76 28.76 0 0 0 2.456 16.46l42.048 88.82z m181.18 70.34l-24.176 25.328-116.94-123.096-19.168-40.496 38.136 13.24 122.148 125.024z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="peizhiguanli" unicode="&#59843;" d="M653.504 830.848a444.608 444.608 0 0 0 211.968-125.952c12.16-12.992 14.016-32.896 4.288-48-15.808-24.256-16.768-55.68-2.432-80.96h-70.08a162.176 162.176 0 0 0 3.968 103.936 381.952 381.952 0 0 1-136.576 81.28 151.808 151.808 0 0 0-241.28 0 382.272 382.272 0 0 1-136.576-81.28 161.92 161.92 0 0 0-10.176-137.152 153.344 153.344 0 0 0-110.528-77.632 412.16 412.16 0 0 1 0-162.176c46.464-7.104 87.232-35.712 110.528-77.696 23.616-41.728 27.328-92.16 10.176-137.088a382.464 382.464 0 0 1 136.512-81.216 151.872 151.872 0 0 0 241.344 0l13.248 4.928-16.128-72.448a437.056 437.056 0 0 0-8.256-2.24 36.992 36.992 0 0 0-42.56 20.224A74.112 74.112 0 0 1 544 0a74.112 74.112 0 0 1-66.944-42.688 36.928 36.928 0 0 0-42.56-20.16 443.968 443.968 0 0 0-211.968 125.888 39.232 39.232 0 0 0-4.352 48c15.872 24.448 16.768 55.488 2.496 80.896a74.24 74.24 0 0 1-69.44 38.272 37.312 37.312 0 0 0-38.272 27.84A471.872 471.872 0 0 0 96 384c0 42.56 5.632 84.928 16.96 125.888a36.864 36.864 0 0 0 38.272 27.84c28.352-1.984 55.296 12.8 69.44 38.208a78.272 78.272 0 0 1-2.496 80.96 39.232 39.232 0 0 0 4.352 48 444.48 444.48 0 0 0 211.968 125.952 36.992 36.992 0 0 0 42.56-20.224c12.544-26.24 38.528-42.816 66.944-42.688 28.416-0.128 54.4 16.448 66.944 42.688a36.928 36.928 0 0 0 42.56 20.224zM544 576c57.472 0 109.12-25.28 144.32-65.28l-30.464-68.224a128 128 0 1 1-81.536-182.4L545.728 192H544a192 192 0 1 0 0 384zM833.664 503.488l0.256-199.552h118.464c6.336 0 9.856-8.192 6.016-13.76l-199.808-286.912c-4.48-6.4-13.568-2.816-13.568 5.248l-0.256 199.552H626.304c-6.4 0-9.92 8.128-6.016 13.76l199.808 286.912c4.416 6.4 13.568 2.816 13.568-5.248z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tiaoduguanli" unicode="&#59842;" d="M512 864a160 160 0 1 1 0-320 160 160 0 0 1 0 320z m0-64a96 96 0 1 0 0-192 96 96 0 0 0 0 192zM192 288a160 160 0 1 1 0-320 160 160 0 0 1 0 320z m0-64a96 96 0 1 0 0-192 96 96 0 0 0 0 192zM832 288a160 160 0 1 1 0-320 160 160 0 0 1 0 320z m0-64a96 96 0 1 0 0-192 96 96 0 0 0 0 192zM284.48 601.408l38.912-50.816c-52.992-40.576-85.12-92.16-97.28-155.968l-2.432-14.976-63.36 8.704c11.2 81.728 48.32 149.504 110.464 202.048l13.696 11.008zM711.232 601.408l-38.912-50.816c52.928-40.576 85.12-92.16 97.216-155.968l2.432-14.976 63.36 8.704c-11.2 81.728-48.256 149.504-110.4 202.048l-13.696 11.008zM396.352 11.328c68.544-28.736 140.352-33.024 216.448-12.8l17.6 5.12 19.2-61.056c-90.432-28.288-177.536-27.456-260.288 2.816l-17.664 6.912 24.704 59.008z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="wenjianguanli" unicode="&#59841;" d="M864 832a64 64 0 0 0 64-64v-768a64 64 0 0 0-64-64h-704a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h704z m0-64h-64v-262.4a12.8 12.8 0 0 0-18.56-11.392l-109.44 55.488-109.44-55.488A12.8 12.8 0 0 0 544 505.6V768h-384v-768h704V768z m-128-576a32 32 0 1 0 0-64h-448a32 32 0 1 0 0 64h448z m0 160a32 32 0 1 0 0-64h-448a32 32 0 0 0 0 64h448zM448 512a32 32 0 0 0 0-64H288a32 32 0 0 0 0 64H448z m288 256h-128v-179.008l64 32.448 64-32.448V768z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="lianluzhuizong" unicode="&#59840;" d="M224.384 800.384a128 128 0 0 0 123.968-96L784 704a176.064 176.064 0 0 0 10.752-351.744l-10.752-0.32H635.968a128 128 0 0 0-247.936 0H239.168a111.168 111.168 0 0 1-9.6-221.952l9.6-0.448 437.312 0.064a128 128 0 1 0-0.832-64h-436.48a175.168 175.168 0 0 0-10.624 350.016l10.624 0.32 148.928 0.128a128 128 0 0 0 247.808 0l148.096-0.128a112 112 0 0 1 9.152 223.68l-9.152 0.384-435.648 0.192a128 128 0 1 0-123.968 160.128zM800 160a64 64 0 1 1 0-128 64 64 0 0 1 0 128zM512 448a64 64 0 1 1 0-128 64 64 0 0 1 0 128zM224.384 736.384a64 64 0 1 1 0-128 64 64 0 0 1 0 128z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="yinyongzhuanyi" unicode="&#59838;" d="M128 784a16 16 0 0 1-16-16v-416a16 16 0 0 1 16-16h260v64H176V720h320v-208h64V768a16 16 0 0 1-16 16H128zM588 304a8 8 0 0 0 8 8h192a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-192a8 8 0 0 0-8 8v48zM468 416a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-416a16 16 0 0 0-16-16H484a16 16 0 0 0-16 16V416z m64-48v-320h320v320h-320zM240 664a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h192a8 8 0 0 1 8 8V656a8 8 0 0 1-8 8H240zM782 712H648a8 8 0 0 0-8 8V776a8 8 0 0 0 8 8h134c72.9 0 132-59.1 132-132v-132a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8V652c0 33.136-26.864 60-60 60zM378 56H244c-33.136 0-60 26.864-60 60v132a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-132c0-72.9 59.1-132 132-132h134a8 8 0 0 1 8 8v56a8 8 0 0 1-8 8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="guanlixitong-gonggongshujuguanli" unicode="&#59839;" d="M96 792a8 8 0 0 1-8-8v-56a8 8 0 0 1 8-8h768a8 8 0 0 1 8 8V784a8 8 0 0 1-8 8H96zM865.332 632c3.684 0 6.668-3.58 6.668-8v-100h-64V568H152v-108h240v-64H96a8 8 0 0 0-8 8V624a8 8 0 0 0 8 8h769.332zM96 316h296v-64H152v-108h240v-64H96a8 8 0 0 0-8 8v220a8 8 0 0 0 8 8zM751.076 167.432a80 80 0 1 0-113.136 113.132 80 80 0 0 0 113.136-113.132z m-79.196 33.94a32 32 0 1 1 45.256 45.26 32 32 0 0 1-45.256-45.26zM452.336 150.356a252.652 252.652 0 0 1 22.728-52.332 252.276 252.276 0 0 1 33.76-45.884c2.596-2.8 6.816-3.212 10.184-1.412a75.116 75.116 0 0 0 73.068-1.232 75.504 75.504 0 0 0 28.556-29.4 75.836 75.836 0 0 0 9.088-33.516c0.128-3.796 2.576-7.224 6.276-8.084a250.052 250.052 0 0 1 113.036-0.048c3.704 0.86 6.156 4.292 6.284 8.092a75.768 75.768 0 0 0 9.076 33.512 75.476 75.476 0 0 0 28.54 29.416 75.08 75.08 0 0 0 73.08 1.252c3.364-1.796 7.58-1.384 10.176 1.412a251.912 251.912 0 0 1 56.456 98.26c1.1 3.632-0.636 7.46-3.856 9.476a75.46 75.46 0 0 0-24.368 24.652 75.804 75.804 0 0 0 0.032 79.008 75.372 75.372 0 0 0 24.376 24.628c3.22 2.016 4.964 5.852 3.856 9.484a251.848 251.848 0 0 1-22.736 52.336 251.668 251.668 0 0 1-33.76 45.888c-2.596 2.8-6.812 3.212-10.18 1.408a75.124 75.124 0 0 0-73.072 1.232 75.464 75.464 0 0 0-28.552 29.4 75.788 75.788 0 0 0-9.092 33.516c-0.128 3.796-2.576 7.224-6.276 8.084a250.052 250.052 0 0 1-113.036 0.048c-3.704-0.86-6.156-4.292-6.284-8.092a75.76 75.76 0 0 0-9.072-33.512 75.488 75.488 0 0 0-28.544-29.416 75.148 75.148 0 0 0-73.08-1.252c-3.364 1.796-7.58 1.384-10.176-1.412a251.912 251.912 0 0 1-56.456-98.26c-1.1-3.632 0.64-7.46 3.856-9.476a75.424 75.424 0 0 0 24.368-24.652 75.792 75.792 0 0 0-0.028-79.008 75.464 75.464 0 0 0-24.372-24.624c-3.228-2.016-4.968-5.856-3.856-9.492z m257.68-117.524a182.48 182.48 0 0 0-35.04 0.024c-8.956 28.052-27.684 51.72-52.592 66.468-24.888 14.768-54.212 19.588-82.348 13.532a196.476 196.476 0 0 0-17.528 31.144c18.768 21.524 29.756 49.768 29.756 80 0.02 29.52-10.576 58.004-29.756 80a192.776 192.776 0 0 0 17.484 31.144c28.152-6.06 57.492-1.232 82.392 13.556 24.916 14.744 43.652 38.412 52.616 66.468a182.44 182.44 0 0 0 35.036-0.024c8.956-28.052 27.684-51.72 52.592-66.468 24.888-14.768 54.212-19.588 82.348-13.532a196.184 196.184 0 0 0 17.532-31.144c-18.772-21.524-29.756-49.768-29.756-80-0.02-29.52 10.576-58.004 29.756-80a192.172 192.172 0 0 0-17.484-31.144c-28.156 6.06-57.496 1.232-82.396-13.556-24.916-14.744-43.652-38.412-52.612-66.468z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="jingxiangcangku" unicode="&#59837;" d="M544 64v-96a32 32 0 1 0-64 0V64h64zM323.648 717.184c14.144 31.36 61.12 21.248 61.12-13.184v-640a32 32 0 0 0-32-32H64a32 32 0 0 0-29.184 45.184z m378.24-0.064l287.296-640a32 32 0 0 0-29.248-45.12h-287.232a32 32 0 0 0-32 32V704c0 34.496 47.04 44.608 61.184 13.12zM320.768 555.328L113.472 96h207.296V555.328z m383.936-0.704V96h205.888l-205.888 458.624zM544 256v-128h-64v128h64z m0 192v-128h-64V448h64z m0 192v-128h-64V640h64zM512 832a32 32 0 0 0 32-32V704h-64V800A32 32 0 0 0 512 832z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typeyewuyingyongstatenormal" unicode="&#59835;" d="M519.312 627.316a16 16 0 0 1 0-22.628l205.376-205.376a16 16 0 0 1 22.624 0l205.376 205.376a16 16 0 0 1 0 22.628l-205.376 205.372a15.996 15.996 0 0 1-22.624 0l-205.376-205.372zM128 784a16 16 0 0 1-16-16v-320a16 16 0 0 1 16-16h312a16 16 0 0 1 16 16V768a16 16 0 0 1-16 16H128zM128 336a16 16 0 0 1-16-16v-320a16 16 0 0 1 16-16h312a16 16 0 0 1 16 16v320a16 16 0 0 1-16 16H128zM568 320a16 16 0 0 0 16 16h312a16 16 0 0 0 16-16v-320a16 16 0 0 0-16-16h-312a16 16 0 0 0-16 16v320z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-typeyewuguanlistatenormal" unicode="&#59836;" d="M112 768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-324a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768z m144-112v-100h204V656H256zM112 324a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-324a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16v324z m144-112v-100h204v100H256z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="ziyuanguanli" unicode="&#59834;" d="M843.648 318.336l5.312-2.56 15.68-9.6 16.32-10.24a33.28 33.28 0 0 0 12.032-41.6 49.984 49.984 0 0 1-5.44-23.04c0-26.88 19.84-49.28 45.824-51.264a29.44 29.44 0 0 0 26.432-25.984l0.128-5.44v-40.32a32 32 0 0 0-28.352-32.64c-25.28-1.92-45.248-23.68-45.248-51.2 0-6.848 1.28-13.632 4.288-20.544 0.64-0.64 0.64-1.28 1.792-2.56a33.28 33.28 0 0 0-7.488-37.44l-4.544-3.584-32-19.84c-13.824-8.96-30.72-3.84-39.68 9.6a48.448 48.448 0 0 1-40.448 23.04 46.976 46.976 0 0 1-40.32-23.04 29.12 29.12 0 0 0-34.496-12.16l-5.376 2.56-31.872 19.84a33.152 33.152 0 0 0-12.032 41.6 49.92 49.92 0 0 1 5.376 23.04c0 27.648-20.48 50.688-45.824 51.968a31.552 31.552 0 0 0-27.264 26.56L576 108.928v39.04c0 17.28 12.032 30.72 27.712 32 25.92 1.984 45.824 24.384 45.824 51.904 0 8.32-1.792 16-5.44 23.04a33.728 33.728 0 0 0 7.296 38.08l4.8 3.584 15.616 9.6 16.832 9.6c13.888 8.32 30.784 3.84 39.808-9.6a46.976 46.976 0 0 1 80.768 0 29.44 29.44 0 0 0 34.432 12.16zM448 800l128-118.848h320c35.328 0 64-26.624 64-59.456V352h-64V448H128v-420.544h448v-59.456H128c-35.328 0-64 26.624-64 59.456V740.48c0 32.832 28.672 59.456 64 59.456h320z m321.28-557.44c-7.04 0-13.184-0.96-19.264-1.92-26.304-4.672-49.088-18.752-64.896-39.36a106.88 106.88 0 0 1-19.264-35.648 143.04 143.04 0 0 1-6.144-39.424c0-13.44 2.432-26.816 7.04-39.36 4.352-13.12 10.496-25.28 19.264-35.584 15.744-19.776 38.592-34.752 64-39.424 6.144-0.96 13.12-1.92 19.264-1.92 6.464 0.192 12.928 0.832 19.328 1.92a109.056 109.056 0 0 1 64 39.424c7.808 10.24 14.848 22.464 19.2 35.584a115.84 115.84 0 0 1 7.04 39.36c0 14.08-1.728 27.2-6.144 39.424a124.864 124.864 0 0 1-19.2 35.648c-16.768 19.712-39.488 34.688-64.896 39.36a123.328 123.328 0 0 1-19.328 1.92zM436.352 384a6.4 6.4 0 0 0 5.312-9.92l-51.072-76.672a6.4 6.4 0 0 1 5.312-9.92h99.136a6.4 6.4 0 0 0 4.224-11.2L283.52 86.4a6.4 6.4 0 0 0-9.92 7.744l63.104 119.232a6.4 6.4 0 0 1-5.696 9.408H225.536a6.4 6.4 0 0 0-5.312 9.92L318.08 381.12A6.4 6.4 0 0 0 323.392 384h112.96z m-14.848 356.544H128V512h768V621.696H549.504l-128 118.848z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1shengchengshuju" unicode="&#59827;" d="M120 48a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h784a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8H120zM912 120a8 8 0 0 0-8-8h-204a8 8 0 0 0-8 8V824a8 8 0 0 0 8 8h204a8 8 0 0 0 8-8v-704zM848 768h-92v-592h92V768zM612 112a8 8 0 0 1 8 8V504a8 8 0 0 1-8 8h-204a8 8 0 0 1-8-8v-384a8 8 0 0 1 8-8h204z m-56 64h-92v272h92v-272zM324 112a8 8 0 0 1 8 8V668a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-548a8 8 0 0 1 8-8h204z m-56 64H176V612h92v-436z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1renwuguanli" unicode="&#59828;" d="M734.284 784c-13 35.036-46.728 60-86.284 60H376c-39.56 0-73.28-24.964-86.28-60H128a16 16 0 0 1-16-16v-768a16 16 0 0 1 16-16h352v64H176V720h113.72C302.72 684.964 336.44 660 376 660h272c39.556 0 73.284 24.964 86.284 60H848v-292h64V768a16 16 0 0 1-16 16h-161.716zM380 784h264a32 32 0 0 0 0-64H380a32 32 0 1 0 0 64zM384 456a8 8 0 0 1 8 8V552a8 8 0 0 1-8 8H296a8 8 0 0 1-8-8v-88a8 8 0 0 1 8-8h88zM736 484a8 8 0 0 0-8-8h-256a8 8 0 0 0-8 8V532a8 8 0 0 0 8 8h256a8 8 0 0 0 8-8v-48zM384 220a8 8 0 0 1 8 8v88a8 8 0 0 1-8 8H296a8 8 0 0 1-8-8v-88a8 8 0 0 1 8-8h88zM736 120a72 72 0 1 1 0.004 143.992A72 72 0 0 1 736 120zM955.992 59.924a8 8 0 0 1 4.008 6.932v248.752a8 8 0 0 1-4.008 6.932l-216 124.392a7.996 7.996 0 0 1-7.984 0l-216-124.392a8 8 0 0 1-4.008-6.932v-248.752a8 8 0 0 1 4.008-6.932l216-124.392a7.996 7.996 0 0 1 7.984 0l216 124.392zM736 375.376l160-92.14v-184.008l-160-92.14-160 92.14v184.008l160 92.14z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1yewuyingyongguanli" unicode="&#59829;" d="M904 672h-200V824a8 8 0 0 1-8 8H328a8 8 0 0 1-8-8v-152H120a8 8 0 0 1-8-8v-672a8 8 0 0 1 8-8h352v64H176V608h672v-160h64V664a8 8 0 0 1-8 8z m-264 96v-96H384V768h256zM786.912 141.088a72 72 0 1 0-101.82 101.816 72 72 0 0 0 101.82-101.816zM960 66.856a8 8 0 0 0-4.008-6.932l-216-124.392a7.996 7.996 0 0 0-7.984 0l-216 124.392a8 8 0 0 0-4.008 6.932v248.752a8 8 0 0 0 4.008 6.932l216 124.392a7.996 7.996 0 0 0 7.984 0l216-124.392a8 8 0 0 0 4.008-6.932v-248.752z m-64 216.38l-160 92.14-160-92.14v-184.008l160-92.14 160 92.14v184.008zM176 256h296v-64H176v64zM176 464h400v-64H176v64z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1fentanguize" unicode="&#59830;" d="M528 768a16 16 0 0 1-16 16H104a16 16 0 0 1-16-16v-208a16 16 0 0 1 16-16h176v-468a16 16 0 0 1 16-16h200v-60a16 16 0 0 1 16-16h408a16 16 0 0 1 16 16v208a16 16 0 0 1-16 16H512a16 16 0 0 1-16-16v-92H336v240h160v-76a16 16 0 0 1 16-16h408a16 16 0 0 1 16 16v208a16 16 0 0 1-16 16H512a16 16 0 0 1-16-16v-76H336V544h176a16 16 0 0 1 16 16V768z m-64-160H152V720h312v-112z m408-280h-312v112h312v-112z m-312-280v112h312v-112h-312zM280 544h56v-132h160v-56H336v-240h160v-56H288a8 8 0 0 0-8 8V544z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1biaodanguanli" unicode="&#59831;" d="M128 784a16 16 0 0 1-16-16v-768.004a16 16 0 0 1 16-16h352v64H176v672h500v-164a8 8 0 0 1 8-8h164V428h64V577.368c0 4.244-1.684 8.316-4.688 11.316l-190.624 190.628A16.008 16.008 0 0 1 705.372 784H128zM256 295.2c0-3.976 1.252-7.2 2.8-7.2h210.4c1.548 0 2.8 3.224 2.8 7.2v57.6c0 3.976-1.252 7.2-2.8 7.2H258.8c-1.548 0-2.8-3.224-2.8-7.2v-57.6zM260.3 488c-2.376 0-4.3 3.224-4.3 7.2V552.8c0 3.976 1.924 7.2 4.3 7.2h335.4c2.376 0 4.3-3.224 4.3-7.2v-57.6c0-3.976-1.924-7.2-4.3-7.2h-335.4zM736 120a72 72 0 1 1 0.004 143.992A72 72 0 0 1 736 120zM955.992 59.924a8 8 0 0 1 4.008 6.932v248.752a8 8 0 0 1-4.008 6.932l-216 124.392a7.996 7.996 0 0 1-7.984 0l-216-124.392a8 8 0 0 1-4.008-6.932v-248.752a8 8 0 0 1 4.008-6.932l216-124.392a7.996 7.996 0 0 1 7.984 0l216 124.392zM736 375.376l160-92.14v-184.008l-160-92.14-160 92.14v184.008l160 92.14z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1liuchengguanli" unicode="&#59832;" d="M736 120a72 72 0 1 1 0.004 143.992A72 72 0 0 1 736 120zM955.992 59.924a8 8 0 0 1 4.008 6.932v248.752a8 8 0 0 1-4.008 6.932l-216 124.392a7.996 7.996 0 0 1-7.984 0l-216-124.392a8 8 0 0 1-4.008-6.932v-248.752a8 8 0 0 1 4.008-6.932l216-124.392a7.996 7.996 0 0 1 7.984 0l216 124.392zM736 375.376l160-92.14v-184.008l-160-92.14-160 92.14v184.008l160 92.14zM90 530.812c0 98.96 80.224 179.188 179.188 179.188H730v-72H269.188c-59.2 0-107.188-47.988-107.188-107.188 0-59.196 47.988-107.188 107.188-107.188h312.832l-123.24-72H269.188c-98.96 0-179.188 80.224-179.188 179.188zM456 130H278v-72H456v72zM320 216a8 8 0 0 1-8 8H72a8 8 0 0 1-8-8v-240a8 8 0 0 1 8-8h240a8 8 0 0 1 8 8v240z m-192-56h128v-128H128v128zM960 792a8 8 0 0 1-8 8h-240a8 8 0 0 1-8-8v-240a8 8 0 0 1 8-8h240a8 8 0 0 1 8 8V792z m-192-56h128v-128h-128V736z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1zhengshouguize" unicode="&#59833;" d="M640 552a8 8 0 0 0 8 8h136a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-136a8 8 0 0 0-8 8V552zM640 368a8 8 0 0 0 8 8h136a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-136a8 8 0 0 0-8 8v48zM232 172a8 8 0 0 0 8 8h544a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H240a8 8 0 0 0-8 8v48zM112 768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768z m72-56v-656h656V712H184zM595.7 420.72a8 8 0 0 0 0-11.316l-175.06-175.06a8 8 0 0 0-11.316 0l-33.94 33.94a7.84 7.84 0 0 0-0.976 1.184l-140.064 140.064a8 8 0 0 0 0 11.312l33.94 33.944a8 8 0 0 0 11.316 0l102.44-102.448V644a8 8 0 0 0 8 8h48.004a8 8 0 0 0 8-8v-293.744l104.4 104.404a8 8 0 0 0 11.316 0l33.94-33.94z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1weiduguanli" unicode="&#59822;" d="M896 784a16 16 0 0 0 16-16v-208a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768a16 16 0 0 0 16 16h768zM176 720v-112h672V720H176zM128 224h344v-64H176v-112h296v-64H128a16 16 0 0 0-16 16v208a16 16 0 0 0 16 16zM786.912 141.088a72 72 0 1 0-101.82 101.816 72 72 0 0 0 101.82-101.816zM960 66.856a8 8 0 0 0-4.008-6.932l-216-124.392a7.996 7.996 0 0 0-7.984 0l-216 124.392a8 8 0 0 0-4.008 6.932v248.752a8 8 0 0 0 4.008 6.932l216 124.392a7.996 7.996 0 0 0 7.984 0l216-124.392a8 8 0 0 0 4.008-6.932v-248.752z m-64 216.38l-160 92.14-160-92.14v-184.008l160-92.14 160 92.14v184.008zM472 264H128a16 16 0 0 0-16 16v208a16 16 0 0 0 16 16h444v-64H176v-112h296v-64z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1shouyeguanli" unicode="&#59823;" d="M736 120a72 72 0 1 1 0.004 143.992A72 72 0 0 1 736 120zM955.992 59.924a8 8 0 0 1 4.008 6.932v248.752a8 8 0 0 1-4.008 6.932l-216 124.392a7.996 7.996 0 0 1-7.984 0l-216-124.392a8 8 0 0 1-4.008-6.932v-248.752a8 8 0 0 1 4.008-6.932l216-124.392a7.996 7.996 0 0 1 7.984 0l216 124.392zM736 375.376l160-92.14v-184.008l-160-92.14-160 92.14v184.008l160 92.14zM223.276 506.32l278.856 239.172 388.244-333.044a8 8 0 0 1 10.864 0.416l33.96 33.96a8 8 0 0 1-0.4 11.684L512.652 826.824a16 16 0 0 1-21.036 0L69.84 458.88a8 8 0 0 1-0.4-11.684l33.96-33.96a8 8 0 0 1 10.868-0.416l45.008 38.6v-451.776a16 16 0 0 1 16-16H480v64H223.276V506.316z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1jiaoyiguize" unicode="&#59824;" d="M568 396h-128v66.56h128a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8h-107.44l85.956 85.92a8 8 0 0 1-0.1 11.416l-35.92 34.648a8 8 0 0 1-11.212-0.104L404 563.12 308.856 658.34a8 8 0 0 1-11.316 0.008l-35.32-35.288a8 8 0 0 1 0-11.32L347.44 526.56H240a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h128V396H240a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h128v-93.44a8 8 0 0 1 8-8h56a8 8 0 0 1 8 8V332h128a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8zM628 552a8 8 0 0 0 8 8h140a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-140a8 8 0 0 0-8 8V552zM628 388a8 8 0 0 0 8 8h140a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8h-140a8 8 0 0 0-8 8v48zM240 180a8 8 0 0 0 8 8h528a8 8 0 0 0 8-8v-48a8 8 0 0 0-8-8H248a8 8 0 0 0-8 8v48zM112 768a16 16 0 0 0 16 16h768a16 16 0 0 0 16-16v-768a16 16 0 0 0-16-16H128a16 16 0 0 0-16 16V768z m64-48v-672h672V720H176z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-Property1fenxibaobiaoguanli" unicode="&#59825;" d="M786.912 141.088a72 72 0 1 0-101.82 101.816 72 72 0 0 0 101.82-101.816zM960 66.856a8 8 0 0 0-4.008-6.932l-216-124.392a7.996 7.996 0 0 0-7.984 0l-216 124.392a8 8 0 0 0-4.008 6.932v248.752a8 8 0 0 0 4.008 6.932l216 124.392a7.996 7.996 0 0 0 7.984 0l216-124.392a8 8 0 0 0 4.008-6.932v-248.752z m-64 216.38l-160 92.14-160-92.14v-184.008l160-92.14 160 92.14v184.008zM448 412a8 8 0 0 1-8 8H120a8 8 0 0 1-8-8v-420a8 8 0 0 1 8-8h320a8 8 0 0 1 8 8V412z m-272-56h208v-308H176v308zM904 784a8 8 0 0 0 8-8v-288a8 8 0 0 0-8-8H456a8 8 0 0 0-8 8V776a8 8 0 0 0 8 8h448z m-56-64h-336v-176h336V720zM376 784a8 8 0 0 0 8-8v-284a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V776a8 8 0 0 0 8 8h256zM320 720H176v-176h144V720z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tianjiaxinzuzhi" unicode="&#59826;" d="M513.688 831.156a8 8 0 0 1-7.156 0L64.424 610.096c-5.9-2.948-5.9-11.36 0-14.308l442.108-221.056a8.016 8.016 0 0 1 7.156 0L955.8 595.788c5.896 2.948 5.896 11.36 0 14.308L513.688 831.16z m-3.576-378.492l-300.56 150.28 300.56 150.28 300.56-150.28-300.56-150.28zM89.616 440.976a8 8 0 0 1-11.504-7.192v-59.216c0-3.048 1.732-5.832 4.468-7.176l427.532-210.448 1.888 0.928v79.184l-1.888-0.92-420.496 204.84zM512 18.208v-80.32l-1.888-0.944-427.576 213.516a8.004 8.004 0 0 0-4.424 7.16v57.724c0 5.912 6.196 9.78 11.508 7.188l420.492-205.248 1.888 0.924zM724 328a8 8 0 0 0 8 8h56a8 8 0 0 0 8-8v-156h156a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-156v-156a8 8 0 0 0-8-8h-56a8 8 0 0 0-8 8v156h-156a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8h156v156z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="chaoshijiance" unicode="&#59821;" d="M425.024 617.408a32 32 0 0 0 58.56 3.264l2.112-5.504 110.4-377.408 48.64 125.76a32 32 0 0 0 24.32 19.968L674.56 384h157.76a32 32 0 0 0 5.76-63.488l-5.76-0.512h-135.808l-74.688-193.472a32 32 0 0 0-58.432-3.008l-2.112 5.504L451.2 504.96l-61.76-164.928a32 32 0 0 0-24.32-20.288l-5.632-0.512H192a32 32 0 0 0-5.76 63.488L192 383.232l145.344 0.064 87.68 234.112zM320 800a32 32 0 0 0-32-32H128v-160a32 32 0 0 0-64 0V768a64 64 0 0 0 64 64h160a32 32 0 0 0 32-32z m0-832a32 32 0 0 1-32 32H128v160a32 32 0 1 1-64 0V0a64 64 0 0 1 64-64h160a32 32 0 0 1 32 32z m384 832a32 32 0 0 1 32-32H896v-160a32 32 0 1 1 64 0V768a64 64 0 0 1-64 64h-160a32 32 0 0 1-32-32z m0-832a32 32 0 0 0 32 32H896v160a32 32 0 1 0 64 0V0a64 64 0 0 0-64-64h-160a32 32 0 0 0-32 32z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="a-paixumoren" unicode="&#59814;" d="M543.707573 739.497992a8.094862 8.094862 0 0 1-8.094862 8.094862H120.07513a8.094862 8.094862 0 0 1-8.094861-8.094862V669.343874a8.094862 8.094862 0 0 1 8.094861-8.094862h415.537581a8.094862 8.094862 0 0 1 8.094862 8.094862V739.497992z m215.861629-133.565217v-164.59687a8.094862 8.094862 0 0 1 8.094861-8.094862H837.818182a8.094862 8.094862 0 0 1 8.094861 8.094862V605.932775h111.409582c6.998008 0 10.69736 8.281043 6.030671 13.494134l-154.579478 172.695779a8.094862 8.094862 0 0 1-12.065391 0l-154.579478-172.695779c-4.666688-5.213091-0.967336-13.494134 6.030672-13.494134h111.409581z m0-431.727305h-111.409581c-6.998008 0-10.69736-8.276996-6.030672-13.494134l154.579478-172.691731a8.094862 8.094862 0 0 1 12.065391 0l154.579478 172.691731c4.666688 5.217138 0.967336 13.494134-6.030671 13.494134H845.913043v164.59687a8.094862 8.094862 0 0 1-8.094861 8.094862h-70.154119a8.094862 8.094862 0 0 1-8.094861-8.094862v-164.59687zM543.707573 110.798419a8.094862 8.094862 0 0 1-8.094862 8.094862H120.07513a8.094862 8.094862 0 0 1-8.094861-8.094862v-70.158166a8.094862 8.094862 0 0 1 8.094861-8.094862h415.537581a8.094862 8.094862 0 0 1 8.094862 8.094862V110.798419z m86.343842 314.347763a8.094862 8.094862 0 0 1-8.094862 8.094861h-501.881423a8.094862 8.094862 0 0 1-8.094861-8.094861v-70.154119a8.094862 8.094862 0 0 1 8.094861-8.094861h501.881423a8.094862 8.094862 0 0 1 8.094862 8.094861v70.154119z"  horiz-adv-x="1036" />
@@ -22,7 +78,7 @@
       
       <glyph glyph-name="a-Property1fenzuhuizongduoseoffhuihuaoff" unicode="&#59816;" d="M804 720a16 16 0 0 1-16 16H236a16 16 0 0 1-16-16v-208a16 16 0 0 1 16-16h252v-92H256a16 16 0 0 1-16-16v-124H88a16 16 0 0 1-16-16v-200a16 16 0 0 1 16-16h348a16 16 0 0 1 16 16v200a16 16 0 0 1-16 16H288v92h448v-92h-148a16 16 0 0 1-16-16v-200a16 16 0 0 1 16-16h348a16 16 0 0 1 16 16v200a16 16 0 0 1-16 16h-152v124a16 16 0 0 1-16 16h-232v92h252a16 16 0 0 1 16 16V720zM268 688h488v-144H268V688zM120 216h284v-136H120v136z m500 0h284v-136h-284v136z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="a-Property1guolvduoseoffhuihuaoff" unicode="&#59817;" d="M202.24 736C178.912 736 160 717.088 160 693.76v-36.408c0-3.736 1.48-7.316 4.124-9.956l252.836-252.836v-320.32c0-23.328 18.912-42.24 42.24-42.24h98.56c23.328 0 42.24 18.912 42.24 42.24v313.28l259.876 259.876A14.08 14.08 0 0 1 864 657.352V693.76c0 23.328-18.912 42.24-42.24 42.24H202.24z m-2.216-63.016c-0.16 17.924-0.168 19.016 21.048 19.016h581.48c12.492 0 17.856 0 20.048-2.64 2.416-2.908 0.972-9.028 0.972-21.9l-266.22-259.416v-308.492c0-1.952 0.016-3.796 0.028-5.544 0.16-19.028 0.22-26.008-21.048-26.008h-56.044c-21.268 0-21.208 6.98-21.048 26.008 0.016 1.748 0.028 3.592 0.028 5.544v308.492L200.056 667.46c0 2-0.016 3.84-0.032 5.524z"  horiz-adv-x="1024" />
+      <glyph glyph-name="a-Property1guolvduoseoffhuihuaoff" unicode="&#59817;" d="M904 784a8 8 0 0 0 8-8v-56a8 8 0 0 0-8-8h-72l-187.048-348.448a8.012 8.012 0 0 1-0.952-3.784v-301.568c0-3.648-2.472-6.836-6.004-7.748l-248-63.876A8 8 0 0 0 380-5.67999999999995v365.448c0 1.32-0.328 2.62-0.952 3.784L192 712H120a8 8 0 0 0-8 8V776a8 8 0 0 0 8 8h784zM281.956 712L452 388.712V82l120 30v276.712L742.044 712H281.956z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="a-Property1zuoyouhebingduoseoffhuihuaoff" unicode="&#59818;" d="M648 32c176.732 0 320 157.596 320 352s-143.268 352-320 352-320-157.596-320-352 143.268-352 320-352z m-2 48c-151.328 0-274 136.104-274 304s122.672 304 274 304S920 551.896 920 384s-122.672-304-274-304zM375.936 32c176.732 0 320 157.596 320 352s-143.268 352-320 352c-176.728 0-320-157.596-320-352s143.272-352 320-352z m2.064 48C226.676 80 104 216.104 104 384s122.676 304 274 304c151.328 0 274-136.104 274-304s-122.672-304-274-304zM464.108 672.16C381.756 608.464 327.936 503.144 327.936 384c0-119.148 53.82-224.472 136.172-288.16 0 0 13.432-10.436 21.892-15.84 10.216-6.532 25.936-14.72 25.936-14.72s16.724 8.752 26.064 14.72 21.768 15.84 21.768 15.84c82.352 63.688 136.168 169.012 136.168 288.16 0 119.148-53.816 224.468-136.168 288.16 0 0-12.428 9.872-21.768 15.84s-26.064 14.72-26.064 14.72-16.596-8.752-25.936-14.72-21.892-15.84-21.892-15.84z m47.828-552.752c-83.596 52.24-140 151.16-140 264.592 0 113.428 56.404 212.348 140 264.592 83.6-52.24 140-151.16 140-264.592 0-113.432-56.4-212.352-140-264.592z"  horiz-adv-x="1024" />
       
@@ -304,9 +360,9 @@
       
       <glyph glyph-name="a-Property1xiezuogeiwode" unicode="&#59730;" d="M744 472c88.364 0 160 71.636 160 160s-71.636 160-160 160-160-71.636-160-160c0-17.2 2.712-33.76 7.732-49.28l-156.012-90.328C402.86 535.888 350.712 564 292 564c-99.412 0-180-80.588-180-180s80.588-180 180-180c53.688 0 101.888 23.508 134.868 60.788l164.072-82.036A159.968 159.968 0 0 1 584 136c0-88.364 71.636-160 160-160s160 71.636 160 160-71.636 160-160 160c-49.132 0-93.092-22.148-122.444-57l-161.384 80.692A179.6 179.6 0 0 1 472 384c0 17.776-2.576 34.952-7.38 51.172l158.636 91.84C652.592 493.312 695.808 472 744 472z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="tianjiajisuanzhibiao" unicode="&#59729;" d="M465.78 708c-37.68 0-66.752-21.092-76.896-57.384L364.668 568H560a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H344.536L203.648-10.176000000000045A8 8 0 0 0 195.948-16h-69.32a8 8 0 0 0-7.684 10.216L261.2 488H112a8 8 0 0 0-8 8V560a8 8 0 0 0 8 8h169.56l29.984 102.004c18.84 67.396 84.256 118 154.236 118H560a8 8 0 0 0 8-8V716a8 8 0 0 0-8-8h-94.22zM652 404a8 8 0 0 1-8-8v-160h-160a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h160v-164a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v164h172a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-172v160a8 8 0 0 1-8 8h-64z"  horiz-adv-x="1024" />
+      <glyph glyph-name="tianjiajisuanzhibiao" unicode="&#59729;" d="M396.88 650.616C407.032 686.908 436.104 708 473.784 708H568a8 8 0 0 1 8 8V780a8 8 0 0 1-8 8h-94.22c-69.98 0-135.396-50.6-154.24-117.996l-29.976-102H120a8 8 0 0 1-8-8v-64A8 8 0 0 1 120 488h149.2L126.944-5.783999999999992A8 8 0 0 1 134.628-16h69.32a8 8 0 0 1 7.7 5.824L352.536 488H568a8 8 0 0 1 8 8V560a8 8 0 0 1-8 8H372.668l24.216 82.616zM823.188 339.41200000000003L720 192l103.188-147.412c3.712-5.304-0.08-12.588-6.552-12.588h-76.472a7.996 7.996 0 0 0-6.552 3.412L672 123.44000000000005l-61.612-88.028a7.996 7.996 0 0 0-6.552-3.412h-76.472c-6.472 0-10.264 7.284-6.552 12.588L624 192l-103.188 147.412c-3.712 5.304 0.08 12.588 6.552 12.588h76.472c2.608 0 5.056-1.272 6.552-3.412L672 260.55999999999995l61.612 88.028a7.996 7.996 0 0 0 6.552 3.412h76.472c6.472 0 10.264-7.284 6.552-12.588z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="tianjiacanshu" unicode="&#59728;" d="M480 516a8 8 0 0 1 8-8h408a8 8 0 0 1 8 8V780a8 8 0 0 1-8 8H488a8 8 0 0 1-8-8v-264z m80 192h264v-120h-264V708zM128 788a8 8 0 0 1-8-8v-480a8 8 0 0 1 8-8h264a8 8 0 0 1 8 8V780a8 8 0 0 1-8 8H128z m192-80v-336H200V708h120zM120 36a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H128a8 8 0 0 0-8 8v64zM655.16 384a8 8 0 0 1-8-8v-160.84H488a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h159.16V-28a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v163.16H896a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8h-168.84V376a8 8 0 0 1-8 8h-64zM120 204a8 8 0 0 0 8 8h264a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H128a8 8 0 0 0-8 8v64z"  horiz-adv-x="1024" />
+      <glyph glyph-name="tianjiacanshu" unicode="&#59728;" d="M112 624h357.628C486.96 684.068 542.352 728 608 728c65.648 0 121.04-43.932 138.372-104H896a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8h-149.628c-17.332-60.068-72.724-104-138.372-104-65.648 0-121.04 43.932-138.372 104H112a8 8 0 0 0-8 8V616a8 8 0 0 0 8 8z m496-104c35.348 0 64 28.652 64 64s-28.652 64-64 64-64-28.652-64-64 28.652-64 64-64zM896 224h-357.628c-17.332 60.068-72.724 104-138.372 104-65.648 0-121.04-43.932-138.372-104H112a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h149.628c17.332-60.068 72.72-104 138.372-104 65.648 0 121.04 43.932 138.372 104H896a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8z m-496-104c-35.348 0-64 28.652-64 64s28.652 64 64 64 64-28.652 64-64-28.652-64-64-64z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="yujingshezhi" unicode="&#59566;" d="M191.72 340v-276H119.692a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8H368v80H271.792v276a239.896 239.896 0 0 0 70.356 169.704A240.312 240.312 0 0 0 512 580a240.348 240.348 0 0 0 149.316-52h109.864A320.42 320.42 0 0 1 512 660a320.416 320.416 0 0 1-226.472-93.724A319.86 319.86 0 0 1 191.724 340z m288.248 492a8 8 0 0 1-8-8v-116a8 8 0 0 1 8-8h64.068a8 8 0 0 1 8 8V824a8 8 0 0 1-8 8h-64.068z m361.076-117.972a8 8 0 0 1-11.308 0l-85.592-85.528a8 8 0 0 1 0-11.32l45.328-45.252a8 8 0 0 1 11.308 0l85.56 85.532a8 8 0 0 1-0.004 11.32l-45.292 45.248zM135.064 671.108a8 8 0 0 1 0.008-11.328L223.296 571.88a8 8 0 0 1 11.304 0.012l45.264 45.32a8 8 0 0 1-0.016 11.32l-88.192 87.84a8 8 0 0 1-11.3-0.012L135.064 671.108zM654.016 140.016c15.004-15.376 35.352-24.016 56.568-24.016 21.22 0 41.568 8.64 56.572 24.016 15 15.38 23.428 36.236 23.428 57.984 0 21.748-8.428 42.604-23.428 57.984-15.004 15.376-35.352 24.016-56.572 24.016-21.216 0-41.564-8.64-56.568-24.016-15-15.38-23.432-36.236-23.432-57.984 0-21.748 8.432-42.604 23.432-57.984z m79.196 33.944c-6-6.376-14.14-9.96-22.628-9.96-8.484 0-16.624 3.584-22.624 9.96-6.004 6.376-9.376 15.024-9.376 24.04s3.372 17.664 9.376 24.04c6 6.376 14.14 9.96 22.624 9.96 8.488 0 16.628-3.584 22.628-9.96 6.004-6.376 9.372-15.024 9.372-24.04s-3.368-17.664-9.372-24.04zM484.04 68.024a266.04 266.04 0 0 0-23.712 55.152c-1.092 3.624 0.636 7.448 3.848 9.452a78.8 78.8 0 0 1 25.58 25.96 79.904 79.904 0 0 1 11.552 41.384 79.824 79.824 0 0 1-11.524 41.388 78.688 78.688 0 0 1-25.576 25.988c-3.2 2.004-4.928 5.816-3.844 9.436a264.432 264.432 0 0 0 58.912 103.44c2.604 2.824 6.848 3.24 10.224 1.408a77.576 77.576 0 0 1 34.916-9.372c14.436-0.384 28.692 3.28 41.2 10.584a78.8 78.8 0 0 1 29.656 30.816 79.856 79.856 0 0 1 9.436 35.436c0.112 3.792 2.556 7.22 6.252 8.084a257.664 257.664 0 0 0 117.976-0.048c3.688-0.868 6.132-4.292 6.244-8.08 0.36-12.368 3.588-24.512 9.452-35.44a78.76 78.76 0 0 1 29.668-30.8 77.544 77.544 0 0 1 41.204-10.564 77.536 77.536 0 0 1 34.904 9.38c3.376 1.832 7.624 1.416 10.228-1.408a263.72 263.72 0 0 0 35.236-48.244 264.896 264.896 0 0 0 23.716-55.156c1.092-3.624-0.636-7.44-3.844-9.448a78.712 78.712 0 0 1-25.588-25.96 79.944 79.944 0 0 1-11.556-41.384 79.864 79.864 0 0 1 11.528-41.388 78.688 78.688 0 0 1 25.576-25.988c3.2-2.004 4.928-5.816 3.844-9.436a264.432 264.432 0 0 0-58.912-103.44c-2.604-2.824-6.848-3.24-10.224-1.408a77.576 77.576 0 0 1-34.916 9.372 77.576 77.576 0 0 1-41.2-10.584 78.8 78.8 0 0 1-29.656-30.816 79.912 79.912 0 0 1-9.44-35.436c-0.108-3.792-2.552-7.22-6.248-8.084a257.664 257.664 0 0 0-117.976 0.048c-3.688 0.868-6.132 4.292-6.244 8.08a79.944 79.944 0 0 1-9.452 35.44 78.76 78.76 0 0 1-29.668 30.8 77.544 77.544 0 0 1-41.204 10.564 77.52 77.52 0 0 1-34.9-9.38c-3.38-1.832-7.632-1.412-10.236 1.416a264.42 264.42 0 0 0-35.232 48.236z m206.192-67.132c12.212-1.172 24.472-1.2 36.684-0.024 9.384 29.224 29.004 53.876 55.092 69.236a120.012 120.012 0 0 0 86.272 14.12 199.4 199.4 0 0 1 18.304 32.444c-20.08 22.908-31.176 52.584-31.152 83.332 0 31.492 11.5 60.912 31.152 83.332a204.168 204.168 0 0 1-18.352 32.444 120 120 0 0 0-86.224 14.096c-26.08 15.36-45.688 40.016-55.068 69.236a191.484 191.484 0 0 1-36.684 0.024c-9.384-29.224-29.004-53.876-55.092-69.236a120.012 120.012 0 0 0-86.272-14.12 201.092 201.092 0 0 1-18.308-32.444c20.084-22.908 31.18-52.584 31.156-83.332 0-31.492-11.5-60.912-31.156-83.332a204.5 204.5 0 0 1 18.356-32.444 120 120 0 0 0 86.224-14.096c26.08-15.36 45.688-40.016 55.068-69.236z"  horiz-adv-x="1024" />
       
@@ -1896,7 +1952,7 @@
       
       <glyph glyph-name="normal119" unicode="&#58933;" d="M616-16a8 8 0 0 1 8 8V776a8 8 0 0 1-8 8h-204a8 8 0 0 1-8-8v-784a8 8 0 0 1 8-8h204z m-56 64h-92V720h92v-672zM332-8a8 8 0 0 0-8-8H120a8 8 0 0 0-8 8V568a8 8 0 0 0 8 8h204a8 8 0 0 0 8-8v-576zM268 512H176v-464h92V512zM920-8a8 8 0 0 0-8-8h-204a8 8 0 0 0-8 8V404a8 8 0 0 0 8 8h204a8 8 0 0 0 8-8v-412z m-64 356h-92v-300h92v300z"  horiz-adv-x="1024" />
       
-      <glyph glyph-name="lv" unicode="&#59342;" d="M703.872 358.976l-55.872-55.104a370.176 370.176 0 0 1-148.992 31.04c-202.752 0-379.52-162.112-379.52-362.112a37.12 37.12 0 0 0-37.376-36.8 37.12 37.12 0 0 0-37.312 36.8c0 191.744 133.504 354.56 311.168 412.8a244.224 244.224 0 0 0-105.856 200.96C250.112 722.048 361.6 832 499.072 832c137.408 0 248.832-109.888 248.832-245.504 0-83.2-41.984-156.8-106.24-201.152 21.504-7.232 42.304-16.064 62.208-26.368z m-204.8 55.68c96.192 0 174.144 76.992 174.144 171.84 0 94.912-77.952 171.84-174.208 171.84-96.192 0-174.208-76.928-174.208-171.84 0-94.848 78.016-171.84 174.208-171.84z m94.592-400.192A38.4 38.4 0 0 0 620.8 80h317.056a38.4 38.4 0 1 0 0-76.8h-224.32l30.4-30.464a38.4 38.4 0 0 0-54.272-54.272l-96 96z m374.272 204.672A38.4 38.4 0 0 0 940.8 153.6H623.744a38.4 38.4 0 0 0 0 76.8h224.32l-30.4 30.464a38.4 38.4 0 0 0 54.272 54.272l96-96z"  horiz-adv-x="1024" />
+      <glyph glyph-name="lv" unicode="&#59342;" d="M736 604c0-121.504-98.496-220-220-220-121.5 0-220 98.496-220 220s98.5 220 220 220c121.504 0 220-98.496 220-220z m-72 0c0 81.736-66.26 148-148 148-81.736 0-148-66.264-148-148s66.264-148 148-148c81.74 0 148 66.264 148 148z m240-400a31.996 31.996 0 0 1 22.628 54.628l-126.344 126.344a8 8 0 0 1-11.312 0l-33.944-33.944a8 8 0 0 1 0-11.312L826.744 268H544a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h360z m-344-64a32 32 0 0 1-22.624-54.628l126.34-126.344a8 8 0 0 1 11.316 0l33.94 33.944a8 8 0 0 1 0 11.312L637.256 76H920a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8h-360z m-108.016 103.88c4.416 0.132 8.016 3.7 8.016 8.12v56a7.88 7.88 0 0 1-8.024 7.908c-186.672-4.308-335.78-158.504-339.888-347.884A7.888 7.888 0 0 1 120-40h56c4.42 0 7.992 3.604 8.108 8.02 4.06 151.184 122.516 271.576 267.876 275.86z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="xiaoxi" unicode="&#59211;" d="M512-64c247.424 0 448 200.576 448 448S759.424 832 512 832 64 631.424 64 384s200.576-448 448-448z m48 184a16 16 0 0 0-16-16h-64a16 16 0 0 0-16 16v288a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-288z m16 480c0-35.348-28.652-64-64-64s-64 28.652-64 64 28.652 64 64 64 64-28.652 64-64z"  horiz-adv-x="1024" />
       

package.json

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

src/case/calendar/calendar.js

@@ -156,13 +156,21 @@ BI.Calendar = BI.inherit(BI.Widget, {
         return BI.map(items, function (i, item) {
             return BI.map(item, function (j, td) {
                 var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
+                var year = o.year;
+                if (month > 12) {
+                    month = 1;
+                    year++;
+                } else if (month < 1) {
+                    month = 12;
+                    year--;
+                }
                 return BI.extend(td, {
                     type: "bi.calendar_date_item",
                     once: false,
                     forceSelected: true,
-                    value: o.year + "-" + month + "-" + td.text,
+                    value: year + "-" + month + "-" + td.text,
                     disabled: td.disabled,
-                    cls: td.lastMonth || td.nextMonth ? "not-current-month-day": "",
+                    cls: td.lastMonth || td.nextMonth ? "not-current-month-day" : "",
                     lgap: 2,
                     rgap: 2,
                     tgap: 4,

src/case/linearsegment/linear.segment.js

@@ -3,9 +3,6 @@ BI.LinearSegment = BI.inherit(BI.Widget, {
     props: {
         baseCls: "bi-linear-segment",
         items: [],
-        layouts: [{
-            type: "bi.center"
-        }],
         height: 30
     },
 
@@ -13,11 +10,14 @@ BI.LinearSegment = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.button_group",
-            items: BI.createItems(o.items, {
+            items: [BI.createItems(o.items, {
                 type: "bi.linear_segment_button",
                 height: o.height
-            }),
+            })],
-            layouts: o.layouts,
+            layouts: [{
+                type: "bi.table",
+                columnSize: BI.makeArrayByArray(o.items, "fill"),
+            }],
             value: o.value,
             listeners: [{
                 eventName: "__EVENT_CHANGE__",

src/core/platform/web/function.js

@@ -125,5 +125,17 @@ BI._.extend(BI, {
             }
         }
         return false;
+    },
+
+    getSafariVersion: function () {
+        if (!_global.navigator) {
+            return 0;
+        }
+        var agent = navigator.userAgent.toLowerCase();
+        var version = agent.match(/version\/([\d.]+)/);
+        if (version && version[1]) {
+            return version[1] * 1;
+        }
+        return 0;
     }
 });

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

@@ -17,4 +17,12 @@
     background-color: inherit;
     .opacity(1);
   }
+}
+
+.bi-theme-dark {
+  .bi-display-tree {
+    .ztree * {
+      color: @color-bi-text-display-tree-theme-dark;
+    }
+  }
 }

src/less/base/tree/ztree.less

@@ -90,6 +90,12 @@
     }
   }
 
+  .ztree li span.button.chk {
+    &.bi-checkbox {
+      border-color: @color-bi-border-dark-line-theme-dark;
+    }
+  }
+
   &.bi-half-button {
     border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark;
   }

src/less/lib/colors.less

@@ -13,6 +13,7 @@
 @color-bi-text-black-theme-dark: @font-color-normal-theme-dark;
 //灰色字体颜色
 @color-bi-text-gray: @font-color-gray;
+@color-bi-text-gray-theme-dark: @font-color-gray-theme-dark;
 //浅灰色字体
 @color-bi-text-light-gray: @font-color-light-gray;
 //深色主题浅灰色字体

src/less/lib/constant.less

@@ -167,6 +167,7 @@
 @font-color-light-disabled: @color-dark-gray;
 @font-color-light-disabled-theme-dark: @color-dark-gray-theme-dark;
 @font-color-gray: #999999;
+@font-color-gray-theme-dark: @color-gray-theme-dark;
 @font-color-white: @color-white;
 @font-color-white-theme-dark: @color-white-theme-dark;
 @font-color-light-highlight: @color-light-blue-100;

src/less/lib/theme.less

@@ -233,6 +233,7 @@
 @color-bi-color-error-input-text-area: @color-bi-text-failure;
 // tree
 @color-bi-text-display-tree: @color-bi-text-gray;
+@color-bi-text-display-tree-theme-dark: @color-bi-text-gray-theme-dark;
 @color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line;
 @color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark;
 // popup

src/widget/downlist/combo.downlist.js

@@ -44,7 +44,8 @@
                 popup: {},
                 minWidth: 140,
                 maxHeight: 1000,
-                destroyWhenHide: false
+                destroyWhenHide: false,
+                isDefaultInit: true,
             });
         },
 
@@ -57,7 +58,7 @@
                 type: "bi.combo",
                 trigger: o.trigger,
                 isNeedAdjustWidth: false,
-                isDefaultInit: true,
+                isDefaultInit: o.isDefaultInit,
                 container: o.container,
                 adjustLength: o.adjustLength,
                 direction: o.direction,

src/widget/year/combo.year.js

@@ -141,7 +141,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
                     items: [{
                         el: {
                             type: "bi.icon_button",
-                            cls: "bi-trigger-icon-button",
+                            cls: "bi-trigger-icon-button date-change-h-font",
                             width: this._const.iconWidth,
                             height: BI.toPix(o.height, border),
                             ref: function () {

src/widget/yearmonth/combo.yearmonth.js

@@ -141,7 +141,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
                     items: [{
                         el: {
                             type: "bi.icon_button",
-                            cls: "bi-trigger-icon-button",
+                            cls: "bi-trigger-icon-button date-change-h-font",
                             width: BI.toPix(o.height, border),
                             height: BI.toPix(o.height, border),
                             ref: function () {

src/widget/yearquarter/combo.yearquarter.js

@@ -144,7 +144,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
                     items: [{
                         el: {
                             type: "bi.icon_button",
-                            cls: "bi-trigger-icon-button",
+                            cls: "bi-trigger-icon-button date-change-h-font",
                             width: this._consts.iconWidth,
                             height: BI.toPix(o.height, border),
                             ref: function () {
@@ -169,7 +169,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
         }
         switch (type) {
             case BI.DynamicYearQuarterCombo.Dynamic:
-                this.comboWrapper.resize();
+                this.changeIcon.setVisible(true);
                 break;
             default:
                 this.changeIcon.setVisible(false);

typescript/case/combo/combo.textvalue.ts

@@ -5,5 +5,10 @@ export declare class TextValueCombo extends Widget {
 
     static EVENT_CHANGE: string;
     
-    populate(items: any): void; 
+    clear(): void;
+    setText(text: string): void;
+    setValue(value: any): void;
+    setStatus(status: "success" | "warning" | "error"): void;
+    getValue(): any[];
+    populate(items: any[]): void;
 }

typescript/case/combo/popup.textvalue.ts

@@ -0,0 +1,13 @@
+import { Pane } from "../../base/pane";
+
+export declare class TextValueComboPopup extends Pane {
+    static xtype: string;
+    
+    static EVENT_CHANGE: string;
+    static EVENT_CLEAR: string;
+    static EVENT_CONFIRM: string;
+
+    populate(items: any[]): void;
+    getValue(): any;
+    setValue(value: any): void;
+}

typescript/core/base.ts

@@ -148,9 +148,9 @@ export interface _base {
 
     takeRight: <T>(array: T[], n: number) => T[];
 
-    findIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number;
+    findIndex: <T>(array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number;
 
-    findLastIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number;
+    findLastIndex: <T>(array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number;
 
     makeArray: <T>(length: number, value?: T) => number[] | T[];
 

typescript/core/platform/web/function.ts

@@ -9,4 +9,5 @@ export type _function = {
   isMac: () => boolean;
   isWindows: () => boolean;
   isSupportCss3: (style: any) => boolean;
+  getSafariVersion: () => number;
 }

typescript/core/worker/controller/worker.main_thread.controller.ts

@@ -10,9 +10,10 @@ export class WorkerMainThreadController extends WorkerBaseController {
 
     /**
      * 是否支持 new Worker, 默认为 Wroker Class 是否实现
+     * 由于Blob url支持度问题  规避Safari 12以下版本
      */
 
-    public canNewWorker: boolean = WorkerMainThreadController.hasWorkerClass;
+    public canNewWorker: boolean = WorkerMainThreadController.hasWorkerClass && !(BI.isSafari() && BI.getSafariVersion() < 12);
 
     /**
      * 主线程 new Worker 起始时刻

typescript/index.ts

@@ -20,6 +20,7 @@ import { IconChangeButton } from "./case/button/icon/icon.change";
 import { MultiSelectItem } from "./case/button/item.multiselect";
 import { BubbleCombo } from "./case/combo/bubblecombo/combo.bubble";
 import { TextValueCombo } from "./case/combo/combo.textvalue";
+import { TextValueComboPopup } from "./case/combo/popup.textvalue";
 import { SmallTextValueCombo } from "./case/combo/combo.textvaluesmall";
 import { SearchTextValueCombo } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue";
 import { SignEditor } from "./case/editor/editor.sign";
@@ -226,6 +227,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ButtonGroup: typeof ButtonGroup;
     Combo: typeof Combo;
     TextValueCombo: typeof TextValueCombo;
+    TextValueComboPopup: typeof TextValueComboPopup;
     SmallTextValueCombo: typeof SmallTextValueCombo;
     BubbleCombo: typeof BubbleCombo;
     AllValueMultiTextValueCombo: typeof AllValueMultiTextValueCombo;
@@ -464,6 +466,7 @@ export {
     MultiSelectBar,
     SelectList,
     TextValueCombo,
+    TextValueComboPopup,
     SmallTextValueCombo,
     Editor,
     IconLabel,