Merge branch 'dev' of http://39.106.8.246:3003/web/persagy-plan-editer into dev

package.json

@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@persagy-web/base": "2.2.1",
-    "@persagy-web/big": "2.2.57",
-    "@persagy-web/draw": "2.2.14",
-    "@persagy-web/graph": "2.2.48",
-    "@persagy-web/big-edit": "2.2.37",
-    "@persagy-web/edit": "2.2.30",
+    "@persagy-web/big": "2.2.60",
+    "@persagy-web/draw": "2.2.16",
+    "@persagy-web/graph": "2.2.51",
+    "@persagy-web/big-edit": "2.2.40",
+    "@persagy-web/edit": "2.2.33",
     "@types/uuid": "^8.0.0",
     "ant-design-vue": "^1.6.5",
     "axios": "^0.20.0",

src/components/editview/leftToolBar/editInfoPoint.vue

@@ -218,7 +218,8 @@ import { planerSave, planerUpdate, pubPlanerUpdate } from "@/api/labsl";
 import { dictQuery } from "@/api/datacenter";
 import { imgBaseUrl, imgServeUpload } from "@/api/imageservice";
 import { cloneDeep } from "lodash";
-import { rgbaNum, svgTobase64 } from "@persagy-web/big-edit/lib/until";
+import { rgbaNum } from "@persagy-web/big-edit/lib/until";
+import { svgTobase64 } from "@persagy-web/big";
 import { SPlanDecorator } from "@/lib";
 import { SColor } from "@persagy-web/draw/lib";
 import { v1 as uuidv1 } from "uuid";
@@ -295,7 +296,7 @@ export default {
         };
     },
     computed: {
-        ...mapState(["styleMap", "id", "graphId", "buildingId", "floorId", "equipItemMap", "zoneIteMap"]),
+        ...mapState(["styleMap", "id", "graphId", "buildingId", "floorId", "equipItemMap", "zoneIteMap", "name"]),
     },
     watch: {
         // 是否打开弹窗
@@ -486,6 +487,7 @@ export default {
                         id: this.id,
                         graphId: this.graphId,
                         style: postStyle,
+                        name: this.name
                     },
                 ],
                 projection: ["style"],

src/components/editview/rightPropertyBar/BaseEquipment.vue

@@ -145,7 +145,7 @@ export default {
                     color: this.EquipItem.color.value,
                     size: this.EquipItem.font.size,
                     url: this.EquipItem.defaultUrl,
-                    visible:EquipItem.visible,
+                    visible: this.EquipItem.visible,
                     formula: this.EquipItem.textItemList.map(item => {
                         const obj = Object.assign(item.propertyData, {
                             pos: { x: item.x, y: item.y }

src/components/homeView/move.vue

@@ -109,6 +109,8 @@ export default {
                     id: t.id,
                     graphId: t.graphId,
                     folderId: this.value,
+                    name: t.name,
+                    floorId: t.floorId
                 };
             });
             let res;

src/components/homeView/tagDialog.vue

@@ -74,6 +74,8 @@ export default {
                         id: this.data.id,
                         graphId: this.data.graphId,
                         label: this.dynamicTags,
+                        name: this.data.name,
+                        floorId: this.data.floorId
                     },
                 ],
                 projection: ["label"],