Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0

2021-06-24 11:24:48 +08:00
parent 11b261b4ca 7556df707c
commit e22638852f
5 changed files with 4 additions and 3 deletions
@@ -195,6 +195,7 @@
 <glyph unicode="&#xe9ab;" glyph-name="alter" d="M207.461-190.178l200.355 202.59h-148.075v332.852c0 20.361 16.506 36.866 36.866 36.866h371.016v97.533h-425.961c-24.062 0-46.609-11.74-60.406-31.453-4.477-6.398-8.065-12.407-10.762-18.029-6.749-14.067-10.023-30.084-9.823-48.051v0-369.718h-160.671l207.461-202.59zM816.539 775.319l-200.355-202.59h148.075v-332.852c0-20.361-16.506-36.866-36.866-36.866h-371.016v-97.533h443.634c28.279 0 52.263 20.776 56.294 48.767l5.769 40.051c0.836 5.803 1.255 11.658 1.255 17.52v360.913h160.671l-207.461 202.59z" />
 <glyph unicode="&#xe9ac;" glyph-name="estimate" d="M906.777 547.172c62.494-20.419 99-84.768 84.768-148.499l-3.094-11.756-168.299-518.511c-20.419-62.494-84.768-99-148.499-84.768l-11.756 3.094-345.262 111.994c-62.494 20.419-99 84.768-84.768 148.499l3.094 11.756 3.712 11.137 69.299-22.275-3.712-11.137c-8.044-25.369 3.094-53.212 26.606-64.968l8.044-3.712 345.262-111.994c25.369-8.044 53.212 3.094 64.968 26.606l3.712 8.044 168.299 518.511c8.044 25.369-3.094 53.212-26.606 64.968l-8.044 3.712-280.293 90.956 22.275 69.299 280.293-90.956zM520.058 804.571h-363.825c-69.918 0-126.844-56.925-126.844-126.844v-545.118c0-69.918 56.925-126.844 126.844-126.844h363.206c69.918 0 126.849 56.925 126.849 126.844v545.118c0.614 69.918-56.311 126.844-126.23 126.844zM156.235 732.178h363.206c30.318 0 54.45-24.131 54.45-54.45v-545.118c0-30.318-24.131-54.45-54.45-54.45h-363.206c-30.318 0-54.45 24.131-54.45 54.45v545.118c0 29.699 24.75 54.45 54.45 54.45zM338.146 564.496c12.994 0 56.306-77.962 95.288-119.419 42.694-44.55 44.55-84.15 28.463-113.85-14.85-28.463-64.968 1.238-118.181 0-55.688-1.238-110.756-32.175-129.937 0-18.562 30.937-8.044 61.875 28.463 113.85 37.125 51.356 82.912 119.419 95.906 119.419v0zM327.009 346.078h21.038l9.282-56.925 26.606-19.181v-14.85h-90.337v15.469l25.987 19.181 7.425 56.306zM713.727 382.585l83.531 60.019 40.219-92.812-89.718-61.256-34.031 94.050z" />
 <glyph unicode="&#xe9ad;" glyph-name="summary" d="M659.195 733.31h-289.059c-17.315 0.357-31.642-13.39-31.999-30.707 0-0.004 0-0.009 0-0.013v0c0.371-15.846 12.584-28.885 28.373-30.292h292.687c16.907-1.412 31.758 11.148 33.17 28.055s-11.148 31.758-28.055 33.17c-1.702 0.142-3.413 0.142-5.116 0l-0.001-0.213zM684.582 384.092v0c10.306 0.011 20.198-4.053 27.519-11.306v0c13.792-13.715 14.989-35.636 2.774-50.772l-2.774-3.2-221.434-218.234c-7.295-7.293-17.204-11.365-27.519-11.307v0c-8.737 0.013-17.22 2.941-24.106 8.321l-2.56 2.986-126.29 124.797c-14.844 14.646-15.006 38.553-0.36 53.398 0.12 0.121 0.239 0.241 0.361 0.361v0c14.189 14.194 36.771 15.48 52.479 2.986l3.2-2.986 98.558-97.491 193.275 191.996c5.147 5.141 11.664 8.695 18.773 10.239h4.267l3.84 0.214zM270.938 666.326h-103.463c-3.622 0.058-6.845-2.293-7.893-5.761v-801.26c0.205-3.53 2.733-6.494 6.186-7.253h690.756c3.683-0.033 6.925 2.421 7.893 5.974v800.833c-0.205 3.53-2.733 6.494-6.186 7.253h-98.984v-1.92c-16.145-37.137-51.929-61.93-92.371-63.999h-296.738c-41.191-0.331-78.892 23.086-96.851 60.158l-2.347 5.974zM659.195 804.566v0c40.579 0.399 77.87-22.258 96.21-58.458l2.133-5.12 1.493-3.413h2.774l1.28 4.907v-4.907h93.438c40.965 0.968 76.212-28.785 82.131-69.332v-808.939c-0.758-42.499-34.539-77.029-77.011-78.718h-694.169c-42.608-0.826-78.541 31.561-82.131 74.025v804.246c0.863 42.455 34.585 76.924 77.011 78.718h107.944c14.302 37.13 48.298 63.039 87.891 66.991h301.005z" />
+<glyph unicode="&#xe9ae;" glyph-name="asset, diamond" d="M1023.998 469.318c0 4.411-2.046 8.285-4.955 11.583l0.296 0.194-1.454 1.228c-0.553 0.526-1.138 1.019-1.75 1.476l-276.068 232.96-0.318-0.192c-4.25 4.757-10.682 8.055-18.294 8.055h-418.908c-7.612 0-14.045-3.299-18.294-8.055l-0.321 0.192-276.066-232.961c-0.639-0.479-1.183-0.939-1.75-1.476l-1.454-1.228 0.318-0.194c-2.934-3.297-4.979-7.172-4.979-11.583 0-4.679 2.204-8.784 5.431-12.159l-0.248-0.171 488.728-589.18 0.248 0.192c4.272-4.47 10.521-7.48 17.841-7.48s13.568 3.010 17.84 7.48l0.25-0.192 488.477 589.354c3.228 3.374 5.433 7.478 5.433 12.158v0.001zM712.135 685.344l232.728-196.387h-209.182l-116.363 196.387h92.819zM567.591 685.344l116.339-196.387h-343.862l116.341 196.387h111.183zM311.863 685.344h92.818l-116.362-196.387h-209.182l232.728 196.387zM67.909 449.68h217.339l163.022-458.519-380.362 458.519zM511.998-51.568l-178.204 501.247h356.408l-178.204-501.247zM575.726-8.839l163.023 458.519h217.339l-380.363-458.519z" />
 <glyph unicode="&#xf016;" glyph-name="file, file-empty" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429z" />
 <glyph unicode="&#xf02d;" glyph-name="book" d="M948.764 510.653c13.529-19.482 17.318-44.918 9.741-69.81l-148.822-490.3c-13.529-45.999-61.152-81.716-107.693-81.716h-499.501c-55.199 0-114.186 43.835-134.21 100.116-8.658 24.352-8.658 48.165-1.083 68.728 1.083 10.823 3.248 21.647 3.789 34.635 0.541 8.658-4.329 15.694-3.248 22.188 2.165 12.988 13.529 22.188 22.188 36.799 16.235 27.058 34.635 70.893 40.587 99.033 2.706 10.281-2.706 22.188 0 31.388 2.706 10.281 12.988 17.859 18.401 27.6 14.612 24.894 33.554 73.058 36.259 98.493 1.083 11.364-4.329 23.811-1.083 32.471 3.789 12.447 15.694 17.859 23.811 28.682 12.988 17.859 34.635 69.269 37.881 97.952 1.083 9.199-4.329 18.401-2.706 28.14 2.165 10.281 15.153 21.106 23.811 33.554 22.728 33.554 27.058 107.693 95.787 88.211l-0.541-1.623c9.199 2.165 18.401 4.871 27.6 4.871h411.831c25.434 0 48.165-11.364 61.694-30.306 14.070-19.482 17.318-44.918 9.741-70.352l-148.281-490.3c-25.434-83.34-39.505-101.74-108.235-101.74h-470.277c-7.035 0-15.694-1.623-20.565-8.117-4.329-6.495-4.871-11.364-0.541-23.269 10.823-31.388 48.165-37.881 77.93-37.881h499.501c20.024 0 43.293 11.364 49.247 30.846l162.352 534.135c3.248 10.281 3.248 21.106 2.706 30.846 12.447-4.871 23.811-12.447 31.929-23.269zM372.959 509.57c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318zM328.043 371.031c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318z" />
 <glyph unicode="&#xf064;" glyph-name="share" d="M960.285 412.526c0-8.506-3.502-16.511-9.505-22.514l-256.163-256.163c-6.003-6.003-14.008-9.505-22.514-9.505-17.512 0-32.020 14.509-32.020 32.020v128.082h-112.072c-215.638 0-357.227-41.527-357.227-280.178 0-20.513 1.001-41.025 2.501-61.54 0.5-8.005 2.501-17.011 2.501-25.015 0-9.505-6.003-17.512-16.010-17.512-7.004 0-10.506 3.502-14.008 8.506-7.505 10.506-13.009 26.518-18.511 38.025-28.517 64.041-63.54 155.598-63.54 225.643 0 56.036 5.504 113.572 26.518 166.606 69.545 172.609 273.673 201.628 437.778 201.628h112.072v128.082c0 17.512 14.509 32.020 32.020 32.020 8.506 0 16.511-3.502 22.514-9.505l256.163-256.163c6.003-6.003 9.505-14.008 9.505-22.514z" />
@@ -221,4 +222,4 @@
 <glyph unicode="&#xf1c7;" glyph-name="file-audio" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429zM354.286 318.857c6.857-2.857 11.429-9.714 11.429-17.143v-310.857c0-7.429-4.571-14.286-11.429-17.143-2.286-0.571-4.571-1.143-6.857-1.143-4.571 0-9.143 1.714-13.143 5.143l-94.857 95.429h-74.857c-10.286 0-18.286 8-18.286 18.286v109.714c0 10.286 8 18.286 18.286 18.286h74.857l94.857 95.429c5.714 5.143 13.143 6.857 20 4zM592.571-74.858c10.857 0 21.143 4.571 28.571 13.714 47.429 58.286 73.714 132 73.714 207.429s-26.286 149.143-73.714 207.429c-12.571 16-36 18.286-51.429 5.714-16-13.143-18.286-36-5.143-52 37.143-45.714 57.143-101.714 57.143-161.143s-20-115.429-57.143-161.143c-13.143-16-10.857-38.857 5.143-51.429 6.857-5.714 14.857-8.571 22.857-8.571zM472 9.714c9.714 0 19.429 4 26.857 11.429 32 34.286 49.714 78.286 49.714 125.143s-17.714 90.857-49.714 125.143c-13.714 14.857-37.143 15.429-52 1.714-14.286-13.714-15.429-37.143-1.143-52 18.857-20.571 29.714-46.857 29.714-74.857s-10.857-54.286-29.714-74.857c-14.286-14.857-13.143-38.286 1.143-52 7.429-6.286 16.571-9.714 25.143-9.714z" />
 <glyph unicode="&#xf1c8;" glyph-name="file-video" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429zM438.857 365.714c40 0 73.143-33.143 73.143-73.143v-219.429c0-40-33.143-73.143-73.143-73.143h-219.429c-40 0-73.143 33.143-73.143 73.143v219.429c0 40 33.143 73.143 73.143 73.143h219.429zM720 364.571c6.857-2.857 11.429-9.714 11.429-17.143v-329.143c0-7.429-4.571-14.286-11.429-17.143-2.286-0.571-4.571-1.143-6.857-1.143-4.571 0-9.714 1.714-13.143 5.143l-151.429 152v51.429l151.429 152c3.429 3.429 8.571 5.143 13.143 5.143 2.286 0 4.571-0.571 6.857-1.143z" />
 <glyph unicode="&#xf1c9;" glyph-name="file-code" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429zM274.286 365.714c6.286 8 17.714 9.714 25.714 3.429l29.143-21.714c8-6.286 9.714-17.714 3.429-25.714l-104-138.857 104-138.857c6.286-8 4.571-19.429-3.429-25.714l-29.143-21.714c-8-6.286-19.429-4.571-25.714 3.429l-129.143 172c-4.571 6.286-4.571 15.429 0 21.714zM732.571 193.714c4.571-6.286 4.571-15.429 0-21.714l-129.143-172c-6.286-8-17.714-9.714-25.714-3.429l-29.143 21.714c-8 6.286-9.714 17.714-3.429 25.714l104 138.857-104 138.857c-6.286 8-4.571 19.429 3.429 25.714l29.143 21.714c8 6.286 19.429 4.571 25.714-3.429zM378.286-69.715c-10.286 1.714-16.571 11.429-14.857 21.143l78.857 474.857c1.714 10.286 11.429 16.571 21.143 14.857l36-5.714c10.286-1.714 16.571-11.429 14.857-21.143l-78.857-474.857c-1.714-10.286-11.429-16.571-21.143-14.857z" />
-</font></defs></svg>
+</font></defs></svg>