@glodon-aiot/dataset-annotation 3.15.5-alpha.1 → 3.15.5-alpha.2

package/dist/es/components/DetectionAnnotation/components/ImageDetail/index.mjs

@@ -2,27 +2,27 @@ var _ = Object.defineProperty, $ = Object.defineProperties;
 var V = Object.getOwnPropertyDescriptors;
 var M = Object.getOwnPropertySymbols;
 var S = Object.prototype.hasOwnProperty, ee = Object.prototype.propertyIsEnumerable;
-var A = (n, t, a) => t in n ? _(n, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[t] = a, m = (n, t) => {
-  for (var a in t || (t = {}))
-    S.call(t, a) && A(n, a, t[a]);
+var A = (n, t, o) => t in n ? _(n, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[t] = o, b = (n, t) => {
+  for (var o in t || (t = {}))
+    S.call(t, o) && A(n, o, t[o]);
   if (M)
-    for (var a of M(t))
-      ee.call(t, a) && A(n, a, t[a]);
+    for (var o of M(t))
+      ee.call(t, o) && A(n, o, t[o]);
   return n;
 }, u = (n, t) => $(n, V(t));
-import { jsxs as b, jsx as c } from "react/jsx-runtime";
+import { jsxs as m, jsx as f } from "react/jsx-runtime";
 import { useRef as B, useState as h, useEffect as g } from "react";
 import { Button as H } from "antd";
 import { useKeyPress as K } from "ahooks";
 import "./style.less.mjs";
 import ie from "../Labels/index.mjs";
-import le from "../LabelMaker/index.mjs";
+import se from "../LabelMaker/index.mjs";
 import O from "../../../Iconfont/index.mjs";
-const me = (n) => {
+const be = (n) => {
   var D, E, F;
   const {
     datasetId: t,
-    isImageDetailVisible: a = !0,
+    isImageDetailVisible: o = !0,
     currentSample: e,
     onNextClick: v,
     onPrevClick: L,
@@ -36,8 +36,8 @@ const me = (n) => {
     readonly: G,
     showLabelList: P = !0,
     renderLabelItem: J,
-    onLoadingChange: I
-  } = n, Q = B(null), T = B({}), [z, W] = h({}), [w, p] = h(), [o, y] = h(), [X, Y] = h(!1), [x, R] = h(!1);
+    onLoadingChange: w
+  } = n, Q = B(null), T = B({}), [z, W] = h({}), [p, x] = h(), [a, y] = h(), [X, Y] = h(!1), [I, R] = h(!1);
   K("rightarrow", () => {
     v && v();
   }), K("leftarrow", () => {
@@ -45,115 +45,115 @@ const me = (n) => {
   }), g(() => () => {
     X && N && N();
   }, []), g(() => {
-    var l, s;
-    if (p(void 0), y(void 0), !a || !((l = e == null ? void 0 : e.labels) != null && l.length))
+    var s, l;
+    if (x(void 0), (e == null ? void 0 : e.id) !== (a == null ? void 0 : a.id) && y(void 0), !o || !((s = e == null ? void 0 : e.labels) != null && s.length))
       return;
-    const i = (s = o || e) == null ? void 0 : s.labels.reduce((f, j) => (f[j.id] ? ++f[j.id] : f[j.id] = 1, f), {});
+    const i = (l = a || e) == null ? void 0 : l.labels.reduce((c, j) => (c[j.id] ? ++c[j.id] : c[j.id] = 1, c), {});
     W(i || {});
-  }, [a, e, o]), g(() => {
+  }, [o, e, a]), g(() => {
     e != null && e.fileUrl && R(!0);
   }, [e == null ? void 0 : e.fileUrl]), g(() => {
-    I && I(x);
-  }, [x, I]), g(() => {
-    if (o != null && o.labels) {
+    w && w(I);
+  }, [I, w]), g(() => {
+    if (a != null && a.labels) {
       const i = [];
-      o.labels.forEach((l) => {
-        const s = d.find((f) => f.id === l.id);
-        s && i.push(u(m({}, l), {
-          label: s.label
+      a.labels.forEach((s) => {
+        const l = d.find((c) => c.id === s.id);
+        l && i.push(u(b({}, s), {
+          label: l.label
         }));
-      }), o.labels = i, y(m({}, o));
+      }), a.labels = i, y(b({}, a));
     }
   }, [d]);
   const Z = () => {
     Q.current && R(!1);
   };
-  return window.onresize = Z, /* @__PURE__ */ b("div", {
+  return window.onresize = Z, /* @__PURE__ */ m("div", {
     className: "detection-image-detail",
-    children: [/* @__PURE__ */ b("div", {
+    children: [/* @__PURE__ */ m("div", {
       className: "detail-image",
-      children: [U ? /* @__PURE__ */ b("div", {
+      children: [U ? /* @__PURE__ */ m("div", {
         className: "img-detail-info",
         children: ["第 ", r == null ? void 0 : r.index, " 张 / 共 ", r == null ? void 0 : r.total, " 张"]
-      }) : /* @__PURE__ */ c("div", {
+      }) : /* @__PURE__ */ f("div", {
         className: "img-detail-info",
         children: r == null ? void 0 : r.index
-      }), /* @__PURE__ */ b("div", {
+      }), /* @__PURE__ */ m("div", {
         className: "detail-content",
-        children: [L && /* @__PURE__ */ c(H, {
+        children: [L && /* @__PURE__ */ f(H, {
           className: "select-prev",
-          icon: /* @__PURE__ */ c(O, {
+          icon: /* @__PURE__ */ f(O, {
             type: "icon-zuojiantou"
           }),
           type: "text",
-          disabled: x,
+          disabled: I,
           onClick: () => L(),
           tabIndex: 0
-        }), /* @__PURE__ */ b("div", {
+        }), /* @__PURE__ */ m("div", {
           className: "select-main",
           ref: T,
-          children: [((D = e == null ? void 0 : e.sampleFileName) == null ? void 0 : D.name) && /* @__PURE__ */ c("div", {
+          children: [((D = e == null ? void 0 : e.sampleFileName) == null ? void 0 : D.name) && /* @__PURE__ */ f("div", {
             className: "img-detail-name-overlay",
             children: e.sampleFileName.name
-          }), /* @__PURE__ */ c(le, {
+          }), /* @__PURE__ */ f(se, {
             disabled: G,
             imageUrl: (e == null ? void 0 : e.fileUrl) || "",
-            pen: w,
-            labels: ((E = o ? o.labels : e == null ? void 0 : e.labels) == null ? void 0 : E.map((i) => {
-              var l;
-              return u(m({}, i), {
-                color: ((l = d.find((s) => s.id === i.id)) == null ? void 0 : l.color) || ""
+            pen: p,
+            labels: ((E = a ? a.labels : e == null ? void 0 : e.labels) == null ? void 0 : E.map((i) => {
+              var s;
+              return u(b({}, i), {
+                color: ((s = d.find((l) => l.id === i.id)) == null ? void 0 : s.color) || ""
               });
             })) || [],
             onImageLoad: () => R(!1),
             onChange: (i) => {
-              if (p(void 0), !e)
+              if (x(void 0), !e)
                 return;
-              const l = u(m({}, e), {
-                labels: i.map((s) => ({
-                  id: s.id,
-                  label: s.label,
-                  box: s.box
+              const s = u(b({}, e), {
+                labels: i.map((l) => ({
+                  id: l.id,
+                  label: l.label,
+                  box: l.box
                 }))
               });
-              y(l), k && k(l);
+              y(s), k && k(s);
             },
             isPreLabel: C,
             renderLabelItem: J
           }, P ? "with-slide" : "no-slide")]
-        }), v && /* @__PURE__ */ c(H, {
+        }), v && /* @__PURE__ */ f(H, {
           className: "select-next",
-          icon: /* @__PURE__ */ c(O, {
+          icon: /* @__PURE__ */ f(O, {
             type: "icon-youjiantou"
           }),
           type: "text",
-          disabled: x,
+          disabled: I,
           onClick: () => v()
         })]
       })]
-    }), (!!(d != null && d.length) || q) && P && /* @__PURE__ */ c("div", {
+    }), (!!(d != null && d.length) || q) && P && /* @__PURE__ */ f("div", {
       className: "detail-slide",
-      children: /* @__PURE__ */ c(ie, {
+      children: /* @__PURE__ */ f(ie, {
         datasetId: t,
         selectMode: "single",
         data: ((F = Object.keys(z)) == null ? void 0 : F.map((i) => {
-          const l = d.find((s) => s.id === i);
-          if (l)
-            return l.count = z[i], l;
+          const s = d.find((l) => l.id === i);
+          if (s)
+            return s.count = z[i], s;
         }).filter((i) => !!i)) || [],
         shortcut: !0,
-        selected: w ? [w] : [],
+        selected: p ? [p] : [],
         onSelectedChange: (i) => {
           if (i.length > 2) {
             console.warn("不支持选中多个标签");
             return;
           }
           if (!i.length) {
-            p(void 0);
+            x(void 0);
             return;
           }
-          const l = d == null ? void 0 : d.find((s) => i[0].label === s.label);
-          p(l);
+          const s = d == null ? void 0 : d.find((l) => i[0].label === l.label);
+          x(s);
         },
         onListChange: () => {
           Y(!0), N && N();
@@ -165,5 +165,5 @@ const me = (n) => {
   });
 };
 export {
-  me as default
+  be as default
 };

package/dist/es/components/DetectionAnnotation/components/LabelMaker/Drawable.mjs

@@ -1,54 +1,102 @@
-function X(e, n) {
-  T(e);
-  let h = -1, s = -1, p = 0, m = 0, w = !1;
-  e.on("mouse:down:before", (d) => {
-    const f = d.target, u = e.getActiveObject();
-    if (f && f !== e.backgroundImage) {
-      u !== f && (e.setActiveObject(f), e.requestRenderAll()), e.skipTargetFind = !1;
+function A(t, w) {
+  I(t);
+  let s = -1, p = -1, b = 0, T = 0, x = !1;
+  t.on("mouse:down:before", (l) => {
+    const i = l.target, n = t.getActiveObject(), g = t.getPointer(l.e), c = t.backgroundImage, m = c == null ? void 0 : c.aCoords;
+    let o = !1;
+    if (m && (o = g.x >= m.tl.x && g.x <= m.br.x && g.y >= m.tl.y && g.y <= m.br.y), !o) {
+      n && (t.discardActiveObject(), t.renderAll()), t.skipTargetFind = !0;
       return;
     }
-    u && (e.discardActiveObject(), e.renderAll()), e.skipTargetFind = !0;
-  }), e.on("mouse:down", (d) => {
-    if (!e.skipTargetFind)
+    if (i && i !== t.backgroundImage) {
+      n !== i && (t.setActiveObject(i), t.requestRenderAll()), t.skipTargetFind = !1;
       return;
-    w = !0, h = -1, s = -1, p = 0, m = 0;
-    const f = e.getZoom();
-    s = d.e.offsetX / f, h = d.e.offsetY / f;
-  }), e.on("mouse:up", (d) => {
-    if (e.skipTargetFind = !1, !w || (w = !1, s === -1 && h === -1))
+    }
+    n && (t.discardActiveObject(), t.renderAll()), t.skipTargetFind = !0;
+  }), t.on("mouse:down", (l) => {
+    if (!t.skipTargetFind)
+      return;
+    x = !0, s = -1, p = -1, b = 0, T = 0;
+    const i = t.getZoom();
+    p = l.e.offsetX / i, s = l.e.offsetY / i;
+  }), t.on("mouse:up:before", (l) => {
+    if (x) {
+      const i = t.selection;
+      t.selection = !1, setTimeout(() => {
+        t.selection = i;
+      }, 0);
+    }
+  }), t.on("mouse:up", (l) => {
+    if (!x) {
+      t.skipTargetFind && setTimeout(() => {
+        t.skipTargetFind = !1;
+      }, 0);
       return;
-    const f = e.getZoom(), u = d.e.offsetX > e.getWidth() ? e.getWidth() / f : d.e.offsetX / f, b = d.e.offsetY > e.getHeight() ? e.getHeight() / f : d.e.offsetY / f;
-    if (p = Math.abs(u - s), m = Math.abs(b - h), p === 0 || m === 0)
+    }
+    if (x = !1, p === -1 && s === -1) {
+      setTimeout(() => {
+        t.skipTargetFind = !1;
+      }, 0);
       return;
-    const y = e.viewportTransform ? e.viewportTransform[4] / f : 0, A = e.viewportTransform ? e.viewportTransform[5] / f : 0;
-    let r = h > b ? b : h, i = s > u ? u : s, l = p, g = m;
-    r = r - A, i = i - y;
+    }
+    const i = t.getZoom(), n = l.e.offsetX > t.getWidth() ? t.getWidth() / i : l.e.offsetX / i, g = l.e.offsetY > t.getHeight() ? t.getHeight() / i : l.e.offsetY / i;
+    if (b = Math.abs(n - p), T = Math.abs(g - s), b === 0 || T === 0) {
+      setTimeout(() => {
+        t.skipTargetFind = !1;
+      }, 0);
+      return;
+    }
+    const c = t.viewportTransform ? t.viewportTransform[4] / i : 0, m = t.viewportTransform ? t.viewportTransform[5] / i : 0;
+    let o = s > g ? g : s, r = p > n ? n : p, d = b, h = T;
+    o = o - m, r = r - c;
     const F = () => {
-      var o, k;
-      const t = e.backgroundImage;
-      t && typeof t != "string" && ((o = t.aCoords) != null && o.tl.x, (k = t.aCoords) != null && k.tl.y), t && typeof t != "string" && t.top !== void 0 && t.height !== void 0 && t.left !== void 0 && t.width !== void 0 && (r < t.top && (g = g - (t.top - r), r = t.top), r + g > t.top + t.height && (g = t.top + t.height - r + g - g, r = t.height + t.top - g), i < t.left && (l = l - (t.left - i), i = t.left), i + l > t.left + t.width && (l = t.left + t.width - i + l - l, i = t.width + t.left - l));
-    }, I = (t) => {
-      const o = e.backgroundImage;
-      return !(o && typeof o != "string" && o.top !== void 0 && o.height !== void 0 && o.left !== void 0 && o.width !== void 0 && (t[0] < o.left || t[1] < o.top || t[0] > o.left + o.width || t[1] > o.top + o.height));
+      var f, k;
+      const e = t.backgroundImage;
+      if (e && typeof e != "string" && ((f = e.aCoords) != null && f.tl.x, (k = e.aCoords) != null && k.tl.y), e && typeof e != "string" && e.top !== void 0 && e.height !== void 0 && e.left !== void 0 && e.width !== void 0) {
+        if (o < e.top) {
+          const u = e.top - o;
+          h = Math.max(0, h - u), o = e.top;
+        }
+        if (o + h > e.top + e.height) {
+          const u = e.top + e.height - o;
+          h = Math.max(0, Math.min(h, u)), o + h > e.top + e.height && (o = e.top + e.height - h);
+        }
+        if (r < e.left) {
+          const u = e.left - r;
+          d = Math.max(0, d - u), r = e.left;
+        }
+        if (r + d > e.left + e.width) {
+          const u = e.left + e.width - r;
+          d = Math.max(0, Math.min(d, u)), r + d > e.left + e.width && (r = e.left + e.width - d);
+        }
+        o = Math.max(e.top, Math.min(o, e.top + e.height)), r = Math.max(e.left, Math.min(r, e.left + e.width)), d = Math.max(0, Math.min(d, e.left + e.width - r)), h = Math.max(0, Math.min(h, e.top + e.height - o));
+      }
+    }, y = (e) => {
+      const f = t.backgroundImage;
+      return !(f && typeof f != "string" && f.top !== void 0 && f.height !== void 0 && f.left !== void 0 && f.width !== void 0 && (e[0] < f.left - 0.01 || e[1] < f.top - 0.01 || e[0] > f.left + f.width + 0.01 || e[1] > f.top + f.height + 0.01));
     };
     F();
-    const c = [[i, r], [i + l, r], [i + l, r + g], [i, r + g]];
-    n && c.every((t) => I(t)) && n({
+    const M = [[r, o], [r + d, o], [r + d, o + h], [r, o + h]];
+    w && M.every((e) => y(e)) ? (w({
       id: "",
       color: "#cccccc",
       label: "未知",
-      box: c
-    }), T(e);
+      box: M
+    }), setTimeout(() => {
+      t.skipTargetFind = !1;
+    }, 0)) : (t.discardActiveObject(), t.renderAll(), setTimeout(() => {
+      t.skipTargetFind = !1;
+    }, 0));
   });
 }
-const T = (e) => {
-  e.off("mouse:down"), e.off("mouse:down:before"), e.off("mouse:up"), e.skipTargetFind = !1;
+const I = (t) => {
+  t.off("mouse:down"), t.off("mouse:down:before"), t.off("mouse:up"), t.skipTargetFind = !1;
 };
-function Y(e, n, h) {
-  if (!h)
-    return X(e, n), e;
+function O(t, w, s) {
+  if (!s)
+    return A(t, w), t;
 }
 export {
-  Y as drawable,
-  T as stopDraw
+  O as drawable,
+  I as stopDraw
 };