|
@@ -24,13 +24,11 @@
|
|
* ****/
|
|
* ****/
|
|
|
|
|
|
import { SBaseEditScene, SBasePipe, SBaseEquipment } from "@persagy-web/big-edit";
|
|
import { SBaseEditScene, SBasePipe, SBaseEquipment } from "@persagy-web/big-edit";
|
|
-import { SGraphEdit, SGraphPropertyCommand, SBaseImageEdit, SGraphDeleteListCommand, SBaseMaskEdit } from "@persagy-web/edit";
|
|
|
|
|
|
+import { SGraphEdit, SBaseImageEdit, SGraphDeleteListCommand, SBaseMaskEdit } from "@persagy-web/edit";
|
|
import { SMouseEvent } from "@persagy-web/base";
|
|
import { SMouseEvent } from "@persagy-web/base";
|
|
-import { SGraphItem, SGraphSelectContainer, SLineStyle } from "@persagy-web/graph";
|
|
|
|
|
|
+import { SGraphAddCommand, SGraphItem, SGraphPropertyCommand, SGraphSelectContainer, SLineStyle } from "@persagy-web/graph";
|
|
import { SItemStatus, ItemColor } from "@persagy-web/big";
|
|
import { SItemStatus, ItemColor } from "@persagy-web/big";
|
|
import { rgbaNum } from "@persagy-web/big-edit/lib/until";
|
|
import { rgbaNum } from "@persagy-web/big-edit/lib/until";
|
|
-// 引入命令
|
|
|
|
-import { SGraphAddCommand } from "@persagy-web/edit";
|
|
|
|
import { SColor, SFont, SArrowStyleType } from "@persagy-web/draw";
|
|
import { SColor, SFont, SArrowStyleType } from "@persagy-web/draw";
|
|
import { SPlanEquipment, SPlanParser, SPlanZone } from "./";
|
|
import { SPlanEquipment, SPlanParser, SPlanZone } from "./";
|
|
import { SPlanBackgroundImage } from "@/lib/item/SPlanBackgroundImage";
|
|
import { SPlanBackgroundImage } from "@/lib/item/SPlanBackgroundImage";
|
|
@@ -475,7 +473,7 @@ export class SPlanScene extends SBaseEditScene {
|
|
const markers: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
const markers: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
const objExtInfo: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
const objExtInfo: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
const relations: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
const relations: any = []; /**图例节点 */ // 与工程信息无关的标识对象(增加文本注释,图上的图片说明)
|
|
- let outline: null | array = null; /**区域显示 */
|
|
|
|
|
|
+ let outline: null | [] = null; /**区域显示 */
|
|
let nodeList;
|
|
let nodeList;
|
|
if (isAll) {
|
|
if (isAll) {
|
|
nodeList = this.root.children;
|
|
nodeList = this.root.children;
|
|
@@ -676,9 +674,11 @@ export class SPlanScene extends SBaseEditScene {
|
|
if (itemList?.length) {
|
|
if (itemList?.length) {
|
|
itemList.forEach((item) => {
|
|
itemList.forEach((item) => {
|
|
const oldV = item.zOrder;
|
|
const oldV = item.zOrder;
|
|
|
|
+ const oldIndex = item.parent?.children.indexOf(item)
|
|
this.setOrder(val);
|
|
this.setOrder(val);
|
|
|
|
+ const newIndex = item.parent?.children.indexOf(item)
|
|
const newV = item.zOrder;
|
|
const newV = item.zOrder;
|
|
- this.undoStack.push(new SGraphPropertyCommand(this, item, "zOrder", oldV, newV));
|
|
|
|
|
|
+ this.undoStack.push(new SGraphPropertyCommand(this, item, "zOrder", oldV, newV, oldIndex, newIndex));
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|