多行文本兼容处理

src/components/editview/basePlanEditer.vue

@@ -362,7 +362,7 @@ export default {
                 const objExtInfo = {};
                 if (res.content.elements.objExtInfo?.length) {
                     res.content.elements.objExtInfo.forEach((item) => {
-                        objExtInfo[item.id] = item;
+                        if (item?.properties?.id) objExtInfo[item.properties.id] = item;
                     });
                 }
                 this.INITOBJEXTINFO(objExtInfo);

src/components/editview/rightPropertyBar/BaseEquipment.vue

@@ -106,13 +106,7 @@ export default {
     computed: {
         formula: {
             get: function () {
-                return this.EquipItem.formula;
-            },
-            set: function (val) {
-                const oldVal = this.EquipItem.formula;
-                const newVal = val;
-                bus.$emit("undoAttr", this.EquipItem, "formula", oldVal, newVal);
-                this.EquipItem.formula = newVal;
+                return JSON.stringify(this.EquipItem.formula.map(info => {return info.name;}));
             },
         },
         color: {
@@ -139,6 +133,9 @@ export default {
             },
         },
     },
+    created() {
+        this.EquipItem.moveText = this.setStyle;
+    },
     methods: {
         ...mapMutations(["ADDSTYLE"]),
         // 修改样式信息
@@ -149,7 +146,12 @@ export default {
                     color: this.EquipItem.color.value,
                     size: this.EquipItem.font.size,
                     url: this.EquipItem.defaultUrl,
-                    formula: this.EquipItem.formula,
+                    formula: this.EquipItem.textItemList.map(item => {
+                        const obj = Object.assign(item.propertyData, {
+                            pos: { x: item.x, y: item.y }
+                        })
+                        return obj
+                    }),
                 },
             };
             this.ADDSTYLE(style);

src/components/editview/rightPropertyBar/property.vue

@@ -91,7 +91,7 @@ export default {
                     : itemList[0].relationData
                     ? itemList[0].relationData
                     : null;
-                this.itemType = data.properties.type ? data.properties.type : "";
+                this.itemType = data?.properties?.type ? data.properties.type : "";
                 this.itemObj = itemList[0];
             } else {
                 this.itemType = "";

src/lib/item/SPlanEquipment.ts

@@ -25,10 +25,10 @@
  */
 
 import { SGraphItem, SAnchorItem } from "@persagy-web/graph/lib";
+import { SPoint } from "@persagy-web/draw";
 import { Example } from "../index";
 import { SBaseIconTextEdit, SBaseTextEdit } from "@persagy-web/edit";
 import { svgTobase64, uuid } from "@persagy-web/big-edit/lib/until";
-import { SColor, SFont } from "@persagy-web/draw/lib";
 /**
  * 编辑基础设备类
  *
@@ -58,36 +58,39 @@ export class SPlanEquipment extends SBaseIconTextEdit {
     } // get url()
 
     /** 公式 */
-    private _formula: string = "";
+    private _formula: any[] = [];
+    // private _formula: string = "";
     set formula(val) {
         this._formula = val;
         try {
-            const textList = JSON.parse(this._formula);
+            // const textList = JSON.parse(this._formula);
             if (this.scene) {
                 this.textItemList.forEach((textItem) => {
                     this.scene.removeItem(textItem);
                 });
             }
-            if (textList.length) {
+            if (this._formula.length) {
+                // if (textList.length) {
                 const textItemList: any[] = [];
-                textList.forEach((item: any, index: number) => {
+                this._formula.forEach((item: any, index: number) => {
+                    // textList.forEach((item: any, index: number) => {
                     let obj = new SBaseTextEdit(this, null);
-                    // obj.propertyData = item;
-                    obj.text = item;
-                    // if (item.pos) {
-                    //     obj.moveTo(item.pos.x, item.pos.x)
-                    // } else {
-                    //     obj.moveTo(
-                    //         this.img.width * 0.5,
-                    //         -(this.font.size * 1.25 * 0.5) + (index) * 10
-                    //     );
-                    // }
+                    obj.propertyData = item;
+                    obj.text = item.name;
+                    if (item.pos) {
+                        obj.moveTo(item.pos.x, item.pos.y);
+                    } else {
+                        obj.moveTo(this.img.width * 0.5, this.font.size * (index - 0.125 - 0.5 * this._formula.length));
+                    }
                     // TODO: obj.moveTo(this.img.width * 0.5, -(this.font.size * 1.25 * 0.5) + (index * this.font.size) - (textList.length - 1) * 0.5 * this.font.size);
-                    obj.moveTo(this.img.width * 0.5, this.font.size * (index - 0.125 - 0.5 * textList.length));
+                    // obj.moveTo(this.img.width * 0.5, this.font.size * (index - 0.125 - 0.5 * textList.length));
+                    obj.connect("onMove", this, this.textMove.bind(this));
                     obj.font = this.font;
                     obj.color = this.color;
                     obj.isTransform = false;
                     obj.showSelect = false;
+                    console.log(obj);
+
                     textItemList.push(obj);
                 });
                 this.textItemList = textItemList;
@@ -99,7 +102,8 @@ export class SPlanEquipment extends SBaseIconTextEdit {
             console.error("公式数据错误", error);
         }
     } // set formula()
-    get formula(): string {
+    // get formula(): string {
+    get formula(): any[] {
         return this._formula;
     } // get formula()
 
@@ -158,7 +162,7 @@ export class SPlanEquipment extends SBaseIconTextEdit {
         this.id = this.legendData.id ? this.legendData.id : "";
         // this.textItemList[0].text = this.legendData.codeName ? this.legendData.codeName : "";
         this.showAnchor = false;
-        this.anotherMsg = this.legendData?.anotherMsg ? this.legendData.anotherMsg : "";
+        this.anotherMsg = this.legendData?.properties?.anotherMsg ? this.legendData.properties.anotherMsg : "";
         if (this.legendData.pos?.x && this.legendData.pos?.y) {
             this.x = this.legendData.pos.x;
             this.y = this.legendData.pos.y;
@@ -176,6 +180,16 @@ export class SPlanEquipment extends SBaseIconTextEdit {
     }
 
     /**
+     * 文本位置移动回调函数
+     * @param textItem 移动的文本元素
+     * @param pointList 移动前后位置坐标信息
+     */
+    textMove(textItem: SBaseTextEdit, pointList: SPoint[]) {
+        this.moveText();
+    }
+    moveText() {}
+
+    /**
      * 返回对象储存的相关数据
      *
      * @return	对象储存的相关数据
@@ -184,9 +198,12 @@ export class SPlanEquipment extends SBaseIconTextEdit {
         if (this.legendData) {
             // 位置
             const objExtInfo = {
-                id: this.id,
+                attachObjectIds: [this.id],
                 pos: this.pos,
-                anotherMsg: this.anotherMsg,
+                properties: {
+                    id: this.id,
+                    anotherMsg: this.anotherMsg,
+                },
             };
             return objExtInfo;
         }

src/lib/item/SPlanZone.ts

@@ -115,18 +115,20 @@ export class SPlanZone extends SGraphEdit {
         this.update();
     } // Set text
     /**文本颜色 */
+    private _color: SColor = new SColor();
     get color(): SColor {
-        return this.textItem.color;
+        return this._color;
     } // Get color
     set color(v: SColor) {
-        this.textItem.color = v;
+        this._color = v;
     } // Set color
     /**文本样式 */
+    private _font: SFont = new SFont("sans-serif", 12);
     get font(): SFont {
-        return this.textItem.font;
+        return this._font;
     } // Get font
     set font(v: SFont) {
-        this.textItem.font = v;
+        this._font = v;
     } // Set font
 
     /** 是否显示文字  */
@@ -180,7 +182,7 @@ export class SPlanZone extends SGraphEdit {
     initData() {
         if (!this.legendData) return;
         this.id = this.legendData.id ? this.legendData.id : "";
-        this.anotherMsg = this.legendData?.anotherMsg ? this.legendData.anotherMsg : "";
+        this.anotherMsg = this.legendData?.properties?.anotherMsg ? this.legendData.properties.anotherMsg : "";
         this.textItem.text = this.legendData.localName ? this.legendData.localName : "";
         if (this.legendData?.outline?.length && this.legendData.outline[0] && this.legendData.outline[0]?.length) {
             let tempArr = this.legendData.outline.map((t): Point[][] => {
@@ -191,7 +193,7 @@ export class SPlanZone extends SGraphEdit {
                         }
                     );
                 });
-            })
+            });
             this.minX = tempArr[0][0][0].x;
             this.maxX = this.minX;
             this.minY = tempArr[0][0][0].y;
@@ -227,7 +229,7 @@ export class SPlanZone extends SGraphEdit {
                 return tempArr;
             });
         }
-        if (this.legendData.textPos?.x && this.legendData.textPos?.y) {
+        if (this.legendData.properties?.textPos?.x && this.legendData.properties?.textPos?.y) {
             this.textItem.moveTo(this.legendData.textPos.x, this.legendData.textPos.y);
         }
     }
@@ -281,9 +283,12 @@ export class SPlanZone extends SGraphEdit {
         if (this.legendData) {
             // 位置
             const objExtInfo = {
-                id: this.id,
-                textPos: {x: this.textItem.x, y: this.textItem.y},
-                anotherMsg: this.anotherMsg,
+                attachObjectIds: [this.id],
+                properties: {
+                    id: this.id,
+                    textPos: { x: this.textItem.x, y: this.textItem.y },
+                    anotherMsg: this.anotherMsg,
+                },
             };
             return objExtInfo;
         }
@@ -301,15 +306,9 @@ export class SPlanZone extends SGraphEdit {
         painter.brush.color = this.fillColor;
         painter.pen.lineWidth = painter.toPx(this.lineWidth);
         if (this.lineStyle == SLineStyle.Dashed) {
-            painter.pen.lineDash = [
-                painter.toPx(this.lineWidth * 3),
-                painter.toPx(this.lineWidth * 7)
-            ];
+            painter.pen.lineDash = [painter.toPx(this.lineWidth * 3), painter.toPx(this.lineWidth * 7)];
         } else if (this.lineStyle == SLineStyle.Dotted) {
-            painter.pen.lineDash = [
-                painter.toPx(this.lineWidth),
-                painter.toPx(this.lineWidth)
-            ];
+            painter.pen.lineDash = [painter.toPx(this.lineWidth), painter.toPx(this.lineWidth)];
         }
 
         // 是否选中

src/lib/style/Style.ts

@@ -39,7 +39,7 @@ export interface Style {
     /** 图片地址 */
     url?: string;
     /** 规则 */
-    formula?: string;
+    formula?: any[];
     /** 宽 */
     width?: number;
     /** 高 */