Pull request #3262: 无jira 解决冲突

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit '1111c9452bda78dbe32c9fc8ca386a3d4f1beb9a':
  REPORT-44410 加个判断
  REPORT-44410 远程设计数据集点击确认卡顿
  REPORT-44733 代码回退，改动可能会导致其他问题，和产品确认了下，具体逻辑暂时未定，后续再迭代任务里面处理
  CHART-17758 埋点数据保存时按时间排序
  REPORT-46347 jdk11-设计器内图标优化-tab块图标变了 【问题原因】视觉组同学给我导出的tab块图标是另一个，我没检查就给替换了 【改动思路】替换为原来的tab图标样式
  REPORT-46347 jdk11-设计器内图标优化-tab块图标变了 【问题原因】视觉组同学给我导出的tab块图标是另一个，我没检查就给替换了 【改动思路】替换为原来的tab图标样式
  REPORT-42238 JDK11设计器图标模糊问题优化 单独提交到release
  REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 单独提交到release

designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfo.java

@@ -19,6 +19,8 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.third.joda.time.DateTime;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,7 +29,7 @@ import java.util.Map;
  * @version 10.0
  * Created by Bjorn on 2020-02-17
  */
-public class ChartInfo extends AbstractPointInfo {
+public class ChartInfo extends AbstractPointInfo implements Comparable<ChartInfo> {
     public static final String XML_TAG = "ChartInfo";
     private static final String CHART_CONSUMING_URL = CloudCenter.getInstance().acquireUrlByKind("chartinfo.consuming") + "/single";
     private static final String CHART_FUNCTION_URL = CloudCenter.getInstance().acquireUrlByKind("chart.info.function") + "/single";
@@ -338,4 +340,19 @@ public class ChartInfo extends AbstractPointInfo {
         chartInfo.chartConfigInfo = chartConfigInfo.clone();
         return chartInfo;
     }
+
+    @Override
+    public int compareTo(ChartInfo chartInfo) {
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            return format.parse(this.getCompareDate()).compareTo(format.parse(chartInfo.getCompareDate()));
+        } catch (Exception ex) {
+            return 1;
+        }
+    }
+
+    private String getCompareDate() {
+        return StringUtils.isNotEmpty(chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME)) ?
+                chartConsumingMap.get(ATTR_CHART_PROPERTY_END_TIME) : chartConsumingMap.get(ATTR_CHART_TYPE_TIME);
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java

@@ -13,7 +13,10 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.third.joda.time.DateTime;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -269,7 +272,10 @@ public class ChartInfoCollector extends AbstractPointCollector<ChartInfo> {
         writer.end();
 
         writer.startTAG(XML_CHART_INFO_LIST);
-        for (ChartInfo chartInfo : pointInfoMap.values()) {
+
+        List<ChartInfo> list = new ArrayList<>(pointInfoMap.values());
+        Collections.sort(list);
+        for (ChartInfo chartInfo : list) {
             chartInfo.writeXML(writer);
         }
         writer.end();

designer-base/src/main/resources/com/fr/design/images/bbs/bug_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/bug反馈_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15.2720866,8.99108296 C15.2720866,9.1455772 15.2157608,9.27952294 15.1031246,9.3929202 C14.9904884,9.50631745 14.8565427,9.56263555 14.7012874,9.56187449 L12.703517,9.56187449 C12.703517,10.5786445 12.5045011,11.4409202 12.1064691,12.1487017 L13.9615416,14.0129068 C14.0741778,14.125543 14.1304959,14.2594888 14.1304959,14.4147441 C14.1304959,14.5699994 14.0741778,14.7039451 13.9615416,14.8165813 C13.8542328,14.9292175 13.720287,14.9855356 13.5597043,14.9855356 C13.3991217,14.9855356 13.2651759,14.9292175 13.1578671,14.8165813 L11.3918381,13.059685 C11.362157,13.0893661 11.3176352,13.12818 11.2582729,13.1761264 C11.1989106,13.2240729 11.0740975,13.3089306 10.8838337,13.4306995 C10.6935698,13.5524683 10.5002618,13.6609187 10.3039095,13.7560506 C10.1075572,13.8511826 9.86363895,13.9375623 9.57215475,14.01519 C9.28067054,14.0928176 8.99223056,14.1316315 8.70683479,14.1316315 L8.70683479,6.14055007 L7.56525174,6.14055007 L7.56525174,14.1316315 C7.2623517,14.1316315 6.96059324,14.0916761 6.65997637,14.0117652 C6.35935949,13.9318544 6.10060067,13.8336783 5.88369989,13.7172368 C5.66679911,13.6007953 5.47044683,13.4847344 5.29464304,13.369054 C5.11883925,13.2533736 4.98945984,13.1567195 4.90650481,13.0790919 L4.77293959,12.9546593 L3.14047582,14.8005991 C3.02175118,14.9254122 2.8790533,14.9878188 2.71238218,14.9878188 C2.57006483,14.9878188 2.44220753,14.9402528 2.32881028,14.8451209 C2.21617408,14.7378121 2.15528965,14.6053884 2.14615699,14.44785 C2.13702433,14.2903115 2.18306818,14.15218 2.28428854,14.0334553 L4.08570661,12.0094286 C3.74094853,11.3313282 3.56856949,10.5166185 3.56856949,9.56529926 L1.57079914,9.56529926 C1.4163049,9.56529926 1.28235916,9.50898116 1.1689619,9.39634497 C1.05556465,9.28370877 0.999246554,9.14976303 1,8.99450773 C1.00076867,8.83925243 1.05708677,8.70530669 1.1689619,8.59267049 C1.28083704,8.48003429 1.41478279,8.42371619 1.57079914,8.42371619 L3.56856949,8.42371619 L3.56856949,5.80149992 L2.0251492,4.25807962 C1.912513,4.14544343 1.8561949,4.01149768 1.8561949,3.85624238 C1.8561949,3.70098709 1.912513,3.56704134 2.0251492,3.45440514 C2.13778539,3.34176895 2.27173114,3.28545085 2.42698644,3.28545085 C2.58224173,3.28545085 2.71618748,3.34176895 2.82882368,3.45440514 L4.37224397,4.99782544 L11.8998426,4.99782544 L13.4432629,3.45440514 C13.5558991,3.34176895 13.6898449,3.28545085 13.8451002,3.28545085 C14.0003555,3.28545085 14.1343012,3.34176895 14.2469374,3.45440514 C14.3595736,3.56704134 14.4158917,3.70098709 14.4158917,3.85624238 C14.4158917,4.01149768 14.3595736,4.14544343 14.2469374,4.25807962 L12.7035171,5.80149992 L12.7035171,8.42371619 L14.7012875,8.42371619 C14.8557817,8.42371619 14.9897274,8.48003429 15.1031247,8.59267049 C15.2165219,8.70530669 15.27284,8.83925243 15.2720866,8.99450773 L15.2720866,8.99108296 Z M10.9911425,3.8539592 L5.2832272,3.8539592 C5.2832272,3.06322266 5.56101241,2.38968866 6.11658283,1.83335719 C6.67215326,1.27702572 7.34568726,0.999240513 8.13718484,1 C8.92868242,1.00076261 9.60221642,1.27854782 10.1577868,1.83335719 C10.7133573,2.38816657 10.9911425,3.06170057 10.9911425,3.8539592 Z" id="Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/center_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/活动中心_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M5.8,1 C5.91045695,1 6,1.08954305 6,1.2 L6,2 L10,2 L10,1.2 C10,1.08954305 10.0895431,1 10.2,1 L11.8,1 C11.9104569,1 12,1.08954305 12,1.2 L12,2 L14,2 C14.5522847,2 15,2.44771525 15,3 L15,14 C15,14.5522847 14.5522847,15 14,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,3 C1,2.44771525 1.44771525,2 2,2 L4,2 L4,1.2 C4,1.08954305 4.08954305,1 4.2,1 L5.8,1 Z M14,3 L2,3 L2,14 L14,14 L14,3 Z M5.8,9 C5.91045695,9 6,9.08954305 6,9.2 L6,10.8 C6,10.9104569 5.91045695,11 5.8,11 L4.2,11 C4.08954305,11 4,10.9104569 4,10.8 L4,9.2 C4,9.08954305 4.08954305,9 4.2,9 L5.8,9 Z M8.8,9 C8.91045695,9 9,9.08954305 9,9.2 L9,10.8 C9,10.9104569 8.91045695,11 8.8,11 L7.2,11 C7.08954305,11 7,10.9104569 7,10.8 L7,9.2 C7,9.08954305 7.08954305,9 7.2,9 L8.8,9 Z M11.8,9 C11.9104569,9 12,9.08954305 12,9.2 L12,10.8 C12,10.9104569 11.9104569,11 11.8,11 L10.2,11 C10.0895431,11 10,10.9104569 10,10.8 L10,9.2 C10,9.08954305 10.0895431,9 10.2,9 L11.8,9 Z M5.8,6 C5.91045695,6 6,6.08954305 6,6.2 L6,7.8 C6,7.91045695 5.91045695,8 5.8,8 L4.2,8 C4.08954305,8 4,7.91045695 4,7.8 L4,6.2 C4,6.08954305 4.08954305,6 4.2,6 L5.8,6 Z M8.8,6 C8.91045695,6 9,6.08954305 9,6.2 L9,7.8 C9,7.91045695 8.91045695,8 8.8,8 L7.2,8 C7.08954305,8 7,7.91045695 7,7.8 L7,6.2 C7,6.08954305 7.08954305,6 7.2,6 L8.8,6 Z M11.8,6 C11.9104569,6 12,6.08954305 12,6.2 L12,7.8 C12,7.91045695 11.9104569,8 11.8,8 L10.2,8 C10.0895431,8 10,7.91045695 10,7.8 L10,6.2 C10,6.08954305 10.0895431,6 10.2,6 L11.8,6 Z" id="形状结合" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/facebook_normal.svg

@@ -6,4 +6,4 @@
             <path d="M14.5,0 L1.5,0 C0.672484996,0.00219792664 0.00219792664,0.672484996 0,1.5 L0,14.5 C0.00219792664,15.327515 0.672484996,15.9978021 1.5,16 L8,16 L8,9 L6,9 L6,7 L8,7 L8,6 C8.00256968,4.34421132 9.34421132,3.00256968 11,3 L13,3 L13,5 L11,5 C10.4477153,5 10,5.44771525 10,6 L10,7 L13,7 L12.5,9 L10,9 L10,16 L14.5,16 C15.327515,15.9978021 15.9978021,15.327515 16,14.5 L16,1.5 C15.9978021,0.672484996 15.327515,0.00219792664 14.5,0 Z" id="路径"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/help_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/帮助文档_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M13.1428571,1 C13.6142857,1 14,1.39375 14,1.875 L14,1.875 L14,14.125 C14,14.60625 13.6142857,15 13.1428571,15 L13.1428571,15 L2.85714286,15 C2.38571429,15 2,14.60625 2,14.125 L2,14.125 L2,1.875 C2,1.39375 2.38571429,1 2.85714286,1 L2.85714286,1 Z M4,2 L3,2 L3,14 L4,14 L4,2 Z M13,2 L5,2 L5,14 L13,14 L13,2 Z M11,11 L11,12 L7,12 L7,11 L11,11 Z M11,9 L11,10 L7,10 L7,9 L11,9 Z M10.5,4 C10.7761424,4 11,4.22385763 11,4.5 L11,4.5 L11,6.5 C11,6.77614237 10.7761424,7 10.5,7 L10.5,7 L7.5,7 C7.22385763,7 7,6.77614237 7,6.5 L7,6.5 L7,4.5 C7,4.22385763 7.22385763,4 7.5,4 L7.5,4 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/need_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/需求反馈_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M13.0758389,9.75977829 L14.7397914,11.4242307 L11.4118864,14.7516357 L8.49996964,15.9996 L9.74793398,13.0876832 L13.0758389,9.75977829 Z M13,1 L13,8.42 L12.7847053,8.63674856 L12.0768284,9.34385513 L12.077,9.344 L12,9.42 L12,2 L2,2 L2,14 L8.268,14 L7.84,15 L1,15 L1,1 L13,1 Z M15.1553795,9.34424016 C15.6148663,9.80372704 15.6148663,10.5487057 15.1553795,11.0081926 L13.491427,9.34424016 C13.9509139,8.88525328 14.6958926,8.88525328 15.1553795,9.34424016 Z M8,8 L8,9 L3,9 L3,8 L8,8 Z M11,6 L11,7 L3,7 L3,6 L11,6 Z M11,3 L11,5 L3,5 L3,3 L11,3 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/question_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/问题求助_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M8,1 C11.86575,1 15,4.14762257 15,8.03060058 C15,9.67082164 14.4343113,11.1731005 13.4943112,12.3667764 C13.2764824,12.6414842 13.0569382,12.8824315 12.822125,13.1074719 L13.5110424,13.7061268 L13.5140482,13.829443 C13.5360683,13.8083393 13.5579585,13.7871261 13.579718,13.7658045 L15,15 L7.40325,15 C3.821875,14.6921111 1,11.7083193 1,8.03060058 C1,4.14762257 4.13425,1 8,1 Z M8,2 C4.68739322,2 2,4.69905398 2,8.03060058 C2,11.156684 4.39197001,13.7374333 7.40325,14 L12.3246641,14 L11.3391614,13.1436187 L12.1302018,12.3855008 C13.3178542,11.2472776 14,9.69476956 14,8.03060058 C14,4.69905398 11.3126068,2 8,2 Z M7.644,11.308 C7.88290176,11.308 8.08464923,11.3832279 8.24271068,11.5412893 C8.39608638,11.694665 8.476,11.8892373 8.476,12.116 C8.476,12.3579755 8.3937042,12.553428 8.22757246,12.7057154 C8.06134606,12.8580896 7.8682638,12.936 7.644,12.936 C7.4197362,12.936 7.22665394,12.8580896 7.05728932,12.7027107 C6.89782446,12.5432458 6.824,12.3519733 6.824,12.116 C6.824,11.8776413 6.89929,11.685994 7.05728932,11.5412893 C7.21675418,11.3818245 7.40802665,11.308 7.644,11.308 Z M7.824,4 C8.62306191,4 9.25637141,4.21625203 9.73966253,4.66236725 C10.20762,5.09238226 10.444,5.68490802 10.444,6.428 C10.444,6.9849335 10.2836914,7.47528934 9.96482213,7.89601844 C9.83439467,8.05253139 9.49188194,8.37918705 8.98136199,8.8316823 C8.73225307,9.04682182 8.55658949,9.25365152 8.43809265,9.46687293 C8.29344163,9.71166697 8.224,9.98110049 8.224,10.292 L8.224,10.568 L8.124,10.668 L7.164,10.668 L7.064,10.568 L7.064,10.292 C7.064,9.88163075 7.13905012,9.51888851 7.28938169,9.20571145 C7.46498014,8.82942905 7.86990853,8.36406359 8.52128932,7.78528932 C8.78038614,7.52619251 8.86304576,7.43993899 8.92191312,7.3615305 C9.14935705,7.07722558 9.26,6.78678784 9.26,6.476 C9.26,6.02939509 9.1302719,5.67969326 8.87980118,5.42919054 C8.62961934,5.16813122 8.2647239,5.04 7.776,5.04 C7.20272311,5.04 6.79107378,5.22079193 6.52263183,5.58978216 C6.27310143,5.9073663 6.148,6.3423781 6.148,6.908 L6.048,7.008 L5.1,7.008 L5,6.908 C5,6.03512495 5.24136908,5.34196247 5.73400599,4.82473272 C6.2340788,4.27465264 6.9331946,4 7.824,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/sign_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/报表工程师认证_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M11,1 C11.5522847,1 12,1.44771525 12,2 L12,7 L11,8.05 L11,2 L2,2 L2,14 L6.5,14 L7.64285714,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,2 C1,1.44771525 1.44771525,1 2,1 L11,1 Z M12,13.325 L12,14 C12,14.5522847 11.5522847,15 11,15 L10.4047619,15 L12,13.325 Z M14.8448344,6.15342954 C15.0447996,6.36527011 15.0525188,6.71731806 14.8620758,6.93975065 L8.81720991,14 L6.17075455,11.424173 C5.96293623,11.2219009 5.94187748,10.8705282 6.1237185,10.6393601 C6.30555953,10.408192 6.62144084,10.3847672 6.82925915,10.5870393 L8.75423236,12.460639 L14.1379379,6.17260811 C14.3283809,5.95017552 14.6448693,5.94158898 14.8448344,6.15342954 Z M9,7 L9,8 L3,8 L3,7 L9,7 Z M10,5 L10,6 L3,6 L3,5 L10,5 Z M10,3 L10,4 L3,4 L3,3 L10,3 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/solution_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/技术方案_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,1 L9,2 L14,2 L14,4 L13,4 L13,3 L8,3 L8,2 L2,2 L2,14 L14,14 L14,15 L1,15 L1,1 L9,1 Z M15,5 L15,13 L3,13 L3,5 L15,5 Z M6.26634295,6.58859116 L6.20156691,6.64644661 L4,9 L6.20156691,11.3535534 C6.38421953,11.5488155 6.68035793,11.5488155 6.86301054,11.3535534 C7.02283158,11.182699 7.04280921,10.9189587 6.92294343,10.7248829 L6.86301054,10.6464466 L5.32288726,9 L6.86301054,7.35355339 C7.04566315,7.15829124 7.04566315,6.84170876 6.86301054,6.64644661 C6.72094739,6.49457605 6.51023236,6.46082704 6.33765726,6.54519957 L6.26634295,6.58859116 Z M11.1369895,6.64644661 C10.9543368,6.84170876 10.9543368,7.15829124 11.1369895,7.35355339 L12.6771127,9 L11.1369895,10.6464466 C10.9543368,10.8417088 10.9543368,11.1582912 11.1369895,11.3535534 C11.3196421,11.5488155 11.6157805,11.5488155 11.7984331,11.3535534 L14,9 L11.7984331,6.64644661 C11.6157805,6.45118446 11.3196421,6.45118446 11.1369895,6.64644661 Z M10,7 L9,7 L8,11 L9,11 L10,7 Z" id="形状" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/bbs/video_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon/社区/视频教程_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M8,2 C4.6862915,2 2,4.6862915 2,8 C2,11.3137085 4.6862915,14 8,14 C11.3137085,14 14,11.3137085 14,8 C14,4.6862915 11.3137085,2 8,2 Z M7.24590914,5 C7.3017481,5 7.35592446,5.01892169 7.39952736,5.05365284 L10.9384667,7.87253508 C11.0091675,7.92885063 11.0206304,8.03156938 10.9640697,8.10196382 C10.9565069,8.11137637 10.9479202,8.11992586 10.9384667,8.1274559 L7.39952736,10.9463381 C7.29347611,11.0308115 7.13872736,11.0136917 7.05388636,10.9081 C7.01900404,10.8646861 7,10.8107445 7,10.7551475 L7,5.24484346 C7,5.10962015 7.11009727,5 7.24590914,5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/absolute_layout_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_绝对画薄块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15,1 L15,15 L1,15 L1,1 L15,1 Z M14,8 L1.999,8 L2,14 L14,14 L14,8 Z M14,2 L2,2 L1.999,7 L9,7 L9,2 L10,2 L10,7 L14,7 L14,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16_normal.svg

@@ -2,6 +2,6 @@
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon_tab块_normal</title>
     <g id="icon_tab块_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M7,1 L7,2 L15,2 L15,15 L1,15 L1,1 L7,1 Z M6,2 L2,2 L2,14 L14,14 L14,7 L6,7 L6,2 Z M12,11 L12,12 L4,12 L4,11 L12,11 Z M12,9 L12,10 L4,10 L4,9 L12,9 Z M10,3 L7,3 L7,6 L10,6 L10,3 Z M14,3 L11,3 L11,6 L14,6 L14,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <path d="M15,2 L15,15 L1,15 L1,1 L7,1 L7,2 L15,2 Z M10,3 L7,3 L7,6 L10,6 L10,3 Z M14,3 L11,3 L11,6 L14,6 L14,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
 </svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3_normal.svg

@@ -5,4 +5,4 @@
         <path d="M12,-8.13151629e-20 L12,0.0008 L15.9998,4.0008 L15.9998,15.9998 L1.9998,15.9998 L1.999,13.9998 L0,14.0004 L0,3.0004 L1.999,2.9998 L1.9998,-0.0002 L12,-8.13151629e-20 Z M15,4.9998 L12,4.9998 L14,7.0004 L14,14.0004 L2.999,13.9998 L2.9998,14.9998 L15.0008,14.9998 L15,4.9998 Z M9,4 L1,4 L1,13 L13,13 L13,8 L9,8 L9,4 Z M4,9 L4,11 L2,11 L2,9 L4,9 Z M12,9 L12,11 L5,11 L5,9 L12,9 Z M4,6 L4,8 L2,8 L2,6 L4,6 Z M8,6 L8,8 L5,8 L5,6 L8,6 Z M12,1.4148 L12,3.9998 L14.586,3.9998 L12,1.4148 Z M11,0.9998 L2.9998,0.9998 L2.999,2.9998 L10,3.0004 L11,3.9998 L11,0.9998 Z" id="Combined-Shape" fill="#333334"></path>
         <polygon id="Fill-7" fill="#FFFFFF" points="12 7 10 5 10 7 11 7"></polygon>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg

@@ -8,4 +8,4 @@
             <path d="M3,8 L3,6 L7,6 L7,12.0001925 C7,12.5523709 6.55613518,13 6,13 L5,13 L5,8 L3,8 Z" id="Combined-Shape" fill="#3BAAE0"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_导入文件_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M13.272,12.787 C13.25,12.875 13.09,13 13,13 L12,13 L7.5,13 L6,13 L4.5,13 L1.387,13 L2.632,9.265 C2.67,9.151 2.879,9 3,9 L6,9 C6.922,9 7.929,8.378 8.341,7.553 L8.447,7.342 C8.523,7.188 8.828,7 9,7 L14.719,7 L13.272,12.787 Z M5,3 C5.038,3 5.072,3.002 5.103,3.005 C5.361,3.603 6.081,4 7,4 L13,4 L13,6 L9,6 C8.45,6 7.798,6.402 7.552,6.894 L7.447,7.105 C7.201,7.598 6.549,8 6,8 L3,8 C2.45,8 1.857,8.427 1.683,8.949 L1,11 L1,3 L5,3 Z M15,6 L14,6 L14,4 C14,3.45 13.549,3 13,3 L7,3 C6.45,3 6,2.775 6,2.5 C6,2.225 5.549,2 5,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L4.5,14 L6,14 L7.5,14 L13,14 C13.549,14 14.108,13.563 14.242,13.03 L15.757,6.97 C15.891,6.436 15.549,6 15,6 L15,6 Z" id="Fill-1" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.svg

@@ -5,4 +5,4 @@
         <path d="M9,5 C10.1045695,5 11,5.8954305 11,7 C11,7.7398375 10.5982846,8.38584934 10.0010775,8.73181186 L10,11 C10,11.5522847 9.55228475,12 9,12 C8.44771525,12 8,11.5522847 8,11 L7.99992752,8.73239368 C7.40216612,8.38657394 7,7.74025244 7,7 C7,5.8954305 7.8954305,5 9,5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
         <path d="M9,2.36417668 C7.4854345,3.18748636 5.7676434,3.63037957 4,3.6310317 L4,9.0821584 C4,9.45104665 4.17312121,10.0431453 4.5311549,10.7404681 C4.95854929,11.5729051 5.62212701,12.5045187 6.44436469,13.4137689 C7.1880488,14.236172 8.06071333,15.0361293 8.88429196,15.6520343 C8.91798794,15.6531625 8.93413837,15.641016 8.95037407,15.628759 C9.81328106,14.9772657 10.7176871,14.1566565 11.4814426,13.3314693 C12.3377436,12.4063102 13.0263882,11.4692542 13.4666268,10.6435552 C13.8275377,9.96665349 14,9.40512489 14,9.08215841 L14,3.63103171 C12.23235,3.63038272 10.514552,3.18748928 9,2.36417668 Z M14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_权限编辑_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 Z M9,2.36417668 C7.4854345,3.18748636 5.7676434,3.63037957 4,3.6310317 L4,9.0821584 C4,9.45104665 4.17312121,10.0431453 4.5311549,10.7404681 C4.95854929,11.5729051 5.62212701,12.5045187 6.44436469,13.4137689 C7.1880488,14.236172 8.06071333,15.0361293 8.88429196,15.6520343 C8.91798794,15.6531625 8.93413837,15.641016 8.95037407,15.628759 C9.81328106,14.9772657 10.7176871,14.1566565 11.4814426,13.3314693 C12.3377436,12.4063102 13.0263882,11.4692542 13.4666268,10.6435552 C13.8275377,9.96665349 14,9.40512489 14,9.08215841 L14,3.63103171 C12.23235,3.63038272 10.514552,3.18748928 9,2.36417668 Z M9,5 C10.1045695,5 11,5.8954305 11,7 C11,7.7398375 10.5982846,8.38584934 10.0010775,8.73181186 L10,11 C10,11.5522847 9.55228475,12 9,12 C8.44771525,12 8,11.5522847 8,11 L7.99992752,8.73239368 C7.40216612,8.38657394 7,7.74025244 7,7 C7,5.8954305 7.8954305,5 9,5 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_权限编辑_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,0 C10.4036177,1.03323193 12.1509417,1.63103242 14.0038909,1.63103242 C14.3296318,1.63103242 14.7913276,1.56301051 15.3889782,1.4269667 C15.6582471,1.36562643 15.9262313,1.53422973 15.9875275,1.80350869 C15.9958164,1.83992242 16,1.87715012 16,1.91449535 L16,9.08215842 C16,9.77619285 15.7342394,10.6415117 15.2314445,11.584522 C14.7050914,12.5717347 13.9159202,13.645573 12.9492231,14.6900054 C12.1057303,15.6013435 11.1135511,16.5015748 10.1554738,17.2249214 C9.74266787,17.5365673 9.39859373,17.7693418 9.12860813,17.9378543 C8.99842505,18.0191043 8.83359313,18.0208462 8.70184453,17.9421247 C8.43538605,17.7829022 8.09483905,17.5590619 7.68650327,17.2536904 C6.75785014,16.5592065 5.78988933,15.6718988 4.96093887,14.7552039 C4.02753262,13.7230208 3.26367368,12.6506248 2.75195723,11.6539535 C2.26002664,10.695847 2,9.80651646 2,9.0821584 L2,1.91446377 C2.00002254,1.63833384 2.22387007,1.4144863 2.5,1.4144863 C2.53734105,1.4144863 2.57456457,1.41866951 2.61097419,1.42695767 C3.20863679,1.56300751 3.67034214,1.63103242 3.99609024,1.63103242 C5.84903947,1.63103242 7.59636348,1.03323193 9,0 Z M9,5 C7.8954305,5 7,5.8954305 7,7 C7,7.7398375 7.40171539,8.38584934 7.9989225,8.73181186 L8,11 C8,11.5522847 8.44771525,12 9,12 C9.55228475,12 10,11.5522847 10,11 L10,11 L10.0000725,8.73239368 C10.5978339,8.38657394 11,7.74025244 11,7 C11,5.8954305 10.1045695,5 9,5 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格属性_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M16,1 C16.5522847,1 17,1.44771525 17,2 L17,5 C17,5.55228475 16.5522847,6 16,6 C15.4477153,6 15,5.55228475 15,5 L15,3 L12,3 L12,5.5 C12,5.77614237 11.7761424,6 11.5,6 C11.2238576,6 11,5.77614237 11,5.5 L11,3 L7,3 L7,6 L8.5,6 C8.77614237,6 9,6.22385763 9,6.5 C9,6.77614237 8.77614237,7 8.5,7 L7,7 L7,8.5 C7,8.77614237 6.77614237,9 6.5,9 C6.22385763,9 6,8.77614237 6,8.5 L6,7 L3,7 L3,11 L5.5,11 C5.77614237,11 6,11.2238576 6,11.5 C6,11.7761424 5.77614237,12 5.5,12 L3,12 L3,15 L5,15 C5.55228475,15 6,15.4477153 6,16 C6,16.5522847 5.55228475,17 5,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,2 C1,1.44771525 1.44771525,1 2,1 L16,1 Z M11.8,6.8 C14.5614237,6.8 16.8,9.03857625 16.8,11.8 C16.8,14.5614237 14.5614237,16.8 11.8,16.8 C9.03857625,16.8 6.8,14.5614237 6.8,11.8 C6.8,9.03857625 9.03857625,6.8 11.8,6.8 Z M11.8,10.8 C11.2477153,10.8 10.8,11.2477153 10.8,11.8 L10.8,11.8 L10.8,14.8 C10.8,15.3522847 11.2477153,15.8 11.8,15.8 C12.3522847,15.8 12.8,15.3522847 12.8,14.8 L12.8,14.8 L12.8,11.8 C12.8,11.2477153 12.3522847,10.8 11.8,10.8 Z M11.8,7.8 C11.2477153,7.8 10.8,8.24771525 10.8,8.8 C10.8,9.35228475 11.2477153,9.8 11.8,9.8 C12.3522847,9.8 12.8,9.35228475 12.8,8.8 C12.8,8.24771525 12.3522847,7.8 11.8,7.8 Z M6,3 L3,3 L3,6 L6,6 L6,3 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,1 C16.5522847,1 17,1.44771525 17,2 L17,5 C17,5.55228475 16.5522847,6 16,6 C15.4477153,6 15,5.55228475 15,5 L15,3 L12,3 L12,5.5 C12,5.77614237 11.7761424,6 11.5,6 C11.2238576,6 11,5.77614237 11,5.5 L11,3 L7,3 L7,6 L8.5,6 C8.77614237,6 9,6.22385763 9,6.5 C9,6.77614237 8.77614237,7 8.5,7 L7,7 L7,8.5 C7,8.77614237 6.77614237,9 6.5,9 C6.22385763,9 6,8.77614237 6,8.5 L6,7 L3,7 L3,11 L5.5,11 C5.77614237,11 6,11.2238576 6,11.5 C6,11.7761424 5.77614237,12 5.5,12 L3,12 L3,15 L5,15 C5.55228475,15 6,15.4477153 6,16 C6,16.5522847 5.55228475,17 5,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,2 C1,1.44771525 1.44771525,1 2,1 L16,1 Z M11.8,6.8 C14.5614237,6.8 16.8,9.03857625 16.8,11.8 C16.8,14.5614237 14.5614237,16.8 11.8,16.8 C9.03857625,16.8 6.8,14.5614237 6.8,11.8 C6.8,9.03857625 9.03857625,6.8 11.8,6.8 Z M11.8,10.8 C11.2477153,10.8 10.8,11.2477153 10.8,11.8 L10.8,11.8 L10.8,14.8 C10.8,15.3522847 11.2477153,15.8 11.8,15.8 C12.3522847,15.8 12.8,15.3522847 12.8,14.8 L12.8,14.8 L12.8,11.8 C12.8,11.2477153 12.3522847,10.8 11.8,10.8 Z M11.8,7.8 C11.2477153,7.8 10.8,8.24771525 10.8,8.8 C10.8,9.35228475 11.2477153,9.8 11.8,9.8 C12.3522847,9.8 12.8,9.35228475 12.8,8.8 C12.8,8.24771525 12.3522847,7.8 11.8,7.8 Z M6,3 L3,3 L3,6 L6,6 L6,3 Z" id="Combined-Shape" fill="#62646E"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格属性_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6,13 L6,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,13 L6,13 Z M12,7 C14.7614237,7 17,9.23857625 17,12 C17,14.7614237 14.7614237,17 12,17 C9.23857625,17 7,14.7614237 7,12 C7,9.23857625 9.23857625,7 12,7 Z M12,11 C11.4477153,11 11,11.4477153 11,12 L11,12 L11,15 C11,15.5522847 11.4477153,16 12,16 C12.5522847,16 13,15.5522847 13,15 L13,15 L13,12 C13,11.4477153 12.5522847,11 12,11 Z M6,7 L6,12 L1,12 L1,7 L6,7 Z M12,8 C11.4477153,8 11,8.44771525 11,9 C11,9.55228475 11.4477153,10 12,10 C12.5522847,10 13,9.55228475 13,9 C13,8.44771525 12.5522847,8 12,8 Z M6,1 L6,6 L1,6 L1,2 C1,1.44771525 1.44771525,1 2,1 L6,1 Z M12,1 L12,6 L7,6 L7,1 L12,1 Z M16,1 C16.5522847,1 17,1.44771525 17,2 L17,6 L13,6 L13,1 L16,1 Z" id="Combined-Shape" fill="#419BF9"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格元素_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M11,11 L11,3 L3,3 L3,11 L11,11 Z M11,13 L8,13 L8,16 C8,16.5522847 7.55228475,17 7,17 C6.44771525,17 6,16.5522847 6,16 L6,13 L3,13 L3,16 C3,16.5522847 2.55228475,17 2,17 C1.44771525,17 1,16.5522847 1,16 L1,1.80000001 C1,1.35817221 1.35817221,1 1.80000001,1 L16,1 C16.5522847,1 17,1.44771525 17,2 C17,2.55228475 16.5522847,3 16,3 L13,3 L13,6 L16,6 C16.5522847,6 17,6.44771525 17,7 C17,7.55228475 16.5522847,8 16,8 L13,8 L13,11 L16,11 C16.5522847,11 17,11.4477153 17,12 C17,12.5522847 16.5522847,13 16,13 L13,13 L13,16 C13,16.5522847 12.5522847,17 12,17 C11.4477153,17 11,16.5522847 11,16 L11,13 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格元素_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M11,11 L11,3 L3,3 L3,11 L11,11 Z M11,13 L8,13 L8,16 C8,16.5522847 7.55228475,17 7,17 C6.44771525,17 6,16.5522847 6,16 L6,13 L3,13 L3,16 C3,16.5522847 2.55228475,17 2,17 C1.44771525,17 1,16.5522847 1,16 L1,1.80000001 C1,1.35817221 1.35817221,1 1.80000001,1 L16,1 C16.5522847,1 17,1.44771525 17,2 C17,2.55228475 16.5522847,3 16,3 L13,3 L13,6 L16,6 C16.5522847,6 17,6.44771525 17,7 C17,7.55228475 16.5522847,8 16,8 L13,8 L13,11 L16,11 C16.5522847,11 17,11.4477153 17,12 C17,12.5522847 16.5522847,13 16,13 L13,13 L13,16 C13,16.5522847 12.5522847,17 12,17 C11.4477153,17 11,16.5522847 11,16 L11,13 Z" id="Combined-Shape" fill="#62646E"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_单元格元素_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6,12 L6,17 L2,17 C1.44771525,17 1,16.5522847 1,16 L1,12 L6,12 Z M11,12 L11,17 L7,17 L7,12 L11,12 Z M17,12 L17,16 C17,16.5522847 16.5522847,17 16,17 L12,17 L12,12 L17,12 Z M11,1 L11,11 L1,11 L1,2 C1,1.44771525 1.44771525,1 2,1 L11,1 Z M17,7 L17,11 L12,11 L12,7 L17,7 Z M16,1 C16.5522847,1 17,1.44771525 17,2 L17,6 L12,6 L12,1 L16,1 Z" id="Combined-Shape" fill="#419BF9"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_条件属性_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M1,6 L2.5,6 C2.77614237,6 3,5.77614237 3,5.5 C3,5.22385763 2.77614237,5 2.5,5 L0.5,5 C0.361928813,5 0.236928813,5.05596441 0.146446609,5.14644661 C0.0559644063,5.23692881 0,5.36192881 0,5.5 L0,12.5 C0,12.6380712 0.0559644063,12.7630712 0.146446609,12.8535534 C0.236928813,12.9440356 0.361928813,13 0.5,13 L2.5,13 C2.77614237,13 3,12.7761424 3,12.5 C3,12.2238576 2.77614237,12 2.5,12 L1,12 L1,6 Z M5,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,7 C18,7.55228475 17.5522847,8 17,8 L5,8 C4.44771525,8 4,7.55228475 4,7 L4,4 C4,3.44771525 4.44771525,3 5,3 Z M5,10 L14,10 C14.5522847,10 15,10.4477153 15,11 L15,14 C15,14.5522847 14.5522847,15 14,15 L5,15 C4.44771525,15 4,14.5522847 4,14 L4,11 C4,10.4477153 4.44771525,10 5,10 Z M6,6 L16,6 L16,5 L6,5 L6,6 Z M6,13 L13,13 L13,12 L6,12 L6,13 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_条件属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M1,6 L2.5,6 C2.77614237,6 3,5.77614237 3,5.5 C3,5.22385763 2.77614237,5 2.5,5 L0.5,5 C0.361928813,5 0.236928813,5.05596441 0.146446609,5.14644661 C0.0559644063,5.23692881 0,5.36192881 0,5.5 L0,12.5 C0,12.6380712 0.0559644063,12.7630712 0.146446609,12.8535534 C0.236928813,12.9440356 0.361928813,13 0.5,13 L2.5,13 C2.77614237,13 3,12.7761424 3,12.5 C3,12.2238576 2.77614237,12 2.5,12 L1,12 L1,6 Z M5,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,7 C18,7.55228475 17.5522847,8 17,8 L5,8 C4.44771525,8 4,7.55228475 4,7 L4,4 C4,3.44771525 4.44771525,3 5,3 Z M5,10 L14,10 C14.5522847,10 15,10.4477153 15,11 L15,14 C15,14.5522847 14.5522847,15 14,15 L5,15 C4.44771525,15 4,14.5522847 4,14 L4,11 C4,10.4477153 4.44771525,10 5,10 Z M6,6 L16,6 L16,5 L6,5 L6,6 Z M6,13 L13,13 L13,12 L6,12 L6,13 Z" id="Combined-Shape" fill="#62646E"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_条件属性_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M14.5,10 C14.7761424,10 15,10.2238576 15,10.5 L15,14.5 C15,14.7761424 14.7761424,15 14.5,15 L4.5,15 C4.22385763,15 4,14.7761424 4,14.5 L4,10.5 C4,10.2238576 4.22385763,10 4.5,10 L14.5,10 Z M2.5,5 C2.77614237,5 3,5.22385763 3,5.5 C3,5.77614237 2.77614237,6 2.5,6 L1,6 L1,12 L2.5,12 C2.77614237,12 3,12.2238576 3,12.5 C3,12.7761424 2.77614237,13 2.5,13 L0.5,13 C0.223857625,13 0,12.7761424 0,12.5 L0,5.5 C0,5.22385763 0.223857625,5 0.5,5 L2.5,5 Z M17.5,3 C17.7761424,3 18,3.22385763 18,3.5 L18,7.5 C18,7.77614237 17.7761424,8 17.5,8 L4.5,8 C4.22385763,8 4,7.77614237 4,7.5 L4,3.5 C4,3.22385763 4.22385763,3 4.5,3 L17.5,3 Z" id="Combined-Shape" fill="#419BF9"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_配置角色_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M4.01632125,15.58159 C5.15138437,15.8653558 6.77993827,16 8.7625,16 C10.754965,16 12.3653254,15.8634211 13.4725502,15.5731777 C13.9124868,15.4578545 14.231192,15.3277744 14.4125,15.2119576 C14.4125,15.1652894 14.4125,15.1548971 14.4125,15.13125 L14.4125,14.85 C14.4125,14.9557804 14.4200946,14.975694 14.3765447,14.9152512 C14.2506619,14.7405383 14.0239801,14.5217976 13.7118083,14.2899231 C13.0424081,13.792707 12.0970381,13.3197127 11.0993043,12.9850097 C9.49607329,12.6883775 8.50959183,10.7841703 9.20263379,8.70504447 L9.35193628,8.25713697 L9.68578682,7.92328644 C10.4105557,7.19851756 10.925,5.80034921 10.925,4.3875 C10.925,2.77389367 10.1213412,2 8.7625,2 C7.40365881,2 6.6,2.77389367 6.6,4.3875 C6.6,5.80409932 7.11195135,7.20102415 7.83421364,7.92328644 L8.12449186,8.21356466 L8.27695346,8.59471865 C8.89523505,10.1404226 8.35007114,11.5173382 7.22038505,12.3604538 C7.04790989,12.4891767 6.87469271,12.5964931 6.6948119,12.6928413 C6.59686449,12.7453041 6.49795664,12.7935942 6.45442713,12.8138544 L6.32729717,12.8774194 L6.19245547,12.9223666 C5.20751555,13.2506799 4.28915526,13.7335539 3.65828876,14.2481897 C3.38090155,14.4744712 3.18081392,14.6895331 3.06721218,14.8679092 C3.00991736,14.9578729 3,14.9878135 3,14.9625 C3,15.1239178 3,15.1763444 3,15.2063588 C3.20221523,15.3301561 3.54752216,15.4643902 4.01632125,15.58159 Z M11.1000004,9.3375 C10.6500004,10.6875 11.4275,11.025 11.54,11.025 C14.015,11.8125 16.4125,13.3875 16.4125,14.85 L16.4125,15.4125 C16.4125,17.55 12.475,18 8.7625,18 C5.05,18 1.1125,17.55 1,15.525 L1,14.9625 C1,13.3875 3.19749994,11.8125 5.55999994,11.025 C5.78499994,10.9125 6.87000008,10.4625 6.42000008,9.3375 C5.29500008,8.2125 4.6,6.3 4.6,4.3875 C4.6,1.4625 6.5125,0 8.7625,0 C11.0125,0 12.925,1.4625 12.925,4.3875 C12.925,6.3 12.2250004,8.2125 11.1000004,9.3375 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_配置角色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M4.01632125,15.58159 C5.15138437,15.8653558 6.77993827,16 8.7625,16 C10.754965,16 12.3653254,15.8634211 13.4725502,15.5731777 C13.9124868,15.4578545 14.231192,15.3277744 14.4125,15.2119576 C14.4125,15.1652894 14.4125,15.1548971 14.4125,15.13125 L14.4125,14.85 C14.4125,14.9557804 14.4200946,14.975694 14.3765447,14.9152512 C14.2506619,14.7405383 14.0239801,14.5217976 13.7118083,14.2899231 C13.0424081,13.792707 12.0970381,13.3197127 11.0993043,12.9850097 C9.49607329,12.6883775 8.50959183,10.7841703 9.20263379,8.70504447 L9.35193628,8.25713697 L9.68578682,7.92328644 C10.4105557,7.19851756 10.925,5.80034921 10.925,4.3875 C10.925,2.77389367 10.1213412,2 8.7625,2 C7.40365881,2 6.6,2.77389367 6.6,4.3875 C6.6,5.80409932 7.11195135,7.20102415 7.83421364,7.92328644 L8.12449186,8.21356466 L8.27695346,8.59471865 C8.89523505,10.1404226 8.35007114,11.5173382 7.22038505,12.3604538 C7.04790989,12.4891767 6.87469271,12.5964931 6.6948119,12.6928413 C6.59686449,12.7453041 6.49795664,12.7935942 6.45442713,12.8138544 L6.32729717,12.8774194 L6.19245547,12.9223666 C5.20751555,13.2506799 4.28915526,13.7335539 3.65828876,14.2481897 C3.38090155,14.4744712 3.18081392,14.6895331 3.06721218,14.8679092 C3.00991736,14.9578729 3,14.9878135 3,14.9625 C3,15.1239178 3,15.1763444 3,15.2063588 C3.20221523,15.3301561 3.54752216,15.4643902 4.01632125,15.58159 Z M11.1000004,9.3375 C10.6500004,10.6875 11.4275,11.025 11.54,11.025 C14.015,11.8125 16.4125,13.3875 16.4125,14.85 L16.4125,15.4125 C16.4125,17.55 12.475,18 8.7625,18 C5.05,18 1.1125,17.55 1,15.525 L1,14.9625 C1,13.3875 3.19749994,11.8125 5.55999994,11.025 C5.78499994,10.9125 6.87000008,10.4625 6.42000008,9.3375 C5.29500008,8.2125 4.6,6.3 4.6,4.3875 C4.6,1.4625 6.5125,0 8.7625,0 C11.0125,0 12.925,1.4625 12.925,4.3875 C12.925,6.3 12.2250004,8.2125 11.1000004,9.3375 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_配置角色_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M11.1000004,9.3375 C12.2250004,8.2125 12.925,6.3 12.925,4.3875 C12.925,1.4625 11.0125,0 8.7625,0 C6.5125,0 4.6,1.4625 4.6,4.3875 C4.6,6.3 5.29500008,8.2125 6.42000008,9.3375 C6.87000008,10.4625 5.78499994,10.9125 5.55999994,11.025 C3.19749994,11.8125 1,13.3875 1,14.9625 C1,15.4125 1,15.075 1,15.525 C1.1125,17.55 5.05,18 8.7625,18 C12.475,18 16.4125,17.55 16.4125,15.4125 C16.4125,14.9625 16.4125,15.3 16.4125,14.85 C16.4125,13.3875 14.015,11.8125 11.54,11.025 C11.4275,11.025 10.6500004,10.6875 11.1000004,9.3375 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_悬浮元素_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_悬浮元素_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#62646E"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.svg

@@ -5,4 +5,4 @@
         <path d="M3.10000002,1 C3.59705629,1 4,1.40294371 4,1.89999998 L4,2 L14,2 L14,1.89999998 C14,1.40294371 14.4029437,1 14.9,1 L15.1,1 C15.5970563,1 16,1.40294371 16,1.89999998 L16,2 L16.1,2 C16.5970563,2 17,2.40294371 17,2.89999998 L17,3.10000002 C17,3.59705629 16.5970563,4 16.1,4 L16,4 L16,14 L16.1,14 C16.5970563,14 17,14.4029437 17,14.9 L17,15.1 C17,15.5970563 16.5970563,16 16.1,16 L16,16 L16,16.1 C16,16.5970563 15.5970563,17 15.1,17 L14.9,17 C14.4029437,17 14,16.5970563 14,16.1 L14,16 L4,16 L4,16.1 C4,16.5970563 3.59705629,17 3.10000002,17 L2.89999998,17 C2.40294371,17 2,16.5970563 2,16.1 L2,16 L1.89999998,16 C1.40294371,16 1,15.5970563 1,15.1 L1,14.9 C1,14.4029437 1.40294371,14 1.89999998,14 L2,14 L2,4 L1.89999998,4 C1.40294371,4 1,3.59705629 1,3.10000002 L1,2.89999998 C1,2.40294371 1.40294371,2 1.89999998,2 L2,2 L2,1.89999998 C2,1.40294371 2.40294371,1 2.89999998,1 L3.10000002,1 Z M14,4 L4,4 L4,14 L14,14 L14,4 Z" id="Combined-Shape" fill="#419BF9"></path>
         <rect id="Rectangle-2" fill="#419BF9" x="5" y="5" width="8" height="8"></rect>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_超级链接_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M7.19238816,5.19238816 C7.74467291,5.19238816 8.19238816,5.64010341 8.19238816,6.19238816 C8.19238816,6.74467291 7.74467291,7.19238816 7.19238816,7.19238816 L7.19238816,7.19238816 L4.19238816,7.19238816 C3.08781866,7.19238816 2.19238816,8.08781866 2.19238816,9.19238816 C2.19238816,10.2969577 3.08781866,11.1923882 4.19238816,11.1923882 L4.19238816,11.1923882 L7.19238816,11.1923882 C7.74467291,11.1923882 8.19238816,11.6401034 8.19238816,12.1923882 C8.19238816,12.7446729 7.74467291,13.1923882 7.19238816,13.1923882 L7.19238816,13.1923882 L4.19238816,13.1923882 C1.98324916,13.1923882 0.192388155,11.4015272 0.192388155,9.19238816 C0.192388155,6.98324916 1.98324916,5.19238816 4.19238816,5.19238816 L4.19238816,5.19238816 Z M14.1923882,5.19238816 C16.4015272,5.19238816 18.1923882,6.98324916 18.1923882,9.19238816 C18.1923882,11.4015272 16.4015272,13.1923882 14.1923882,13.1923882 L11.1923882,13.1923882 C10.6401034,13.1923882 10.1923882,12.7446729 10.1923882,12.1923882 C10.1923882,11.6401034 10.6401034,11.1923882 11.1923882,11.1923882 L14.1923882,11.1923882 C15.2969577,11.1923882 16.1923882,10.2969577 16.1923882,9.19238816 C16.1923882,8.08781866 15.2969577,7.19238816 14.1923882,7.19238816 L11.1923882,7.19238816 C10.6401034,7.19238816 10.1923882,6.74467291 10.1923882,6.19238816 C10.1923882,5.64010341 10.6401034,5.19238816 11.1923882,5.19238816 L14.1923882,5.19238816 Z M12.1923882,8.19238816 C12.7446729,8.19238816 13.1923882,8.64010341 13.1923882,9.19238816 C13.1923882,9.74467291 12.7446729,10.1923882 12.1923882,10.1923882 L6.19238816,10.1923882 C5.64010341,10.1923882 5.19238816,9.74467291 5.19238816,9.19238816 C5.19238816,8.64010341 5.64010341,8.19238816 6.19238816,8.19238816 L12.1923882,8.19238816 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero" transform="translate(9.192388, 9.192388) rotate(45.000000) translate(-9.192388, -9.192388) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_超级链接_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7,5 C7.55228475,5 8,5.44771525 8,6 C8,6.55228475 7.55228475,7 7,7 L7,7 L4,7 C2.8954305,7 2,7.8954305 2,9 C2,10.1045695 2.8954305,11 4,11 L4,11 L7,11 C7.55228475,11 8,11.4477153 8,12 C8,12.5522847 7.55228475,13 7,13 L7,13 L4,13 C1.790861,13 0,11.209139 0,9 C0,6.790861 1.790861,5 4,5 L4,5 Z M14,5 C16.209139,5 18,6.790861 18,9 C18,11.209139 16.209139,13 14,13 L11,13 C10.4477153,13 10,12.5522847 10,12 C10,11.4477153 10.4477153,11 11,11 L14,11 C15.1045695,11 16,10.1045695 16,9 C16,7.8954305 15.1045695,7 14,7 L11,7 C10.4477153,7 10,6.55228475 10,6 C10,5.44771525 10.4477153,5 11,5 L14,5 Z M12,8 C12.5522847,8 13,8.44771525 13,9 C13,9.55228475 12.5522847,10 12,10 L6,10 C5.44771525,10 5,9.55228475 5,9 C5,8.44771525 5.44771525,8 6,8 L12,8 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero" transform="translate(9.000000, 9.000000) rotate(45.000000) translate(-9.000000, -9.000000) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_超级链接_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7.19238816,5.19238816 C7.74467291,5.19238816 8.19238816,5.64010341 8.19238816,6.19238816 C8.19238816,6.74467291 7.74467291,7.19238816 7.19238816,7.19238816 L7.19238816,7.19238816 L4.19238816,7.19238816 C3.08781866,7.19238816 2.19238816,8.08781866 2.19238816,9.19238816 C2.19238816,10.2969577 3.08781866,11.1923882 4.19238816,11.1923882 L4.19238816,11.1923882 L7.19238816,11.1923882 C7.74467291,11.1923882 8.19238816,11.6401034 8.19238816,12.1923882 C8.19238816,12.7446729 7.74467291,13.1923882 7.19238816,13.1923882 L7.19238816,13.1923882 L4.19238816,13.1923882 C1.98324916,13.1923882 0.192388155,11.4015272 0.192388155,9.19238816 C0.192388155,6.98324916 1.98324916,5.19238816 4.19238816,5.19238816 L4.19238816,5.19238816 Z M14.1923882,5.19238816 C16.4015272,5.19238816 18.1923882,6.98324916 18.1923882,9.19238816 C18.1923882,11.4015272 16.4015272,13.1923882 14.1923882,13.1923882 L11.1923882,13.1923882 C10.6401034,13.1923882 10.1923882,12.7446729 10.1923882,12.1923882 C10.1923882,11.6401034 10.6401034,11.1923882 11.1923882,11.1923882 L14.1923882,11.1923882 C15.2969577,11.1923882 16.1923882,10.2969577 16.1923882,9.19238816 C16.1923882,8.08781866 15.2969577,7.19238816 14.1923882,7.19238816 L11.1923882,7.19238816 C10.6401034,7.19238816 10.1923882,6.74467291 10.1923882,6.19238816 C10.1923882,5.64010341 10.6401034,5.19238816 11.1923882,5.19238816 L14.1923882,5.19238816 Z M12.1923882,8.19238816 C12.7446729,8.19238816 13.1923882,8.64010341 13.1923882,9.19238816 C13.1923882,9.74467291 12.7446729,10.1923882 12.1923882,10.1923882 L6.19238816,10.1923882 C5.64010341,10.1923882 5.19238816,9.74467291 5.19238816,9.19238816 C5.19238816,8.64010341 5.64010341,8.19238816 6.19238816,8.19238816 L12.1923882,8.19238816 Z" id="Combined-Shape" stroke="#419BF9" stroke-width="0.5" fill="#419BF9" fill-rule="nonzero" transform="translate(9.192388, 9.192388) rotate(45.000000) translate(-9.192388, -9.192388) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_组件库_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M8,11 L3,11 L3,14 L8,14 L8,11 Z M15,11 L13,11 L13,14 L15,14 L15,11 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z M15,4 L3,4 L3,6 L15,6 L15,4 Z" id="形状" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_组件库_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M8,11 L3,11 L3,14 L8,14 L8,11 Z M15,11 L13,11 L13,14 L15,14 L15,11 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z M15,4 L3,4 L3,6 L15,6 L15,4 Z" id="形状" fill="#62646E" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_组件库_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9.5,9 C9.77614237,9 10,9.22385763 10,9.5 L10,15.5 C10,15.7761424 9.77614237,16 9.5,16 L1.5,16 C1.22385763,16 1,15.7761424 1,15.5 L1,9.5 C1,9.22385763 1.22385763,9 1.5,9 L9.5,9 Z M16.5,9 C16.7761424,9 17,9.22385763 17,9.5 L17,15.5 C17,15.7761424 16.7761424,16 16.5,16 L11.5,16 C11.2238576,16 11,15.7761424 11,15.5 L11,9.5 C11,9.22385763 11.2238576,9 11.5,9 L16.5,9 Z M16.5,2 C16.7761424,2 17,2.22385763 17,2.5 L17,7.5 C17,7.77614237 16.7761424,8 16.5,8 L1.5,8 C1.22385763,8 1,7.77614237 1,7.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L16.5,2 Z" id="形状结合" fill="#419BF9" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_控件设置_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M16.1,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M15,5 L3,5 L3,13 L15,13 L15,5 Z M13.4587257,7 C13.6244111,7 13.7587257,7.13431458 13.7587257,7.3 C13.7587257,7.35622591 13.7429249,7.4113202 13.7131252,7.45899968 L11.6695997,10.7286405 C11.6110576,10.8223078 11.4876675,10.8507825 11.3940002,10.7922404 C11.3682464,10.7761443 11.3464965,10.7543944 11.3304003,10.7286405 L9.2868748,7.45899968 C9.1990617,7.31849872 9.24177365,7.13341361 9.38227461,7.04560051 C9.42995409,7.01580083 9.48504838,7 9.54127429,7 L13.4587257,7 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_控件设置_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16.1,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M15,5 L3,5 L3,13 L15,13 L15,5 Z M13.4587257,7 C13.6244111,7 13.7587257,7.13431458 13.7587257,7.3 C13.7587257,7.35622591 13.7429249,7.4113202 13.7131252,7.45899968 L11.6695997,10.7286405 C11.6110576,10.8223078 11.4876675,10.8507825 11.3940002,10.7922404 C11.3682464,10.7761443 11.3464965,10.7543944 11.3304003,10.7286405 L9.2868748,7.45899968 C9.1990617,7.31849872 9.24177365,7.13341361 9.38227461,7.04560051 C9.42995409,7.01580083 9.48504838,7 9.54127429,7 L13.4587257,7 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.svg

@@ -4,4 +4,4 @@
     <g id="icon_属性_控件设置_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16.1,3 C16.5970563,3 17,3.40294371 17,3.89999998 L17,14.1 C17,14.5970563 16.5970563,15 16.1,15 L1.89999998,15 C1.40294371,15 1,14.5970563 1,14.1 L1,3.89999998 C1,3.40294371 1.40294371,3 1.89999998,3 L16.1,3 Z M13.4587257,7 L9.54127429,7 C9.48504838,7 9.42995409,7.01580083 9.38227461,7.04560051 C9.24177365,7.13341361 9.1990617,7.31849872 9.2868748,7.45899968 L9.2868748,7.45899968 L11.3304003,10.7286405 C11.3464965,10.7543944 11.3682464,10.7761443 11.3940002,10.7922404 C11.4876675,10.8507825 11.6110576,10.8223078 11.6695997,10.7286405 L11.6695997,10.7286405 L13.7131252,7.45899968 C13.7429249,7.4113202 13.7587257,7.35622591 13.7587257,7.3 C13.7587257,7.13431458 13.6244111,7 13.4587257,7 L13.4587257,7 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#79B2EE" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16_normal.svg

@@ -7,4 +7,4 @@
         <rect id="Rectangle-75" fill="#333334" x="2" y="6" width="12" height="1"></rect>
         <rect id="Rectangle" fill="#333334" x="5" y="2" width="1" height="12"></rect>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg

@@ -9,4 +9,4 @@
             <rect id="Rectangle-110-Copy" fill="#FFFFFF" x="2" y="13" width="7" height="1" rx="0.5"></rect>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg

@@ -9,4 +9,4 @@
             <rect id="Rectangle-110-Copy" fill="#FFFFFF" x="2" y="13" width="7" height="1" rx="0.5"></rect>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#79B2EE"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_按钮_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M1,4 L1,10 L15,10 L15,4 L1,4 Z M16,12 L16,13 L1,13 L1,12 L16,12 Z M16,3 L16,11 L0,11 L0,3 L16,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_单选框组_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M3.5,9 C5.43299662,9 7,10.5670034 7,12.5 C7,14.4329966 5.43299662,16 3.5,16 C1.56700338,16 0,14.4329966 0,12.5 C0,10.5670034 1.56700338,9 3.5,9 Z M3.5,10 C2.11928813,10 1,11.1192881 1,12.5 C1,13.8807119 2.11928813,15 3.5,15 C4.88071187,15 6,13.8807119 6,12.5 C6,11.1192881 4.88071187,10 3.5,10 Z M3.5,11 C4.32842712,11 5,11.6715729 5,12.5 C5,13.3284271 4.32842712,14 3.5,14 C2.67157288,14 2,13.3284271 2,12.5 C2,11.6715729 2.67157288,11 3.5,11 Z M14.5,12 C14.7761424,12 15,12.2238576 15,12.5 C15,12.7761424 14.7761424,13 14.5,13 L8.5,13 C8.22385763,13 8,12.7761424 8,12.5 C8,12.2238576 8.22385763,12 8.5,12 L14.5,12 Z M3.5,0 C5.43299662,0 7,1.56700338 7,3.5 C7,5.43299662 5.43299662,7 3.5,7 C1.56700338,7 0,5.43299662 0,3.5 C0,1.56700338 1.56700338,0 3.5,0 Z M3.5,1 C2.11928813,1 1,2.11928813 1,3.5 C1,4.88071187 2.11928813,6 3.5,6 C4.88071187,6 6,4.88071187 6,3.5 C6,2.11928813 4.88071187,1 3.5,1 Z M3.5,2 C4.32842712,2 5,2.67157288 5,3.5 C5,4.32842712 4.32842712,5 3.5,5 C2.67157288,5 2,4.32842712 2,3.5 C2,2.67157288 2.67157288,2 3.5,2 Z M14.5,3 C14.7761424,3 15,3.22385763 15,3.5 C15,3.77614237 14.7761424,4 14.5,4 L8.5,4 C8.22385763,4 8,3.77614237 8,3.5 C8,3.22385763 8.22385763,3 8.5,3 L14.5,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_复选框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6,5 C6.55228475,5 7,5.44771525 7,6 L7,11 C7,11.5522847 6.55228475,12 6,12 L1,12 C0.44771525,12 0,11.5522847 0,11 L0,6 C0,5.44771525 0.44771525,5 1,5 L6,5 Z M6,6 L1,6 L1,11 L6,11 L6,6 Z M4.58397485,6.7226499 C4.73715108,6.49288556 5.04758575,6.43079862 5.2773501,6.58397485 C5.50711444,6.73715108 5.56920138,7.04758575 5.41602515,7.2773501 L5.41602515,7.2773501 L3.41602515,10.2773501 C3.24100436,10.5398813 2.86955521,10.576662 2.64644661,10.3535534 L2.64644661,10.3535534 L1.64644661,9.35355339 C1.45118446,9.15829124 1.45118446,8.84170876 1.64644661,8.64644661 C1.84170876,8.45118446 2.15829124,8.45118446 2.35355339,8.64644661 L2.35355339,8.64644661 L2.92228758,9.2151808 Z M14.5,8 C14.7761424,8 15,8.22385763 15,8.5 C15,8.77614237 14.7761424,9 14.5,9 L8.5,9 C8.22385763,9 8,8.77614237 8,8.5 C8,8.22385763 8.22385763,8 8.5,8 L14.5,8 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_复选框组_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6,9 C6.55228475,9 7,9.44771525 7,10 L7,15 C7,15.5522847 6.55228475,16 6,16 L1,16 C0.44771525,16 -1.11022302e-16,15.5522847 -1.11022302e-16,15 L-1.11022302e-16,10 C-1.11022302e-16,9.44771525 0.44771525,9 1,9 L6,9 Z M6,10 L1,10 L1,15 L6,15 L6,10 Z M4.58397485,10.7226499 C4.73715108,10.4928856 5.04758575,10.4307986 5.2773501,10.5839749 C5.50711444,10.7371511 5.56920138,11.0475858 5.41602515,11.2773501 L5.41602515,11.2773501 L3.41602515,14.2773501 C3.24100436,14.5398813 2.86955521,14.576662 2.64644661,14.3535534 L2.64644661,14.3535534 L1.64644661,13.3535534 C1.45118446,13.1582912 1.45118446,12.8417088 1.64644661,12.6464466 C1.84170876,12.4511845 2.15829124,12.4511845 2.35355339,12.6464466 L2.35355339,12.6464466 L2.92228758,13.2151808 Z M14.5,12 C14.7761424,12 15,12.2238576 15,12.5 C15,12.7761424 14.7761424,13 14.5,13 L8.5,13 C8.22385763,13 8,12.7761424 8,12.5 C8,12.2238576 8.22385763,12 8.5,12 L14.5,12 Z M6,-1.11022302e-16 C6.55228475,-1.11022302e-16 7,0.44771525 7,1 L7,6 C7,6.55228475 6.55228475,7 6,7 L1,7 C0.44771525,7 -1.11022302e-16,6.55228475 -1.11022302e-16,6 L-1.11022302e-16,1 C-1.11022302e-16,0.44771525 0.44771525,-1.11022302e-16 1,-1.11022302e-16 L6,-1.11022302e-16 Z M6,1 L1,1 L1,6 L6,6 L6,1 Z M4.58397485,1.7226499 C4.73715108,1.49288556 5.04758575,1.43079862 5.2773501,1.58397485 C5.50711444,1.73715108 5.56920138,2.04758575 5.41602515,2.2773501 L5.41602515,2.2773501 L3.41602515,5.2773501 C3.24100436,5.53988128 2.86955521,5.57666199 2.64644661,5.35355339 L2.64644661,5.35355339 L1.64644661,4.35355339 C1.45118446,4.15829124 1.45118446,3.84170876 1.64644661,3.64644661 C1.84170876,3.45118446 2.15829124,3.45118446 2.35355339,3.64644661 L2.35355339,3.64644661 L2.92228758,4.2151808 Z M14.5,3 C14.7761424,3 15,3.22385763 15,3.5 C15,3.77614237 14.7761424,4 14.5,4 L8.5,4 C8.22385763,4 8,3.77614237 8,3.5 C8,3.22385763 8.22385763,3 8.5,3 L14.5,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_下拉框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M13.6,6 C13.7104569,6 13.8,6.08954305 13.8,6.2 C13.8,6.24327405 13.7859644,6.28538077 13.76,6.32 L11.16,9.78666666 C11.0937258,9.87503222 10.9683656,9.89294084 10.88,9.82666666 C10.8648389,9.81529581 10.8513708,9.8018278 10.84,9.78666666 L8.24,6.32 C8.17372583,6.23163444 8.19163444,6.10627417 8.28,6.04 C8.31461924,6.01403557 8.35672596,6 8.40000001,6 L13.6,6 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_下拉复选框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,0 L16,16 L0,16 L0,0 L16,0 Z M15,6 L1,6 L1,15 L15,15 L15,6 Z M6,11 L6,14 L3,14 L3,11 L6,11 Z M5,12 L4,12 L4,13 L5,13 L5,12 Z M6,7 L6,10 L3,10 L3,7 L6,7 Z M5,8 L4,8 L4,9 L5,9 L5,8 Z M15,1 L1,1 L1,5 L15,5 L15,1 Z M13.5171573,2 C13.6276142,2 13.7171573,2.08954305 13.7171573,2.2 C13.7171573,2.2530433 13.6960859,2.30391409 13.6585786,2.34142136 L12.1414214,3.85857864 C12.0633165,3.9366835 11.9366835,3.9366835 11.8585786,3.85857864 L10.3414214,2.34142136 C10.2633165,2.2633165 10.2633165,2.1366835 10.3414214,2.05857864 C10.3789286,2.02107137 10.4297994,2 10.4828427,2 L13.5171573,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_下拉树_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,0 L16,16 L0,16 L0,0 L16,0 Z M15,6 L1,6 L1,15 L15,15 L15,6 Z M13,13 L13,14 L6,14 L6,13 L13,13 Z M10.7504883,11 L10.7504883,12 L3,12 L3,11 L10.7504883,11 Z M13,9 L13,10 L6,10 L6,9 L13,9 Z M10.7504883,7 L10.7504883,8 L3,8 L3,7 L10.7504883,7 Z M15,1 L1,1 L1,5 L15,5 L15,1 Z M13.5171573,2 C13.6276142,2 13.7171573,2.08954305 13.7171573,2.2 C13.7171573,2.2530433 13.6960859,2.30391409 13.6585786,2.34142136 L12.1414214,3.85857864 C12.0633165,3.9366835 11.9366835,3.9366835 11.8585786,3.85857864 L10.3414214,2.34142136 C10.2633165,2.2633165 10.2633165,2.1366835 10.3414214,2.05857864 C10.3789286,2.02107137 10.4297994,2 10.4828427,2 L13.5171573,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_日期_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,-2.22044605e-16 L16,16 L8.8817842e-16,16 L8.8817842e-16,-2.22044605e-16 L16,-2.22044605e-16 Z M15,4 L1,4 L1,15 L15,15 L15,4 Z M7,12 L7,14 L5,14 L5,12 L7,12 Z M4,12 L4,14 L2,14 L2,12 L4,12 Z M10,12 L10,14 L8,14 L8,12 L10,12 Z M7,9 L7,11 L5,11 L5,9 L7,9 Z M4,9 L4,11 L2,11 L2,9 L4,9 Z M10,9 L10,11 L8,11 L8,9 L10,9 Z M13,9 L13,11 L11,11 L11,9 L13,9 Z M7,6 L7,8 L5,8 L5,6 L7,6 Z M10,6 L10,8 L8,8 L8,6 L10,6 Z M13,6 L13,8 L11,8 L11,6 L13,6 Z M13,1.5 C13,1.77614237 12.7761424,2 12.5,2 L10.5,2 C10.2238576,2 10,1.77614237 10,1.5 L10,1 L6,1 L6,1.5 C6,1.77614237 5.77614237,2 5.5,2 L3.5,2 C3.22385763,2 3,1.77614237 3,1.5 L3,1 L1,1 L1,3 L15,3 L15,1 L13,1 L13,1.5 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_标签_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M6.41015625,6.53125 C6.71744945,6.53125 6.9850249,6.55664037 7.21289062,6.60742188 C7.44075635,6.65820338 7.63802,6.74479105 7.8046875,6.8671875 C7.96875082,6.98697977 8.09374957,7.14192613 8.1796875,7.33203125 C8.26562543,7.52213637 8.30859375,7.75781109 8.30859375,8.0390625 L8.30859375,11 L7.578125,11 L7.578125,10.5351562 C7.51302051,10.5794273 7.42513076,10.6412756 7.31445312,10.7207031 C7.20377549,10.8001306 7.09635469,10.863281 6.9921875,10.9101562 C6.86979105,10.9700524 6.72916746,11.0201821 6.5703125,11.0605469 C6.41145754,11.1009117 6.22526148,11.1210938 6.01171875,11.1210938 C5.61848762,11.1210938 5.28515762,10.9908867 5.01171875,10.7304688 C4.73827988,10.4700508 4.6015625,10.1380229 4.6015625,9.734375 C4.6015625,9.40364418 4.67252533,9.13606873 4.81445312,8.93164062 C4.95638092,8.72721252 5.15885285,8.56640684 5.421875,8.44921875 C5.68750133,8.33203066 6.00650855,8.25260438 6.37890625,8.2109375 C6.75130395,8.16927062 7.15103953,8.13802094 7.578125,8.1171875 L7.578125,8.00390625 C7.578125,7.83723875 7.54882842,7.6992193 7.49023438,7.58984375 C7.43164033,7.4804682 7.3476568,7.39453156 7.23828125,7.33203125 C7.13411406,7.27213512 7.00911531,7.23177094 6.86328125,7.2109375 C6.71744719,7.19010406 6.56510496,7.1796875 6.40625,7.1796875 C6.2135407,7.1796875 5.9986991,7.20507787 5.76171875,7.25585938 C5.5247384,7.30664088 5.27994918,7.38020785 5.02734375,7.4765625 L4.98828125,7.4765625 L4.98828125,6.73046875 C5.13151113,6.69140605 5.33854031,6.64843773 5.609375,6.6015625 C5.88020969,6.55468727 6.1471341,6.53125 6.41015625,6.53125 Z M10.4570312,4.921875 L10.4570312,7.09375 C10.6627614,6.92447832 10.8815093,6.78580783 11.1132812,6.67773438 C11.3450532,6.56966092 11.6054673,6.515625 11.8945312,6.515625 C12.4101588,6.515625 12.8170558,6.71353969 13.1152344,7.109375 C13.4134129,7.50521031 13.5625,8.06379848 13.5625,8.78515625 C13.5625,9.14974141 13.5110682,9.47786312 13.4082031,9.76953125 C13.305338,10.0611994 13.1666675,10.3059886 12.9921875,10.5039062 C12.8072907,10.7096364 12.6041678,10.8639318 12.3828125,10.9667969 C12.1614572,11.069662 11.9179701,11.1210938 11.6523438,11.1210938 C11.4049467,11.1210938 11.188803,11.0917972 11.0039062,11.0332031 C10.8190095,10.9746091 10.6367196,10.8958338 10.4570312,10.796875 L10.4101562,11 L9.72265625,11 L9.72265625,4.921875 L10.4570312,4.921875 Z M3.46484375,4.921875 L3.46484375,11 L2.73046875,11 L2.73046875,4.921875 L3.46484375,4.921875 Z M11.7148438,7.21484375 C11.501301,7.21484375 11.2851573,7.26106725 11.0664062,7.35351562 C10.8476552,7.445964 10.6445322,7.56510344 10.4570312,7.7109375 L10.4570312,10.2109375 C10.6653656,10.304688 10.8444003,10.3697915 10.9941406,10.40625 C11.143881,10.4427085 11.3138011,10.4609375 11.5039062,10.4609375 C11.9101583,10.4609375 12.2285145,10.3274753 12.4589844,10.0605469 C12.6894543,9.79361846 12.8046875,9.37500285 12.8046875,8.8046875 C12.8046875,8.28385156 12.7187509,7.88867322 12.546875,7.61914062 C12.3749991,7.34960803 12.0976582,7.21484375 11.7148438,7.21484375 Z M7.578125,8.7109375 C7.35416555,8.7239584 7.09049631,8.74348945 6.78710938,8.76953125 C6.48372244,8.79557305 6.24349047,8.83333309 6.06640625,8.8828125 C5.8554677,8.94270863 5.68489648,9.03580666 5.5546875,9.16210938 C5.42447852,9.28841209 5.359375,9.46223848 5.359375,9.68359375 C5.359375,9.933595 5.43489508,10.1217442 5.5859375,10.2480469 C5.73697992,10.3743496 5.96744637,10.4375 6.27734375,10.4375 C6.53515754,10.4375 6.77083227,10.3873703 6.984375,10.2871094 C7.19791773,10.1868485 7.39583242,10.066407 7.578125,9.92578125 L7.578125,8.7109375 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_数字_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z M12.6289062,5.0625 C12.9127618,5.0625 13.1627593,5.08854141 13.3789062,5.140625 C13.5950532,5.19270859 13.7903637,5.27604109 13.9648438,5.390625 C14.1523447,5.51562563 14.2942704,5.66666578 14.390625,5.84375 C14.4869796,6.02083422 14.5351562,6.2278634 14.5351562,6.46484375 C14.5351562,6.78776203 14.4212251,7.06966025 14.1933594,7.31054688 C13.9654937,7.5514335 13.6966161,7.70312469 13.3867188,7.765625 L13.3867188,7.8203125 C13.5117194,7.84114594 13.6549471,7.88476529 13.8164062,7.95117188 C13.9778654,8.01757846 14.1145828,8.10025992 14.2265625,8.19921875 C14.3515631,8.31119848 14.4544267,8.45182207 14.5351562,8.62109375 C14.6158858,8.79036543 14.65625,9.00911324 14.65625,9.27734375 C14.65625,9.54297008 14.6080734,9.78645723 14.5117188,10.0078125 C14.4153641,10.2291678 14.2799488,10.4218742 14.1054688,10.5859375 C13.9101553,10.7682301 13.6803399,10.9029944 13.4160156,10.9902344 C13.1516914,11.0774744 12.8619807,11.1210938 12.546875,11.1210938 C12.2239567,11.1210938 11.9062516,11.0826827 11.59375,11.0058594 C11.2812484,10.9290361 11.0247406,10.8450525 10.8242188,10.7539062 L10.8242188,9.9375 L10.8828125,9.9375 C11.1041678,10.0833341 11.3645818,10.2044266 11.6640625,10.3007812 C11.9635432,10.3971359 12.2526028,10.4453125 12.53125,10.4453125 C12.6953133,10.4453125 12.8697907,10.417969 13.0546875,10.3632812 C13.2395843,10.3085935 13.3893223,10.2278651 13.5039062,10.1210938 C13.6236985,10.0065098 13.7128903,9.88020902 13.7714844,9.7421875 C13.8300784,9.60416598 13.859375,9.42968855 13.859375,9.21875 C13.859375,9.01041563 13.8261722,8.83789131 13.7597656,8.70117188 C13.693359,8.56445244 13.6015631,8.45703164 13.484375,8.37890625 C13.3671869,8.29817668 13.2252612,8.24283869 13.0585938,8.21289062 C12.8919263,8.18294256 12.7122405,8.16796875 12.5195312,8.16796875 L12.1679688,8.16796875 L12.1679688,7.51953125 L12.4414062,7.51953125 C12.8372416,7.51953125 13.1529936,7.43684979 13.3886719,7.27148438 C13.6243501,7.10611896 13.7421875,6.86458492 13.7421875,6.546875 C13.7421875,6.4062493 13.7122399,6.28320365 13.6523438,6.17773438 C13.5924476,6.0722651 13.5091151,5.98567742 13.4023438,5.91796875 C13.290364,5.85026008 13.1705736,5.80338555 13.0429688,5.77734375 C12.9153639,5.75130195 12.7708341,5.73828125 12.609375,5.73828125 C12.3619779,5.73828125 12.0989597,5.78255164 11.8203125,5.87109375 C11.5416653,5.95963586 11.2786471,6.08463461 11.03125,6.24609375 L10.9921875,6.24609375 L10.9921875,5.4296875 C11.1770843,5.33854121 11.4238266,5.25455768 11.7324219,5.17773438 C12.0410172,5.10091107 12.3398423,5.0625 12.6289062,5.0625 Z M3.046875,5.1640625 L3.046875,10.40625 L4.234375,10.40625 L4.234375,11 L1.0859375,11 L1.0859375,10.40625 L2.296875,10.40625 L2.296875,6.5078125 L1.0859375,6.5078125 L1.0859375,5.9765625 C1.25000082,5.9765625 1.42578031,5.96289076 1.61328125,5.93554688 C1.80078219,5.90820299 1.94270785,5.86848984 2.0390625,5.81640625 C2.15885477,5.75130176 2.25325486,5.66862029 2.32226562,5.56835938 C2.39127639,5.46809846 2.43098953,5.33333418 2.44140625,5.1640625 L3.046875,5.1640625 Z M7.49609375,5.0625 C8.0924509,5.0625 8.55989414,5.20637877 8.8984375,5.49414062 C9.23698086,5.78190248 9.40625,6.17187254 9.40625,6.6640625 C9.40625,6.88541777 9.37825549,7.09179592 9.32226562,7.28320312 C9.26627576,7.47461033 9.1835943,7.65624914 9.07421875,7.828125 C8.97265574,7.98958414 8.85351631,8.14843672 8.71679688,8.3046875 C8.58007744,8.46093828 8.41406348,8.63411363 8.21875,8.82421875 C7.94010277,9.09765762 7.65234523,9.36262893 7.35546875,9.61914062 C7.05859227,9.87565232 6.78125129,10.1132802 6.5234375,10.3320312 L9.65234375,10.3320312 L9.65234375,11 L5.71484375,11 L5.71484375,10.1835938 C5.98828262,9.94921758 6.26236842,9.71484492 6.53710938,9.48046875 C6.81185033,9.24609258 7.06770715,9.01302199 7.3046875,8.78125 C7.80469,8.29687258 8.14713449,7.9121108 8.33203125,7.62695312 C8.51692801,7.34179545 8.609375,7.03385582 8.609375,6.703125 C8.609375,6.40104016 8.50976662,6.16471439 8.31054688,5.99414062 C8.11132713,5.82356686 7.83333512,5.73828125 7.4765625,5.73828125 C7.23958215,5.73828125 6.9830743,5.7799475 6.70703125,5.86328125 C6.4309882,5.946615 6.16145965,6.07421789 5.8984375,6.24609375 L5.859375,6.24609375 L5.859375,5.42578125 C6.04427176,5.33463496 6.29101408,5.25130246 6.59960938,5.17578125 C6.90820467,5.10026004 7.2070298,5.0625 7.49609375,5.0625 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg

@@ -5,4 +5,4 @@
         <path d="M16,3 L16,13 L0,13 L0,3 L16,3 Z M15,4 L1,4 L1,12 L15,12 L15,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
         <path d="M5.09375,8.8125 L4.66015625,9.45703125 L3.41015625,8.60546875 L3.453125,9.9921875 L2.62109375,9.9921875 L2.65234375,8.640625 L1.42578125,9.4609375 L1,8.8125 L2.38671875,7.99609375 L1.00390625,7.171875 L1.42578125,6.51953125 L2.6484375,7.3515625 L2.62109375,6 L3.44921875,6 L3.41796875,7.35546875 L4.65625,6.53125 L5.08984375,7.1796875 L3.69140625,7.9921875 L5.09375,8.8125 Z M10.1953125,8.8125 L9.76171875,9.45703125 L8.51171875,8.60546875 L8.5546875,9.9921875 L7.72265625,9.9921875 L7.75390625,8.640625 L6.52734375,9.4609375 L6.1015625,8.8125 L7.48828125,7.99609375 L6.10546875,7.171875 L6.52734375,6.51953125 L7.75,7.3515625 L7.72265625,6 L8.55078125,6 L8.51953125,7.35546875 L9.7578125,6.53125 L10.1914062,7.1796875 L8.79296875,7.9921875 L10.1953125,8.8125 Z M15.296875,8.8125 L14.8632812,9.45703125 L13.6132812,8.60546875 L13.65625,9.9921875 L12.8242188,9.9921875 L12.8554688,8.640625 L11.6289062,9.4609375 L11.203125,8.8125 L12.5898438,7.99609375 L11.2070312,7.171875 L11.6289062,6.51953125 L12.8515625,7.3515625 L12.8242188,6 L13.6523438,6 L13.6210938,7.35546875 L14.859375,6.53125 L15.2929688,7.1796875 L13.8945312,7.9921875 L15.296875,8.8125 Z" id="***" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_文本域_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15,0 C15.5522847,0 16,0.44771525 16,1 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 0,15.5522847 0,15 L0,1 C0,0.44771525 0.44771525,0 1,0 L15,0 Z M15,1 L1,1 L1,15 L15,15 L15,1 Z M3.23046875,2 L3.23046875,3.25390625 L4.74609375,3.25390625 L4.74609375,3.87109375 L3.23046875,3.87109375 L3.23046875,5.859375 C3.23046875,6.08854281 3.23567703,6.26757748 3.24609375,6.39648438 C3.25651047,6.52539127 3.29296844,6.64583277 3.35546875,6.7578125 C3.4127607,6.86197969 3.49153596,6.9381508 3.59179688,6.98632812 C3.69205779,7.03450545 3.84505105,7.05859375 4.05078125,7.05859375 C4.17057352,7.05859375 4.29557227,7.0410158 4.42578125,7.00585938 C4.55599023,6.97070295 4.6497393,6.94140637 4.70703125,6.91796875 L4.74609375,6.91796875 L4.74609375,7.578125 C4.60807223,7.61458352 4.45768311,7.64453113 4.29492188,7.66796875 C4.13216064,7.69140637 3.9869798,7.703125 3.859375,7.703125 C3.41406027,7.703125 3.07552199,7.58333453 2.84375,7.34375 C2.61197801,7.10416547 2.49609375,6.72005473 2.49609375,6.19140625 L2.49609375,3.87109375 L2,3.87109375 L2,3.25390625 L2.49609375,3.25390625 L2.49609375,2 L3.23046875,2 Z M11.1171875,2 L11.1171875,3.25390625 L12.6328125,3.25390625 L12.6328125,3.87109375 L11.1171875,3.87109375 L11.1171875,5.859375 C11.1171875,6.08854281 11.1223958,6.26757748 11.1328125,6.39648438 C11.1432292,6.52539127 11.1796872,6.64583277 11.2421875,6.7578125 C11.2994795,6.86197969 11.3782547,6.9381508 11.4785156,6.98632812 C11.5787765,7.03450545 11.7317698,7.05859375 11.9375,7.05859375 C12.0572923,7.05859375 12.182291,7.0410158 12.3125,7.00585938 C12.442709,6.97070295 12.536458,6.94140637 12.59375,6.91796875 L12.6328125,6.91796875 L12.6328125,7.578125 C12.494791,7.61458352 12.3444019,7.64453113 12.1816406,7.66796875 C12.0188794,7.69140637 11.8736986,7.703125 11.7460938,7.703125 C11.300779,7.703125 10.9622407,7.58333453 10.7304688,7.34375 C10.4986968,7.10416547 10.3828125,6.72005473 10.3828125,6.19140625 L10.3828125,3.87109375 L9.88671875,3.87109375 L9.88671875,3.25390625 L10.3828125,3.25390625 L10.3828125,2 L11.1171875,2 Z M6.0859375,3.25390625 L7.31640625,4.90234375 L8.55078125,3.25390625 L9.41015625,3.25390625 L7.6953125,5.40234375 L9.41015625,7.6171875 L8.484375,7.6171875 L7.24609375,5.94140625 L6,7.6171875 L5.14453125,7.6171875 L6.84765625,5.44140625 L5.16015625,3.25390625 L6.0859375,3.25390625 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_文本框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M1,4 L1,12 L15,12 L15,4 L1,4 Z M0,3 L16,3 L16,13 L0,13 L0,3 Z" id="Rectangle-45" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_控件_目录树_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,8 L9,10 L10,10 L10,13 L7,13 L7,10 L8,10 L8,8 L4,8 L4,10 L5,10 L5,13 L2,13 L2,10 L3,10 L3,7 L7,7 L7,5 L6,5 L6,2 L9,2 L9,5 L8,5 L8,7 L13,7 L13,10 L14,10 L14,13 L11,13 L11,10 L12,10 L12,8 L9,8 Z M1,0 L15,0 C15.5522847,0 16,0.44771525 16,1 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 0,15.5522847 0,15 L0,1 C0,0.44771525 0.44771525,0 1,0 Z M1,1 L1,15 L15,15 L15,1 L1,1 Z M7,3 L7,4 L8,4 L8,3 L7,3 Z M3,11 L3,12 L4,12 L4,11 L3,11 Z M8,11 L8,12 L9,12 L9,11 L8,11 Z M12,11 L12,12 L13,12 L13,11 L12,11 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/chart/ChartType_normal.svg

@@ -6,4 +6,4 @@
         <polygon id="Fill-2" fill="#333334" points="6 15 10 15 10 2 6 2"></polygon>
         <polygon id="Fill-3" fill="#333334" points="11 15 15 15 15 5 11 5"></polygon>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect_normal.svg

@@ -7,4 +7,4 @@
         <path d="M8,15 C8.83702029,15 10,11.8987208 10,8 C10,4.10127922 8.83702029,1 8,1 C7.16297971,1 6,4.10127922 6,8 C6,11.8987208 7.16297971,15 8,15 Z M8,16 C6.34314575,16 5,12.418278 5,8 C5,3.581722 6.34314575,0 8,0 C9.65685425,0 11,3.581722 11,8 C11,12.418278 9.65685425,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero"></path>
         <path d="M8,15 C8.83702029,15 10,11.8987208 10,8 C10,4.10127922 8.83702029,1 8,1 C7.16297971,1 6,4.10127922 6,8 C6,11.8987208 7.16297971,15 8,15 Z M8,16 C6.34314575,16 5,12.418278 5,8 C5,3.581722 6.34314575,0 8,0 C9.65685425,0 11,3.581722 11,8 C11,12.418278 9.65685425,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero" transform="translate(8.000000, 8.000000) rotate(90.000000) translate(-8.000000, -8.000000) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect_normal.svg

@@ -5,4 +5,4 @@
         <polygon id="Fill-1" fill="#DBDCDC" points="7.9092 4.0003 8.0912 4.0003 8.0002 3.9093"></polygon>
         <path d="M8.0001,0.9997 L16.0001,8.9997 L14.5461,10.4537 L14.0001,9.9077 L14.001,16 L2,16 L1.9991,9.9077 L1.4541,10.4537 L0.0001,8.9997 L8.0001,0.9997 Z M8.0001,3.9077 L2.9071,8.9997 L3,9 L2.9991,14.9997 L13,15 L13,9 L13.0921,8.9997 L8.0001,3.9077 Z M10,10 L10,14 L6,14 L6,10 L10,10 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase_normal.svg

@@ -10,4 +10,4 @@
             <rect id="Rectangle-2" fill="#333334" x="2" y="8" width="3.9564209" height="2"></rect>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_形态_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M14,1 L14,6 L5,6 L4.9998,4.0004 L3.9998,4.0004 L3.9998,5.0004 L2.9998,5.0004 L2.9998,4.0004 L1.9998,4.0004 L1.9998,13.0004 L4.9998,13.0004 L5,12 L14,12 L14,15 L5,15 L4.9998,14.0004 L0.9998,14.0004 L0.9998,3.0004 L2.9998,3.0004 L2.9998,2.0004 L3.9998,2.0004 L3.9998,3.0004 L4.9998,3.0004 L5,1 L14,1 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000150) scale(-1, 1) translate(-8.000000, -8.000150) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_扩展_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M8,3 L8,5 L10,5 L10,7 L11.999,7 L11.999,8 L12,8 L12,14 L5,14 L5,12 L3,12 L3,10 L1,10 L1,3 L8,3 Z M11,8 L6.001,8 L6.001,13 L11,13 L11,8 Z M10,9 L10,12 L7,12 L7,9 L10,9 Z M9,6 L4,6 L4,11 L5,11 L5,7 L9,7 L9,6 Z M7,4 L2,4 L2,8.999 L3,8.999 L3,5 L7,5 L7,4 Z M13.999,2 L13.999,3 L14,3 L14,4 L15.001,4 L15.001,5 L14,5 L14,6 L13,6 L13,5 L12,5 L12,4 L13,4 L13,3 L9,3 L9,2 L13.999,2 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg

@@ -5,4 +5,4 @@
         <path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path>
         <rect id="Rectangle" fill="#F87777" x="0" y="12" width="16" height="4"></rect>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_组件分隔_箭头下_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M2,0.997030139 C2,0.446385598 2.31387329,0.313873291 2.70591205,0.705912054 L6,4 L2.70591205,7.29408795 C2.31604759,7.68395241 2,7.54696369 2,7.00296986 L2,0.997030139 Z" id="Rectangle-6" fill="#333334" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_复制_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6,0 L9,3 L9,4 L13,4 L16,7 L16,16 L6,16 L6,11 L0,11 L0,0 L6,0 Z M8,4.999 L7,5 L6.999,10 L7,10 L7,11 L6.999,11 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 L9,4.999 L9,5 L8,5 L8,4.999 Z M11,6 L11,9 L14,9 L14,14 L8,14 L8,6 L11,6 Z M5,1 L1,1 L1,10 L6,10 L6,4 L5,4 L5,1 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="形状结合" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg

@@ -7,4 +7,4 @@
         <path d="M6,0 L9,3 L9,5 L8,5 L8,4 L5,4 L5,1 L1,1 L1,10 L7,10 L7,11 L0,11 L0,0 L6,0 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
         <path d="M8,6 L11,6 L11,9 L14,9 L14,14 L8,14 L8,6 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z" id="Combined-Shape" fill="#FEF6DE"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg

@@ -6,4 +6,4 @@
             <path d="M3.51936865,0 L7.999,5.952 L12.4806877,0.000625592417 C12.4806877,0.000625592417 12.9382732,0.000625592417 12.9943831,0.431985374 L12.9995493,0.549061611 C12.9135928,3.04508847 12.1467387,4.16795083 11.2925568,5.28865864 L11.1806953,5.43493839 L9.16,7.494 L10.2816001,8.98350711 L10.723868,9.55112954 C11.2570654,9.20227675 11.891107,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,11.74944 9.37428928,11.0540601 9.76827966,10.4841689 L7.999,8.679 L6.23103458,10.4831773 C6.62544216,11.0532534 6.85714286,11.7490047 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C4.10846943,9 4.74214496,9.20202493 5.2751359,9.55047806 L5.71732093,8.9841327 L6.838,7.495 L4.81822572,5.43535545 C3.95757207,4.31224329 3.15843901,3.24562813 3.01539531,0.867253057 L3.00050704,0.549478673 C2.98120584,0 3.51936865,0 3.51936865,0 Z M12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 Z M3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 Z" id="形状结合"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg

@@ -7,4 +7,4 @@
             <path d="M12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 Z M12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,10.5670034 10.6778809,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 Z M3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 Z M3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C5.32211914,9 6.85714286,10.5670034 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg

@@ -6,4 +6,4 @@
         <path d="M10.824895,8.55608876 C10.5906634,8.79032041 10.2126459,8.79032041 9.97957384,8.55608876 L7.44361032,6.02012524 C7.21053823,5.78705315 7.21053823,5.40903572 7.44361032,5.17480407 C7.67668241,4.94173198 8.05469984,4.94173198 8.28777193,5.17480407 L10.824895,7.71076759 C11.0579671,7.94499924 11.0579671,8.32301667 10.824895,8.55608876" id="Fill-6" fill="#62646E"></path>
         <path d="M9.03553391,2.03553391 L14.5355339,2.03553391 C15.363961,2.03553391 16.0355339,2.70710678 16.0355339,3.53553391 C16.0355339,4.36396103 15.363961,5.03553391 14.5355339,5.03553391 L9.03553391,5.03553391 L9.03553391,5.03553391 L9.03553391,2.03553391 Z" id="Rectangle-111" fill="#62646E" transform="translate(12.535534, 3.535534) rotate(-45.000000) translate(-12.535534, -3.535534) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg

@@ -8,4 +8,4 @@
             <path d="M14,0 L14,13 L0,13 L0,0 L14,0 Z M1,3 L1,12 L7,12 L7,11 L8,11 L8,12 L13,12 L13,3 L1,3 Z M13,2 L13,1 L8,1 L8,2 L13,2 Z M1,2 L7,2 L7,1 L1,1 L1,2 Z" id="Combined-Shape" fill="#333334"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg

@@ -8,4 +8,4 @@
         </text>
         <path d="M15,1 L15,14 L1,14 L1,1 L15,1 Z M2,4 L2,13 L8,13 L8,12 L9,12 L9,13 L14,13 L14,4 L2,4 Z M14,3 L14,2 L9,2 L9,3 L14,3 Z M2,3 L8,3 L8,2 L2,2 L2,3 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg

@@ -7,4 +7,4 @@
         <path d="M8,6 L11,6 L11,9 L14,9 L14,14 L8,14 L8,6 Z" id="形状结合" fill="#333334"></path>
         <polygon id="Combined-Shape" fill="#333334" points="3 0 7 0 7 1 3 1"></polygon>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg

@@ -8,4 +8,4 @@
         <rect id="Rectangle-4" fill="#FEF6DE" x="8" y="9" width="6" height="5"></rect>
         <polygon id="Combined-Shape" fill="#BB5A1D" points="3 0 7 0 7 1 3 1"></polygon>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_重做_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000150) scale(-1, 1) translate(-8.000000, -8.000150) "></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_撤销_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg

@@ -7,4 +7,4 @@
             <path d="M-1.0658141e-14,13 L-1.0658141e-14,0 L14.001,0 L14.001,13 L-1.0658141e-14,13 Z M4,10 L1,10 L1,12 L4,12 L4,10 Z M9,10 L5.001,10 L5.001,12 L9,12 L9,10 Z M13,10 L10,10 L10,12 L13,12 L13,10 Z M4,7 L1,7 L1,9 L4,9 L4,7 Z M9,7 L5.001,7 L5.001,9 L9,9 L9,7 Z M13,7 L10,7 L10,9 L13,9 L13,7 Z M4,4 L1,4 L1,6 L4,6 L4,4 Z M9,4 L5.001,4 L5.001,6 L9,6 L9,4 Z M13,4 L10,4 L10,6 L13,6 L13,4 Z M4,1 L1,1 L1,3 L4,3 L4,1 Z M9,1 L5.001,1 L5.001,3 L9,3 L9,1 Z M13,1 L10,1 L10,3 L13,3 L13,1 Z" id="Combined-Shape"></path>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg

@@ -5,4 +5,4 @@
         <polygon id="Fill-1" fill="#41C9FD" points="2 10 14 10 14 5 2 5"></polygon>
         <path d="M1,14 L1,1 L15.001,1 L15.001,14 L1,14 Z M5,11 L2,11 L2,13 L5,13 L5,11 Z M10,11 L6.001,11 L6.001,13 L10,13 L10,11 Z M14,11 L11,11 L11,13 L14,13 L14,11 Z M5,8 L2,8 L2,10 L5,10 L5,8 Z M10,8 L6.001,8 L6.001,10 L10,10 L10,8 Z M14,8 L11,8 L11,10 L14,10 L14,8 Z M5,5 L2,5 L2,7 L5,7 L5,5 Z M10,5 L6.001,5 L6.001,7 L10,7 L10,5 Z M14,5 L11,5 L11,7 L14,7 L14,5 Z M5,2 L2,2 L2,4 L5,4 L5,2 Z M10,2 L6.001,2 L6.001,4 L10,4 L10,2 Z M14,2 L11,2 L11,4 L14,4 L14,2 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg

@@ -5,4 +5,4 @@
         <path d="M14.001,5.0002 L10.0002,5.0002 L10.0002,1 L2,1 L2,15 L14.001,15 L14.001,5.0002 Z M13.5862,4.0002 L11.0002,1.4142 L11.0002,4.0002 L13.5862,4.0002 L13.5862,4.0002 Z M1,0 L11,0 L15,4.001 L15,16 L1,16 L1,12 L2.0002,13 L2.0002,6 L1,7 L1,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000000) rotate(180.000000) translate(-8.000000, -8.000000) "></path>
         <path d="M11.3,2.4890598 C11.3856913,2.4890598 11.4672926,2.52570414 11.5242228,2.58975065 L15,6.5 L11.5242228,10.4102494 C11.4141474,10.5340842 11.2245257,10.5452384 11.1006908,10.435163 C11.0366443,10.3782328 11,10.2966315 11,10.2109402 L11,7.9990598 L6,8 L6,5 L11,4.9990598 L11,2.7890598 C11,2.62337437 11.1343146,2.4890598 11.3,2.4890598 Z" id="Combined-Shape" fill="#3FB053"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg

@@ -8,4 +8,4 @@
         <path d="M12,5 L12,8 L8,8 L8,5 L12,5 Z M11,6 L9,6 L9,7 L11,7 L11,6 Z" id="Combined-Shape" fill="#333334"></path>
         <path d="M12,9 L12,12 L8,12 L8,9 L12,9 Z M11,9.999 L9,9.999 L9,11 L11,11 L11,9.999 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_页面设置_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15,1 L15,15 L1,15 L1,1 L15,1 Z M8,2 L2,2 L2,14 L8,14 L8,2 Z M14,2 L9,2 L9,14 L14,14 L14,2 Z M13,11 L13,12 L10,12 L10,11 L13,11 Z M7,10 L7,11 L3,11 L3,10 L7,10 Z M13,8.999 L13,9.999 L10,9.999 L10,8.999 L13,8.999 Z M7,8 L7,9 L3,9 L3,8 L7,8 Z M13,7 L13,8 L10,8 L10,7 L13,7 Z M7,6 L7,7 L3,7 L3,6 L7,6 Z M13,5 L13,6 L10,6 L10,5 L13,5 Z M7,4 L7,5 L3,5 L3,4 L7,4 Z M13,3 L13,4 L10,4 L10,3 L13,3 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_重复与冻结设置_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M15,1 L15,7 L14,7 L14,6 L6,6 L6,8 L8,8 L8,9 L6,9 L6,11 L8,11 L8,12 L6,12 L6,14 L8,14 L8,15 L1,15 L1,1 L15,1 Z M15,15 L9,15 L9,10 L10,10 L10,8 L14,8 L14,10 L15,10 L15,15 Z M5,6 L2,6 L2,14 L5,14 L5,6 Z M13,12 L11,12 L11,13 L13,13 L13,12 Z M13,9 L11,9 L11,10 L13,10 L13,9 Z M14,2 L2,2 L2,5 L14,5 L14,2 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_另存为_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M2,1 L11,1 C11.5522847,1 12,1.44771525 12,2 L12,11 C12,11.5522847 11.5522847,12 11,12 L2,12 C1.44771525,12 1,11.5522847 1,11 L1,2 C1,1.44771525 1.44771525,1 2,1 Z M2,2 L2,11 L11,11 L11,2 L2,2 Z M3,2 L8,2 L8,5 L3,5 L3,2 Z M6,2 L6,4 L7,4 L7,2 L6,2 Z M7,13 L9,13 L9,15 L7,15 L7,13 Z M10,13 L12,13 L12,15 L10,15 L10,13 Z M13,13 L15,13 L15,15 L13,15 L13,13 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg

@@ -8,4 +8,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg

@@ -8,4 +8,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_切换工作目录_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M12.0156025,5.51600978 L11.7682186,5.75374397 C11.4296009,6.09762516 11.4296009,6.65380036 11.7682186,6.99768156 C12.1077135,7.34156275 12.6568707,7.34156275 12.9963657,6.99768156 L14.7455981,5.28003008 C14.907889,5.11510746 15,4.89228648 15,4.65806128 C15,4.42471333 14.907889,4.2010151 14.7455981,4.03609249 L12.9884705,2.2579109 C12.6498527,1.9140297 12.1006955,1.9140297 11.7612006,2.2579109 C11.4225829,2.60091484 11.4225829,3.15709004 11.7612006,3.50097124 L12.0234977,3.76677737 L9.74791654,3.76677737 C9.49263738,3.76677737 9.2496397,3.87818786 9.08383984,4.07205965 L4.07036782,10.7645842 L1.8746162,10.7645842 C1.39125258,10.7645842 1,11.1558368 1,11.6392005 C1,12.1234413 1.39125258,12.5146939 1.8746162,12.5146939 L4.49934206,12.5146939 C4.75462122,12.5146939 4.99674165,12.4024062 5.16254151,12.2085344 L10.1505733,5.51600978 L12.0156025,5.51600978 Z M12.9963657,9.28291246 C12.6568707,8.93990852 12.1077135,8.93990852 11.7682186,9.28291246 C11.4296009,9.62679366 11.4296009,10.1829689 11.7682186,10.5259728 L12.0156025,10.7645842 L10.1505733,10.7645842 L9.35666395,9.70048249 L8.13378031,10.9330159 L9.08383984,12.2085344 C9.2496397,12.4024062 9.49263738,12.5146939 9.74791654,12.5146939 L12.0234977,12.5146939 L11.7612006,12.7805 C11.4225829,13.123504 11.4225829,13.6796792 11.7612006,14.0235604 C12.1006955,14.3665643 12.6498527,14.3665643 12.9884705,14.0235604 L14.7455981,12.2445015 C14.907889,12.0795789 15,11.8558807 15,11.6225327 C15,11.3891848 14.907889,11.1654866 14.7455981,11.0005639 L12.9963657,9.28291246 Z M1.8746162,5.51600978 L4.07036782,5.51600978 L4.85813647,6.53800363 L6.08102011,5.30459302 L5.16254151,4.07205965 C4.99674165,3.87818786 4.75462122,3.76677737 4.49934206,3.76677737 L1.8746162,3.76677737 C1.39125258,3.76677737 1,4.15802995 1,4.64139357 C1,5.12475719 1.39125258,5.51600978 1.8746162,5.51600978 L1.8746162,5.51600978 Z" id="Fill-1" fill="#333334"></path>
     </g>
-</svg>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg

@@ -4,4 +4,4 @@
     <g id="icon_其他属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M8,1 C8.82842712,1 9.5,1.67157288 9.5,2.5 L9.50046036,3.22904576 C9.78288379,3.31778001 10.0545064,3.43089947 10.3128604,3.56593636 L10.8284271,3.05025253 C11.4142136,2.46446609 12.363961,2.46446609 12.9497475,3.05025253 C13.5355339,3.63603897 13.5355339,4.58578644 12.9497475,5.17157288 L12.4340636,5.68713962 C12.5692611,5.94580091 12.6824891,6.21776239 12.7712708,6.50054746 L13.5,6.5 C14.3284271,6.5 15,7.17157288 15,8 C15,8.82842712 14.3284271,9.5 13.5,9.5 L12.7709542,9.50046036 C12.68222,9.78288379 12.5691005,10.0545064 12.4340636,10.3128604 L12.9497475,10.8284271 C13.5355339,11.4142136 13.5355339,12.363961 12.9497475,12.9497475 C12.363961,13.5355339 11.4142136,13.5355339 10.8284271,12.9497475 L10.3128604,12.4340636 C10.0545064,12.5691005 9.78288379,12.68222 9.50046036,12.7709542 L9.5,13.5 C9.5,14.3284271 8.82842712,15 8,15 C7.17157288,15 6.5,14.3284271 6.5,13.5 L6.50054746,12.7712708 C6.21776239,12.6824891 5.94580091,12.5692611 5.68713962,12.4340636 L5.17157288,12.9497475 C4.58578644,13.5355339 3.63603897,13.5355339 3.05025253,12.9497475 C2.46446609,12.363961 2.46446609,11.4142136 3.05025253,10.8284271 L3.56593636,10.3128604 C3.43089947,10.0545064 3.31778001,9.78288379 3.22904576,9.50046036 L2.5,9.5 C1.67157288,9.5 1,8.82842712 1,8 C1,7.17157288 1.67157288,6.5 2.5,6.5 L3.22872923,6.50054746 C3.31751095,6.21776239 3.43073885,5.94580091 3.56593636,5.68713962 L3.05025253,5.17157288 C2.46446609,4.58578644 2.46446609,3.63603897 3.05025253,3.05025253 C3.63603897,2.46446609 4.58578644,2.46446609 5.17157288,3.05025253 L5.68713962,3.56593636 C5.94580091,3.43073885 6.21776239,3.31751095 6.50054746,3.22872923 L6.5,2.5 C6.5,1.67157288 7.17157288,1 8,1 Z M8,6 C6.8954305,6 6,6.8954305 6,8 C6,9.1045695 6.8954305,10 8,10 C9.1045695,10 10,9.1045695 10,8 C10,6.8954305 9.1045695,6 8,6 Z" id="Combined-Shape" fill="#333334"></path>
     </g>
-</svg>
+</svg>