Merge branch 'StableVersion' into develop

src/assets/iconfont2/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1701308010197') format('truetype');
+  src: url('iconfont.ttf?t=1709865709415') format('truetype');
 }
 
 .iconfont {
@@ -43,3 +43,47 @@
   content: "\e685";
 }
 
+.icon-bianji:before {
+  content: "\e600";
+}
+
+.icon-circle:before {
+  content: "\e64f";
+}
+
+.icon-sanjiaoxing:before {
+  content: "\e615";
+}
+
+.icon-tuceng:before {
+  content: "\e632";
+}
+
+.icon-move:before {
+  content: "\e616";
+}
+
+.icon-xiangpi_huaban1:before {
+  content: "\e67b";
+}
+
+.icon-tx-fill-tuoyuanxing:before {
+  content: "\e64c";
+}
+
+.icon-zhixian:before {
+  content: "\e602";
+}
+
+.icon-xian:before {
+  content: "\ec5f";
+}
+
+.icon-checkbox-full:before {
+  content: "\ea6f";
+}
+
+.icon-tuceng1:before {
+  content: "\e62d";
+}
+

src/assets/iconfont2/iconfont.json

@@ -60,6 +60,83 @@
       "font_class": "dianwei",
       "unicode": "e685",
       "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "130743908",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "130743909",
+      "name": "圆形",
+      "font_class": "circle",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "130743910",
+      "name": "三角形",
+      "font_class": "sanjiaoxing",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "130743911",
+      "name": "图层",
+      "font_class": "tuceng",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "130743912",
+      "name": "平移",
+      "font_class": "move",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "130743913",
+      "name": "橡皮",
+      "font_class": "xiangpi_huaban1",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "130743914",
+      "name": "tx-fill-椭圆形",
+      "font_class": "tx-fill-tuoyuanxing",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "130743915",
+      "name": "直线",
+      "font_class": "zhixian",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "130743916",
+      "name": "线",
+      "font_class": "xian",
+      "unicode": "ec5f",
+      "unicode_decimal": 60511
+    },
+    {
+      "icon_id": "130743917",
+      "name": "正方形",
+      "font_class": "checkbox-full",
+      "unicode": "ea6f",
+      "unicode_decimal": 60015
+    },
+    {
+      "icon_id": "130743918",
+      "name": "图层",
+      "font_class": "tuceng1",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
     }
   ]
 }