@realsee/dnalogel 2.21.0-dev.6 → 2.21.0-dev.7

package/libs/PanoMeasurePlugin/Components/Controller1.js

@@ -1,10 +1,10 @@
-import { SvelteComponent as F, init as G, safe_not_equal as H, append_styles as I, element as v, create_component as P, space as T, attr as C, toggle_class as K, insert as $, mount_component as A, append as h, transition_in as z, transition_out as w, check_outros as J, detach as S, destroy_component as E, onMount as L, onDestroy as N, listen as D, noop as W, group_outros as O } from "../../vendor/svelte/internal/index.js";
-import Q from "./Common/Switcher1.js";
-import R from "./Common/CircleButton.js";
-import U from "../Controller/EditController.js";
-import V from "./Common/Exit.js";
+import { SvelteComponent as U, init as V, safe_not_equal as W, append_styles as X, element as _, create_component as q, space as E, attr as k, toggle_class as $, insert as B, mount_component as z, append as b, transition_in as c, transition_out as h, check_outros as K, detach as D, destroy_component as L, onMount as Y, onDestroy as Z, add_render_callback as R, create_bidirectional_transition as S, listen as J, group_outros as j } from "../../vendor/svelte/internal/index.js";
+import x from "./Common/Switcher1.js";
+import ee from "./Common/CircleButton.js";
+import F from "../Controller/EditController.js";
+import te from "./Common/Exit.js";
+import { fade as A } from "../../vendor/svelte/transition/index.js";
 import "../Modules/UIController/mobileHTML.js";
-import "hammerjs";
 import "../Model/line.js";
 import "../../shared-utils/uuid.js";
 import "../utils/line.js";
@@ -20,8 +20,6 @@ import "../../shared-utils/removeArrayItem.js";
 import "../../shared-utils/throttle.js";
 import "../Controller/BaseController.js";
 import "../utils/ironbox.js";
-import "../utils/getIntersectionFromEvent.js";
-import "../utils/getPointFromHammerEvent.js";
 import "../Model/polyline.js";
 import "../Model/area.js";
 import "../Model/polygon.js";
@@ -35,6 +33,7 @@ import "../utils/isIntersecting.js";
 import "../../shared-utils/three/PointSelector.js";
 import "../../shared-utils/three/PointSelectorHelper.js";
 import "../../shared-utils/three/Magnifier.js";
+import "hammerjs";
 import "../../shared-utils/three/getIntersect.js";
 import "../../shared-utils/three/PointHelper.js";
 import "../../shared-utils/three/Assets/index.js";
@@ -57,239 +56,310 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import "../../shared-utils/isAbsoluteURL.js";
+import "../../shared-utils/absoluteUrl.js";
 import "../../shared-utils/animationFrame/BetterTween.js";
 import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/isTouchDevice.js";
-function X(l) {
-  I(l, "svelte-12klgza", ".Measure-Controller.svelte-12klgza.svelte-12klgza{pointer-events:none;color:white}.Measure-Controller.svelte-12klgza .mode-switcher.svelte-12klgza{margin-top:2.25rem}.Measure-Controller.svelte-12klgza .bottom.svelte-12klgza{position:absolute;width:100%;bottom:2.5rem}.Measure-Controller.svelte-12klgza .bottom .center.svelte-12klgza{display:flex;flex-direction:column;align-items:center}.Measure-Controller.svelte-12klgza .controller.svelte-12klgza{pointer-events:all;display:flex;align-items:center}.Measure-Controller.svelte-12klgza .controller .button.svelte-12klgza{cursor:pointer;display:flex;align-items:center;justify-content:center;height:2.5rem;padding-left:1rem;padding-right:1rem;border-radius:624.9375rem;font-size:0.875rem;background-color:rgba(0, 0, 0, 0.2)}.Measure-Controller.svelte-12klgza .controller .main-button.svelte-12klgza{margin-left:1.75rem;margin-right:1.75rem}.Measure-Controller.svelte-12klgza .controller .main-button.forbid.svelte-12klgza{pointer-events:none;opacity:0.5}");
+import "../../shared-utils/getIntersectionFromEvent.js";
+import "../../shared-utils/getPointFromHammerEvent.js";
+import "../../vendor/svelte/easing/index.js";
+function oe(r) {
+  X(r, "svelte-oflaon", "*.forbid.svelte-oflaon.svelte-oflaon{pointer-events:none;opacity:0.5}.Measure-Controller.svelte-oflaon.svelte-oflaon{pointer-events:none;color:white}.Measure-Controller.svelte-oflaon .mode-switcher.svelte-oflaon{margin-top:2.25rem}.Measure-Controller.svelte-oflaon .bottom.svelte-oflaon{position:absolute;width:100%;bottom:2.5rem}.Measure-Controller.svelte-oflaon .bottom .center.svelte-oflaon{display:flex;flex-direction:column;align-items:center}.Measure-Controller.svelte-oflaon .controller.svelte-oflaon{pointer-events:all;display:flex;align-items:center}.Measure-Controller.svelte-oflaon .controller .button.svelte-oflaon{cursor:pointer;display:flex;align-items:center;justify-content:center;height:2.5rem;padding-left:1rem;padding-right:1rem;border-radius:624.9375rem;font-size:0.875rem;background-color:rgba(0, 0, 0, 0.2)}.Measure-Controller.svelte-oflaon .controller .main-button.svelte-oflaon{margin-left:1.75rem;margin-right:1.75rem}");
 }
-function j(l) {
-  let t, o, e;
-  return o = new Q({
+function G(r) {
+  let o, t, e, m;
+  return t = new x({
     props: {
       options: [{ key: "line", value: "测距离" }, { key: "area", value: "测面积" }],
       defaultKey: (
         /*measureController*/
-        l[0].currentMeasureType
+        r[0].currentMeasureType
       ),
       onChange: (
-        /*func*/
-        l[9]
+        /*measureController*/
+        r[0].changeMeasureType
       )
     }
   }), {
     c() {
-      t = v("div"), P(o.$$.fragment), C(t, "class", "mode-switcher svelte-12klgza");
+      o = _("div"), q(t.$$.fragment), k(o, "class", "mode-switcher svelte-oflaon");
     },
-    m(n, s) {
-      $(n, t, s), A(o, t, null), e = !0;
+    m(l, i) {
+      B(l, o, i), z(t, o, null), m = !0;
     },
-    p(n, s) {
-      const c = {};
-      s & /*measureController*/
-      1 && (c.defaultKey = /*measureController*/
-      n[0].currentMeasureType), s & /*measureController*/
-      1 && (c.onChange = /*func*/
-      n[9]), o.$set(c);
+    p(l, i) {
+      r = l;
+      const a = {};
+      i & /*measureController*/
+      1 && (a.defaultKey = /*measureController*/
+      r[0].currentMeasureType), i & /*measureController*/
+      1 && (a.onChange = /*measureController*/
+      r[0].changeMeasureType), t.$set(a);
     },
-    i(n) {
-      e || (z(o.$$.fragment, n), e = !0);
+    i(l) {
+      m || (c(t.$$.fragment, l), l && R(() => {
+        m && (e || (e = S(o, A, { duration: P }, !0)), e.run(1));
+      }), m = !0);
     },
-    o(n) {
-      w(o.$$.fragment, n), e = !1;
+    o(l) {
+      h(t.$$.fragment, l), l && (e || (e = S(o, A, { duration: P }, !1)), e.run(0)), m = !1;
     },
-    d(n) {
-      n && S(t), E(o);
+    d(l) {
+      l && D(o), L(t), l && e && e.end();
     }
   };
 }
-function q(l) {
-  let t, o, e;
+function H(r) {
+  let o, t, e, m, l;
   return {
     c() {
-      t = v("div"), t.textContent = "撤销", C(t, "class", "button svelte-12klgza");
+      o = _("div"), o.textContent = "撤销", k(o, "class", "button svelte-oflaon"), $(
+        o,
+        "forbid",
+        /*buttonState*/
+        r[4] === "start"
+      );
     },
-    m(n, s) {
-      $(n, t, s), o || (e = D(
-        t,
+    m(i, a) {
+      B(i, o, a), e = !0, m || (l = J(
+        o,
         "click",
         /*click_handler*/
-        l[10]
-      ), o = !0);
+        r[13]
+      ), m = !0);
     },
-    p: W,
-    d(n) {
-      n && S(t), o = !1, e();
+    p(i, a) {
+      r = i, (!e || a & /*buttonState*/
+      16) && $(
+        o,
+        "forbid",
+        /*buttonState*/
+        r[4] === "start"
+      );
+    },
+    i(i) {
+      e || (i && R(() => {
+        e && (t || (t = S(o, A, { duration: P }, !0)), t.run(1));
+      }), e = !0);
+    },
+    o(i) {
+      i && (t || (t = S(o, A, { duration: P }, !1)), t.run(0)), e = !1;
+    },
+    d(i) {
+      i && D(o), i && t && t.end(), m = !1, l();
     }
   };
 }
-function B(l) {
-  let t, o, e;
+function I(r) {
+  let o, t, e, m, l;
   return {
     c() {
-      t = v("div"), t.textContent = "结束", C(t, "class", "button svelte-12klgza");
+      o = _("div"), o.textContent = "结束", k(o, "class", "button svelte-oflaon");
     },
-    m(n, s) {
-      $(n, t, s), o || (e = D(
-        t,
+    m(i, a) {
+      B(i, o, a), e = !0, m || (l = J(
+        o,
         "click",
-        /*click_handler_1*/
-        l[12]
-      ), o = !0);
+        /*complete*/
+        r[10]
+      ), m = !0);
     },
-    p: W,
-    d(n) {
-      n && S(t), o = !1, e();
+    p(i, a) {
+      r = i;
+    },
+    i(i) {
+      e || (i && R(() => {
+        e && (t || (t = S(o, A, { duration: P }, !0)), t.run(1));
+      }), e = !0);
+    },
+    o(i) {
+      i && (t || (t = S(o, A, { duration: P }, !1)), t.run(0)), e = !1;
+    },
+    d(i) {
+      i && D(o), i && t && t.end(), m = !1, l();
     }
   };
 }
-function Y(l) {
-  let t, o, e, n, s, c, m, b, d, u, M, g;
-  o = new V({
+function re(r) {
+  let o, t, e, m, l, i, a, y, v, d, T, g;
+  t = new te({
     props: {
       onClick: (
         /*measureController*/
-        l[0].disable
+        r[0].disable
       )
     }
   });
-  let i = (
+  let s = (
     /*measureController*/
-    l[0].allowMeasureType.length >= 2 && j(l)
-  ), a = (
-    /*currentMeasureType*/
-    l[3] === "area" && q(l)
+    r[0].allowMeasureType.length >= 2 && /*buttonState*/
+    r[4] === "start" && G(r)
+  ), p = (
+    /*showButton*/
+    r[2] && H(r)
   );
-  u = new R({
+  d = new ee({
     props: {
       onClick: (
-        /*func_1*/
-        l[11]
+        /*func*/
+        r[14]
       ),
       text: (
-        /*buttonTextMap*/
-        l[4][
-          /*buttonState*/
-          l[2]
-        ]
+        /*currentMeasureType*/
+        r[1] === "area" ? (
+          /*buttonAreaTextMap*/
+          r[5][
+            /*buttonState*/
+            r[4]
+          ]
+        ) : (
+          /*buttonLineTextMap*/
+          r[6][
+            /*buttonState*/
+            r[4]
+          ]
+        )
       ),
       color: (
         /*buttonColorMap*/
-        l[5][
+        r[7][
           /*buttonState*/
-          l[2]
+          r[4]
         ]
       )
     }
   });
-  let p = (
-    /*currentMeasureType*/
-    l[3] === "area" && B(l)
+  let f = (
+    /*showButton*/
+    r[2] && I(r)
   );
   return {
     c() {
-      t = v("div"), P(o.$$.fragment), e = T(), n = v("div"), s = v("div"), i && i.c(), c = T(), m = v("div"), a && a.c(), b = T(), d = v("div"), P(u.$$.fragment), M = T(), p && p.c(), C(d, "class", "main-button svelte-12klgza"), K(d, "forbid", !/*allowAddPoint*/
-      l[1]), C(m, "class", "controller svelte-12klgza"), C(s, "class", "center svelte-12klgza"), C(n, "class", "bottom svelte-12klgza"), C(t, "class", "Measure-Controller svelte-12klgza");
+      o = _("div"), q(t.$$.fragment), e = E(), m = _("div"), l = _("div"), s && s.c(), i = E(), a = _("div"), p && p.c(), y = E(), v = _("div"), q(d.$$.fragment), T = E(), f && f.c(), k(v, "class", "main-button svelte-oflaon"), $(v, "forbid", !/*allowAddPoint*/
+      r[3]), k(a, "class", "controller svelte-oflaon"), k(l, "class", "center svelte-oflaon"), k(m, "class", "bottom svelte-oflaon"), k(o, "class", "Measure-Controller svelte-oflaon");
     },
-    m(r, f) {
-      $(r, t, f), A(o, t, null), h(t, e), h(t, n), h(n, s), i && i.m(s, null), h(s, c), h(s, m), a && a.m(m, null), h(m, b), h(m, d), A(u, d, null), h(m, M), p && p.m(m, null), g = !0;
+    m(n, u) {
+      B(n, o, u), z(t, o, null), b(o, e), b(o, m), b(m, l), s && s.m(l, null), b(l, i), b(l, a), p && p.m(a, null), b(a, y), b(a, v), z(d, v, null), b(a, T), f && f.m(a, null), g = !0;
     },
-    p(r, [f]) {
-      const y = {};
-      f & /*measureController*/
-      1 && (y.onClick = /*measureController*/
-      r[0].disable), o.$set(y), /*measureController*/
-      r[0].allowMeasureType.length >= 2 ? i ? (i.p(r, f), f & /*measureController*/
-      1 && z(i, 1)) : (i = j(r), i.c(), z(i, 1), i.m(s, c)) : i && (O(), w(i, 1, 1, () => {
-        i = null;
-      }), J()), /*currentMeasureType*/
-      r[3] === "area" ? a ? a.p(r, f) : (a = q(r), a.c(), a.m(m, b)) : a && (a.d(1), a = null);
-      const _ = {};
-      f & /*buttonState*/
-      4 && (_.onClick = /*func_1*/
-      r[11]), f & /*buttonState*/
-      4 && (_.text = /*buttonTextMap*/
-      r[4][
-        /*buttonState*/
-        r[2]
-      ]), f & /*buttonState*/
-      4 && (_.color = /*buttonColorMap*/
-      r[5][
+    p(n, [u]) {
+      const M = {};
+      u & /*measureController*/
+      1 && (M.onClick = /*measureController*/
+      n[0].disable), t.$set(M), /*measureController*/
+      n[0].allowMeasureType.length >= 2 && /*buttonState*/
+      n[4] === "start" ? s ? (s.p(n, u), u & /*measureController, buttonState*/
+      17 && c(s, 1)) : (s = G(n), s.c(), c(s, 1), s.m(l, i)) : s && (j(), h(s, 1, 1, () => {
+        s = null;
+      }), K()), /*showButton*/
+      n[2] ? p ? (p.p(n, u), u & /*showButton*/
+      4 && c(p, 1)) : (p = H(n), p.c(), c(p, 1), p.m(a, y)) : p && (j(), h(p, 1, 1, () => {
+        p = null;
+      }), K());
+      const w = {};
+      u & /*buttonState*/
+      16 && (w.onClick = /*func*/
+      n[14]), u & /*currentMeasureType, buttonState*/
+      18 && (w.text = /*currentMeasureType*/
+      n[1] === "area" ? (
+        /*buttonAreaTextMap*/
+        n[5][
+          /*buttonState*/
+          n[4]
+        ]
+      ) : (
+        /*buttonLineTextMap*/
+        n[6][
+          /*buttonState*/
+          n[4]
+        ]
+      )), u & /*buttonState*/
+      16 && (w.color = /*buttonColorMap*/
+      n[7][
         /*buttonState*/
-        r[2]
-      ]), u.$set(_), (!g || f & /*allowAddPoint*/
-      2) && K(d, "forbid", !/*allowAddPoint*/
-      r[1]), /*currentMeasureType*/
-      r[3] === "area" ? p ? p.p(r, f) : (p = B(r), p.c(), p.m(m, null)) : p && (p.d(1), p = null);
+        n[4]
+      ]), d.$set(w), (!g || u & /*allowAddPoint*/
+      8) && $(v, "forbid", !/*allowAddPoint*/
+      n[3]), /*showButton*/
+      n[2] ? f ? (f.p(n, u), u & /*showButton*/
+      4 && c(f, 1)) : (f = I(n), f.c(), c(f, 1), f.m(a, null)) : f && (j(), h(f, 1, 1, () => {
+        f = null;
+      }), K());
     },
-    i(r) {
-      g || (z(o.$$.fragment, r), z(i), z(u.$$.fragment, r), g = !0);
+    i(n) {
+      g || (c(t.$$.fragment, n), c(s), c(p), c(d.$$.fragment, n), c(f), g = !0);
     },
-    o(r) {
-      w(o.$$.fragment, r), w(i), w(u.$$.fragment, r), g = !1;
+    o(n) {
+      h(t.$$.fragment, n), h(s), h(p), h(d.$$.fragment, n), h(f), g = !1;
     },
-    d(r) {
-      r && S(t), E(o), i && i.d(), a && a.d(), E(u), p && p.d();
+    d(n) {
+      n && D(o), L(t), s && s.d(), p && p.d(), L(d), f && f.d();
     }
   };
 }
-function Z(l, t, o) {
-  let { measureController: e } = t;
-  const n = { start: "开始", add: "添加", end: "结束" }, s = {
+const P = 100;
+function ne(r, o, t) {
+  let { measureController: e } = o;
+  const m = { start: "开始", add: "添加", end: "结束" }, l = { start: "开始", add: "添加", end: "完成" }, i = {
     start: "white",
     add: "white",
     end: "blue"
   };
-  let c = !0, m = "start", b = e.currentMeasureType;
-  const d = () => {
-    e.getCurrentMode() !== "Edit" ? e.changeMode("Edit") : (o(2, m = "add"), u());
+  let a = !1, y = !1, v = !0, d = "start", T = e.currentMeasureType;
+  const g = () => {
+    t(12, a = !0), e.getCurrentMode() !== "Edit" ? e.changeMode("Edit") : (t(4, d = "add"), s());
+  }, s = () => {
+    e.controller instanceof F && e.controller.selectPoint();
+  }, p = () => {
+    e.controller instanceof F && e.controller.complete();
+  }, f = () => {
+    s(), M("allow");
+  }, n = () => {
+    t(4, d = "end");
   }, u = () => {
-    e.controller instanceof U && e.controller.selectPoint();
-  }, M = () => {
-    u(), a("allow");
-  }, g = () => {
-    o(2, m = "end");
-  }, i = () => {
-    o(2, m = "start"), a("allow");
-  }, a = (k) => {
-    o(1, c = k === "allow");
-  }, p = (k) => {
-    o(3, b = k);
+    t(4, d = "start"), M("allow");
+  }, M = (C) => {
+    t(3, v = C === "allow");
+  }, w = (C) => {
+    t(1, T = C);
+  }, N = (C) => {
+    C.isEmpty && t(4, d = "start");
   };
-  L(() => {
-    e.hook.on("measureTypeChange", p), e.hook.on("modeChange", i), e.hook.on("allowAddPointStateChange", a), e.hook.on("readyComplete", g), e.hook.on("complete", i);
-  }), N(() => {
-    e.hook.off("measureTypeChange", p), e.hook.off("modeChange", i), e.hook.off("allowAddPointStateChange", a), e.hook.off("readyComplete", g), e.hook.off("complete", i);
+  Y(() => {
+    e.hook.on("revoke", N), e.hook.on("measureTypeChange", w), e.hook.on("modeChange", u), e.hook.on("allowAddPointStateChange", M), e.hook.on("readyComplete", n), e.hook.on("complete", u);
+  }), Z(() => {
+    e.hook.off("measureTypeChange", w), e.hook.off("modeChange", u), e.hook.off("allowAddPointStateChange", M), e.hook.off("readyComplete", n), e.hook.off("complete", u);
   });
-  const r = (k) => {
-    e.changeMeasureType(k);
-  }, f = () => e.revoke(), y = () => {
-    m === "start" ? d() : m === "add" ? u() : m === "end" && M();
-  }, _ = () => e.save({ mode: "Watch" });
-  return l.$$set = (k) => {
-    "measureController" in k && o(0, e = k.measureController);
+  const O = () => e.revoke(), Q = () => {
+    d === "start" ? g() : d === "add" ? s() : d === "end" && f();
+  };
+  return r.$$set = (C) => {
+    "measureController" in C && t(0, e = C.measureController);
+  }, r.$$.update = () => {
+    r.$$.dirty & /*currentMeasureType, isStarted*/
+    4098 && t(2, y = T === "area" && a);
   }, [
     e,
-    c,
+    T,
+    y,
+    v,
+    d,
     m,
-    b,
-    n,
+    l,
+    i,
+    g,
     s,
-    d,
-    u,
-    M,
-    r,
+    p,
     f,
-    y,
-    _
+    a,
+    O,
+    Q
   ];
 }
-class st extends F {
-  constructor(t) {
-    super(), G(this, t, Z, Y, H, { measureController: 0 }, X);
+class ht extends U {
+  constructor(o) {
+    super(), V(this, o, ne, re, W, { measureController: 0 }, oe);
   }
 }
 export {
-  st as default
+  ht as default
 };

package/libs/PanoMeasurePlugin/Controller/EditController.d.ts

@@ -7,13 +7,10 @@ export default class EditController extends BaseController {
     type: string;
     polyline: Polyline;
     area: Area;
-    /** 拖动的控制点 */
-    private pressPoint?;
     private hasAppendDashed;
     private fiveElement?;
     /** 上一个端点位置 */
     private lastPoint;
-    private hammer?;
     private pointSelector;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
@@ -31,24 +28,16 @@ export default class EditController extends BaseController {
      */
     revokeLine: (_polyline?: Polyline) => void;
     selectPoint(): void;
+    complete(): void;
     private onMouseLeave;
     /** 编辑线条发生改变时通知外部 */
     private onLineChanged;
-    private onPress;
-    /**
-     * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
-     * 2. 如果有长按点，把长按点位置更新为当前位置
-     */
-    private onPan;
-    private onPanEnd;
     /**
      * 1. 如果存在上一个点，需要绘制当前点到上一个点的连线
      * 2. 把上一个点的位置更新为当前点的位置
      * 3. 清除 pointSelector
      */
-    private onTap;
-    /** 存在长按点时不能移动全景 */
-    private onWantsPanGesture;
+    private onSelect;
     /** 移动全景时更新 distanceItem 在屏幕上的位置 */
     private onCameraUpdate;
     /** 更新虚线 */