archgine 1.0.68 → 1.0.70

package/lib/environment.worker.js

@@ -4010,7 +4010,7 @@ Fu.__DOMHandler = Eu;
 Fu.normalizeLineEndings = Le;
 Fu.DOMParser = Ie;
 var gr = Fu.DOMParser;
-const Er = "1.0.68";
+const Er = "1.0.70";
 function vr() {
   return typeof window < "u" && ({}.toString.call(window) === "[object Window]" || {}.toString.call(window) === "[object global]");
 }

package/lib/extras/interfaces.d.ts

@@ -24,7 +24,7 @@ export interface IApp {
     setFillByIds(ids: string[], c: string): void;
     clearFill(): void;
     clearFillByIds(ids?: string[]): void;
-    setStrokeByIds(ids: string[], c: string): void;
+    setStrokeByIds(ids: string[], c: string, sw?: string): void;
     clearStroke(): void;
     clearStrokeByIds(ids?: string[]): void;
     getLegend(): any[] | undefined;
@@ -51,6 +51,7 @@ export interface IApp {
     multiSelectEnableChanged(v: boolean): void;
     clearSelected(): void;
     socialDistanceEnableChanged(v: boolean): void;
+    fnEnableChanged(v?: boolean): void;
     getBoundingBoxById(id: string, viewTrans?: boolean): Box2 | undefined;
     setDummies(dummies: IDummyVo[]): void;
     clearDummies(): void;

package/lib/extras/svg-app.d.ts

@@ -28,6 +28,7 @@ export declare class SvgApp<Config extends ISvgAppConfig> extends EventDispatche
     zoomBox: Box2;
     selectEnable: boolean;
     multiSelectEnable: boolean;
+    fnEnable: boolean;
     requestHeader: any;
     private readonly runningHandler;
     private readonly pointerOverHandler;
@@ -67,7 +68,7 @@ export declare class SvgApp<Config extends ISvgAppConfig> extends EventDispatche
     setFillByIds(ids: string[], c: string): void;
     clearStroke(): void;
     clearStrokeByIds(ids?: string[]): void;
-    setStrokeByIds(ids: string[], c: string): void;
+    setStrokeByIds(ids: string[], c: string, sw?: string): void;
     getLegend(): Array<TLegend> | undefined;
     setAssetLabels(id: string, labels?: string[]): void;
     clearAssetLabels(): void;
@@ -91,6 +92,7 @@ export declare class SvgApp<Config extends ISvgAppConfig> extends EventDispatche
     selectEnableChanged(v: boolean): void;
     multiSelectEnableChanged(v: boolean): void;
     socialDistanceEnableChanged(v: boolean): void;
+    fnEnableChanged(v?: boolean): void;
     getBoundingBoxById(id: string, viewTrans?: boolean): Box2 | undefined;
     setDummies(dummies: IDummyVo[]): void;
     clearDummies(aeTypes?: string[]): void;

package/lib/extras/svg-multi-selector.d.ts

@@ -14,6 +14,7 @@ export declare class SvgMultiSelector extends EventDispatcher {
     graph: DynamicDrawRect;
     selectEnable: boolean;
     multiSelectEnable: boolean;
+    fnEnable: boolean;
     controllerTapHandler: (e: IEvent) => void;
     controllerPanStartHandler: (e: IEvent) => void;
     controllerPanMoveHandler: (e: IEvent) => void;
@@ -23,6 +24,7 @@ export declare class SvgMultiSelector extends EventDispatcher {
     bindScene(scene: Scene): void;
     selectEnableChanged(v: boolean): void;
     multiSelectEnableChanged(v: boolean): void;
+    fnEnableChanged(v?: boolean): void;
     bindControllerEvents(): void;
     unbindControllerEvents(): void;
     handleControllerTap(e: IEvent): void;

package/lib/extras/svg-view.d.ts

@@ -30,6 +30,7 @@ export declare class SvgView<Config extends ISvgViewConfig> extends EventDispatc
     zoomBox: Box2;
     selectEnable: boolean;
     multiSelectEnable: boolean;
+    fnEnable: boolean;
     tween?: Tween;
     animateDuration: number;
     label?: Label;
@@ -54,6 +55,7 @@ export declare class SvgView<Config extends ISvgViewConfig> extends EventDispatc
     zoomToSelectEnableChanged(v: boolean): void;
     selectEnableChanged(v: boolean): void;
     multiSelectEnableChanged(v: boolean): void;
+    fnEnableChanged(v?: boolean): void;
     getIntersectObjects(rayCaster: IRaycaster, assetType?: string, out?: HTMLElement[]): HTMLElement[];
     focusAt(position: IVector2, padding?: number): Promise<void>;
     focusAtById(id: string, padding?: number): Promise<void>;

package/lib/index.mjs

@@ -4010,7 +4010,7 @@ ou.__DOMHandler = Ra;
 ou.normalizeLineEndings = Cd;
 ou.DOMParser = Dd;
 var Yx = ou.DOMParser;
-const Xx = "1.0.68";
+const Xx = "1.0.70";
 function Zx() {
   return typeof window < "u" && ({}.toString.call(window) === "[object Window]" || {}.toString.call(window) === "[object global]");
 }
@@ -12238,13 +12238,13 @@ class Ah extends CE {
       t != null && t.length && !t.includes(a[l]) || (o = i[a[l]], !(!o || !o.hasAttribute(e)) && (o.removeAttribute(e), e === "stroke" && o.removeAttribute("stroke-width")));
     this.clearLegendBy(e);
   }
-  setFillOrStrokeByIds(t, e, i = "fill") {
-    const a = this.getAssetsByType(this.assetType);
-    if (!a) return;
-    const o = Nt.keys(a);
-    let l;
-    for (let c = 0, f = o.length; c < f; c++)
-      t.includes(o[c]) && (l = a[o[c]], l && (l.setAttribute(i, e), i === "stroke" && l.setAttribute("stroke-width", "7"), this.addLegend(i, e, o[c])));
+  setFillOrStrokeByIds(t, e, i = "fill", a = "7") {
+    const o = this.getAssetsByType(this.assetType);
+    if (!o) return;
+    const l = Nt.keys(o);
+    let c;
+    for (let f = 0, d = l.length; f < d; f++)
+      t.includes(l[f]) && (c = o[l[f]], c && (c.setAttribute(i, e), i === "stroke" && c.setAttribute("stroke-width", a), this.addLegend(i, e, l[f])));
   }
   addLegend(t, e, i) {
     let a = this.legend.find((o) => o.color === e);
@@ -14066,6 +14066,7 @@ class DA extends rr {
   graph;
   selectEnable = !1;
   multiSelectEnable = !1;
+  fnEnable = !1;
   controllerTapHandler = this.handleControllerTap.bind(this);
   controllerPanStartHandler = this.handleControllerPanStart.bind(this);
   controllerPanMoveHandler = this.handleControllerPanMove.bind(this);
@@ -14085,7 +14086,10 @@ class DA extends rr {
   }
   multiSelectEnableChanged(t) {
     var e;
-    (e = this.scene) == null || e.clearSelected(), this.multiSelectEnable = !!t, this.controller.enablePan = !this.multiSelectEnable;
+    (e = this.scene) == null || e.clearSelected(), this.multiSelectEnable = !!t, this.controller.enablePan = !this.multiSelectEnable || this.multiSelectEnable && !this.fnEnable;
+  }
+  fnEnableChanged(t) {
+    this.fnEnable = !!t, this.controller.enablePan = !this.multiSelectEnable || this.multiSelectEnable && !this.fnEnable;
   }
   // controller events
   bindControllerEvents() {
@@ -14104,14 +14108,14 @@ class DA extends rr {
     });
   }
   handleControllerPanStart(t) {
-    (t == null ? void 0 : t.type) === ut.PAN_START && this.multiSelectEnable && (this.p1.copy(t.data.screenCoords), Hn.makeEmpty().expandByPoint(this.p1), this.graph.draw(Hn));
+    (t == null ? void 0 : t.type) === ut.PAN_START && this.multiSelectEnable && (this.controller.enablePan || (this.p1.copy(t.data.screenCoords), Hn.makeEmpty().expandByPoint(this.p1), this.graph.draw(Hn)));
   }
   handleControllerPanMove(t) {
-    (t == null ? void 0 : t.type) === ut.PAN_MOVE && this.multiSelectEnable && (this.p2.copy(t.data.screenCoords), Hn.makeEmpty().expandByPoint(this.p1).expandByPoint(this.p2), this.graph.draw(Hn));
+    (t == null ? void 0 : t.type) === ut.PAN_MOVE && this.multiSelectEnable && (this.controller.enablePan || (this.p2.copy(t.data.screenCoords), Hn.makeEmpty().expandByPoint(this.p1).expandByPoint(this.p2), this.graph.draw(Hn)));
   }
   handleControllerPanEnd(t) {
     var a;
-    if ((t == null ? void 0 : t.type) !== ut.PAN_END || !this.multiSelectEnable) return;
+    if ((t == null ? void 0 : t.type) !== ut.PAN_END || !this.multiSelectEnable || this.controller.enablePan) return;
     this.p2.copy(t.data.screenCoords), Hn.makeEmpty().expandByPoint(this.p1).expandByPoint(this.p2).unproject(this.controller.camera);
     const e = (a = this.scene) == null ? void 0 : a.getElementsByBox(Hn), i = [];
     (e || []).forEach((o) => i.push(o.id)), this.graph.hide(), Hn.makeEmpty(), this.dispatchEvent({ type: "SELECTED", data: { target: e, selected: i } });
@@ -17203,6 +17207,7 @@ class _b extends rr {
   zoomBox = new Dt();
   selectEnable = !1;
   multiSelectEnable = !1;
+  fnEnable = !1;
   tween;
   animateDuration;
   label;
@@ -17263,6 +17268,9 @@ class _b extends rr {
   multiSelectEnableChanged(t) {
     this.multiSelectEnable = !!t, this.multiSelector.multiSelectEnableChanged(t);
   }
+  fnEnableChanged(t) {
+    this.fnEnable = !!t, this.multiSelector.fnEnableChanged(t);
+  }
   // ================ events
   getIntersectObjects(t, e, i = []) {
     return this.scene ? this.scene.getIntersectObjects(t, e, i) : i;
@@ -17467,6 +17475,7 @@ class $b extends rr {
   zoomBox = new Dt();
   selectEnable = !1;
   multiSelectEnable = !1;
+  fnEnable = !1;
   requestHeader = {};
   runningHandler = this.running.bind(this);
   pointerOverHandler = this.handlePointerOver.bind(this);
@@ -17615,9 +17624,9 @@ class $b extends rr {
     var e;
     (e = this.scene) == null || e.clearFillOrStrokeByIds(t, "stroke");
   }
-  setStrokeByIds(t, e) {
-    var i;
-    (i = this.scene) == null || i.setFillOrStrokeByIds(t, e, "stroke");
+  setStrokeByIds(t, e, i) {
+    var a;
+    (a = this.scene) == null || a.setFillOrStrokeByIds(t, e, "stroke", i);
   }
   getLegend() {
     var t;
@@ -17703,6 +17712,9 @@ class $b extends rr {
     var e;
     (e = this.scene) == null || e.socialDistanceEnableChanged(t);
   }
+  fnEnableChanged(t) {
+    this.fnEnable = !!t, this.view.fnEnableChanged(t);
+  }
   getBoundingBoxById(t, e = !0) {
     var a;
     if (!t) return;