@glodon-aiot/dataset-annotation 3.16.0-alpha.36 → 3.16.0-alpha.38

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

@@ -2,15 +2,15 @@ var $ = Math.pow;
 import { jsx as f, jsxs as V } from "react/jsx-runtime";
 import { useRef as ee, useState as D, useEffect as h } from "react";
 import { fabric as X } from "fabric";
-import { useKeyPress as T } from "ahooks";
+import { useKeyPress as R } from "ahooks";
 import "./style.less.mjs";
 import le from "react-dom";
-import { Spin as fe, Space as de, Tooltip as L, Button as S } from "antd";
+import { Spin as fe, Space as de, Tooltip as A, Button as L } from "antd";
 import te from "./RectLabel.mjs";
 import { drawable as ue } from "./Drawable.mjs";
 import { ZoomInOutlined as me, ZoomOutOutlined as ge, DragOutlined as he, ClearOutlined as pe } from "@ant-design/icons";
 import be from "classnames";
-import { approxeq as A } from "../../../../utils/index.mjs";
+import { approxeq as S } from "../../../../utils/index.mjs";
 const oe = (a) => {
   a.off("mouse:down"), a.off("mouse:up");
 }, O = (a) => {
@@ -28,9 +28,9 @@ const oe = (a) => {
     id: a.config.id,
     label: a.config.name,
     color: a.config.color,
-    box: (d == null ? void 0 : d.map((y) => [A(y.x - m.x, 0) ? 0 : A(y.x - m.x, p.width) ? p.width : y.x - m.x, A(y.y - m.y, 0) ? 0 : A(y.y - m.y, p.height) ? p.height : y.y - m.y])) || []
+    box: (d == null ? void 0 : d.map((y) => [S(y.x - m.x, 0) ? 0 : S(y.x - m.x, p.width) ? p.width : y.x - m.x, S(y.y - m.y, 0) ? 0 : S(y.y - m.y, p.height) ? p.height : y.y - m.y])) || []
   };
-}, Le = (a) => {
+}, Ae = (a) => {
   const d = ee(null), {
     labels: m,
     imageUrl: p,
@@ -38,12 +38,12 @@ const oe = (a) => {
     onImageLoad: E,
     onChange: l,
     isPreLabel: y,
-    disabled: C,
+    disabled: k,
     renderLabelItem: N
-  } = a, [z, B] = D(!0), [e, Z] = D(), [ye, ne] = D({}), [k, K] = D(), [W, re] = D({
+  } = a, [z, B] = D(!0), [e, Z] = D(), [ye, ne] = D({}), [j, K] = D(), [W, re] = D({
     left: 0,
     top: 0
-  }), [ie, U] = D([1, 1]), [P, H] = D(), [x, v] = D([]), j = ee(/* @__PURE__ */ new Set()), [b, R] = D(C || !1), Y = (o, t) => {
+  }), [ie, U] = D([1, 1]), [M, H] = D(), [x, v] = D([]), w = ee(/* @__PURE__ */ new Set()), [b, P] = D(k || !1), Y = (o, t) => {
     if (!e)
       return;
     t || (t = {
@@ -74,8 +74,8 @@ const oe = (a) => {
         return i && i === t;
       })), u >= 0 && r[u]) {
         const s = r[u];
-        j.current.add(s.config.id), s.destroy(), r.splice(u, 1), l && l(r.map(O)), setTimeout(() => {
-          j.current.delete(s.config.id);
+        w.current.add(s.config.id), s.destroy(), r.splice(u, 1), l && l(r.map(O)), setTimeout(() => {
+          w.current.delete(s.config.id);
         }, 100);
       } else if (t && e) {
         const s = r.findIndex((i) => {
@@ -84,8 +84,8 @@ const oe = (a) => {
         });
         if (s >= 0 && r[s]) {
           const i = r[s];
-          j.current.add(i.config.id), i.destroy(), r.splice(s, 1), l && l(r.map(O)), setTimeout(() => {
-            j.current.delete(i.config.id);
+          w.current.add(i.config.id), i.destroy(), r.splice(s, 1), l && l(r.map(O)), setTimeout(() => {
+            w.current.delete(i.config.id);
           }, 100);
         } else
           e.remove(t), e.discardActiveObject(), e.renderAll();
@@ -93,21 +93,21 @@ const oe = (a) => {
       return [...r];
     });
   };
-  T("Delete", q), T("Backspace", q), T("ctrl", () => {
-    R(!0);
+  R("Delete", q), R("Backspace", q), R("ctrl", () => {
+    P(!0);
   }, {
     events: ["keydown"]
-  }), T("ctrl", () => {
-    C || R(!1);
+  }), R("ctrl", () => {
+    k || P(!1);
   }, {
     events: ["keyup"]
   }), h(() => {
-    R(C || !1);
-  }, [C]);
+    P(k || !1);
+  }, [k]);
   const F = (o) => {
     e && oe(e), v((t) => {
       const n = t.findIndex((r) => r === o);
-      return n > -1 && (t.splice(n, 1), l && l(t.map(O)), M()), [...t];
+      return n > -1 && (t.splice(n, 1), l && l(t.map(O)), T()), [...t];
     });
   }, G = (o) => {
     v((t) => {
@@ -139,7 +139,7 @@ const oe = (a) => {
       });
     };
   }, [e, p]);
-  const M = () => {
+  const T = () => {
     e && ue(e, (o) => {
       const t = new te({
         id: (c == null ? void 0 : c.id) || o.id,
@@ -154,7 +154,7 @@ const oe = (a) => {
       t.active = !0, v((n) => {
         const r = [...n, t];
         return l && l(r.map(O)), setTimeout(() => {
-          e && !b && M();
+          e && !b && T();
         }, 0), r;
       });
     }, y);
@@ -188,8 +188,8 @@ const oe = (a) => {
         return;
       const I = e.getPointer(t.e);
       if (I.x < i.tl.x || I.x > i.br.x || I.y < i.tl.y || I.y > i.br.y) {
-        const w = n == null ? void 0 : n._onMouseUp;
-        typeof w == "function" && w(t.e);
+        const C = n == null ? void 0 : n._onMouseUp;
+        typeof C == "function" && C(t.e);
       }
     };
     return e.on("mouse:move", o), () => {
@@ -220,7 +220,7 @@ const oe = (a) => {
       }), o))) : (e.defaultCursor = "default", e.off("mouse:down:before"), e.off("mouse:up"), e.setCursor("default"), v((o) => (o.forEach((t) => {
         var n;
         return (n = t.object) == null ? void 0 : n.set("evented", !0);
-      }), o)), M()), () => {
+      }), o)), T()), () => {
         ae();
       };
   }, [e, b]), h(() => {
@@ -233,7 +233,7 @@ const oe = (a) => {
         n.renderLabel();
       });
     }), !b)
-      return M(), () => {
+      return T(), () => {
         e && (oe(e), e.off("mouse:wheel"));
       };
   }, [e, c, x, b]);
@@ -250,7 +250,7 @@ const oe = (a) => {
       crossOrigin: "anonymous"
     });
   }, [p]), h(() => {
-    if (!k && e) {
+    if (!j && e) {
       try {
         e.clear();
       } catch (_) {
@@ -259,23 +259,23 @@ const oe = (a) => {
     }
     if (!d.current || !d.current.parentElement)
       return;
-    const o = k == null ? void 0 : k.getElement();
+    const o = j == null ? void 0 : j.getElement();
     if (!(o != null && o.width) || !(o != null && o.height))
       return;
     const t = o.width / o.height, n = d.current.parentElement.offsetWidth, r = d.current.parentElement.offsetHeight, u = n / o.width, s = r / o.height;
     let i = [n, r];
     u > s ? i = [r * t, r] : i = [n, n / t];
-    const I = i[0] / o.width, J = i[1] / o.height, w = Math.min(I, J);
-    U([w, w]);
+    const I = i[0] / o.width, J = i[1] / o.height, C = Math.min(I, J);
+    U([C, C]);
     const g = new X.Canvas(d.current, {
       containerClass: "marking-canvas",
       width: n,
       height: r
     });
-    if (g.uniScaleKey = "", g.uniformScaling = !1, g == null || g.setZoom(w), g == null || g.renderAll(), g && k) {
-      const _ = (n - i[0]) / w / 2, Q = (r - i[1]) / w / 2;
+    if (g.uniScaleKey = "", g.uniformScaling = !1, g == null || g.setZoom(C), g == null || g.renderAll(), g && j) {
+      const _ = (n - i[0]) / C / 2, Q = (r - i[1]) / C / 2;
       g.setBackgroundImage(
-        k,
+        j,
         () => {
           g.renderAll(), re({
             left: _,
@@ -291,12 +291,12 @@ const oe = (a) => {
         }
       );
     }
-  }, [k]), h(() => {
+  }, [j]), h(() => {
     if (x.length > m.length) {
-      if (j.current.size > 0)
+      if (w.current.size > 0)
         return;
       x.forEach((t) => {
-        const n = j.current.has(t.config.id), r = t._isDestroying;
+        const n = w.current.has(t.config.id), r = t._isDestroying;
         !m.find((s) => s.id === t.config.id) && !r && !n && t.destroy();
       });
     }
@@ -311,12 +311,12 @@ const oe = (a) => {
     }));
   }, [c, e, b]), h(() => {
     var o;
-    if (z && d.current && !P) {
+    if (z && d.current && !M) {
       const t = document.createElement("div");
       t.setAttribute("style", "width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; position: absolute;top: 0;"), (o = d.current.parentElement) == null || o.appendChild(t), le.render(/* @__PURE__ */ f(fe, {}), t), H(t);
     } else
-      !z && P && (P.remove(), H(null));
-  }, [z, d.current, P]), /* @__PURE__ */ V("div", {
+      !z && M && (M.remove(), H(null));
+  }, [z, d.current, M]), /* @__PURE__ */ V("div", {
     style: {
       width: "100%",
       height: "100%",
@@ -329,46 +329,54 @@ const oe = (a) => {
         children: /* @__PURE__ */ V(de, {
           direction: "vertical",
           size: 16,
-          children: [/* @__PURE__ */ f(L, {
+          children: [/* @__PURE__ */ f(A, {
             title: "放大-鼠标滚轮前滑",
             placement: "right",
-            children: /* @__PURE__ */ f(S, {
+            children: /* @__PURE__ */ f(L, {
               icon: /* @__PURE__ */ f(me, {}),
               onClick: () => {
                 Y(-100);
               }
             })
-          }), /* @__PURE__ */ f(L, {
+          }), /* @__PURE__ */ f(A, {
             title: "缩小-鼠标滚轮后滑",
             placement: "right",
-            children: /* @__PURE__ */ f(S, {
+            children: /* @__PURE__ */ f(L, {
               icon: /* @__PURE__ */ f(ge, {}),
               onClick: () => {
                 Y(100);
               }
             })
-          }), !C && /* @__PURE__ */ f(L, {
+          }), !k && /* @__PURE__ */ f(A, {
             title: "拖动-按住ctrl",
             placement: "right",
-            children: /* @__PURE__ */ f(S, {
-              disabled: C,
+            children: /* @__PURE__ */ f(L, {
+              disabled: k,
               icon: /* @__PURE__ */ f(he, {}),
               className: b ? "active" : "",
               onClick: () => {
-                R(!b);
+                P(!b);
               }
             })
-          }), !C && /* @__PURE__ */ f(L, {
+          }), !k && /* @__PURE__ */ f(A, {
             title: "一键清空全部标注",
             placement: "right",
-            children: /* @__PURE__ */ f(S, {
+            children: /* @__PURE__ */ f(L, {
               icon: /* @__PURE__ */ f(pe, {}),
               disabled: !(x != null && x.length),
               onClick: () => {
-                v((o) => (o.forEach((t) => {
-                  t.destroy();
-                }), [])), l && l([]), setTimeout(() => {
-                  e && !b && M();
+                if (!e)
+                  return;
+                v((t) => (t.forEach((n) => {
+                  w.current.add(n.config.id);
+                }), t.forEach((n) => {
+                  n.destroy();
+                }), setTimeout(() => {
+                  w.current.clear();
+                }, 100), [])), e.discardActiveObject(), e.getObjects().forEach((t) => {
+                  t !== e.backgroundImage && e.remove(t);
+                }), e.renderAll(), l && l([]), setTimeout(() => {
+                  e && !b && T();
                 }, 0);
               }
             })
@@ -391,5 +399,5 @@ const oe = (a) => {
   });
 };
 export {
-  Le as default
+  Ae as default
 };

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

@@ -2,14 +2,14 @@ var _ = Object.defineProperty, $ = Object.defineProperties;
 var H = Object.getOwnPropertyDescriptors;
 var P = Object.getOwnPropertySymbols;
 var I = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
-var R = (i, o, s) => o in i ? _(i, o, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[o] = s, g = (i, o) => {
-  for (var s in o || (o = {}))
-    I.call(o, s) && R(i, s, o[s]);
+var R = (i, r, s) => r in i ? _(i, r, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[r] = s, g = (i, r) => {
+  for (var s in r || (r = {}))
+    I.call(r, s) && R(i, s, r[s]);
   if (P)
-    for (var s of P(o))
-      L.call(o, s) && R(i, s, o[s]);
+    for (var s of P(r))
+      L.call(r, s) && R(i, s, r[s]);
   return i;
-}, N = (i, o) => $(i, H(o));
+}, N = (i, r) => $(i, H(r));
 import { jsxs as h, jsx as a } from "react/jsx-runtime";
 import { Row as B, Button as U, Input as ee, Space as te, Empty as ie, Modal as le } from "antd";
 import { useState as m, useContext as re, useEffect as w } from "react";
@@ -22,7 +22,7 @@ import { tagColors as k } from "../../../../utils/index.mjs";
 import se from "../../../Iconfont/index.mjs";
 const Ae = ({
   datasetId: i,
-  data: o,
+  data: r,
   selected: s = [],
   showZero: ce = !0,
   shortcut: F = !1,
@@ -33,7 +33,7 @@ const Ae = ({
   isPreLabel: v = !1,
   settingHide: C = !1
 }) => {
-  const [n, A] = m([]), [ae, T] = m(!1), [r, p] = m([]), [j, z] = m(""), [x, S] = m(null), [D, J] = m(!1), {
+  const [n, A] = m([]), [ae, T] = m(!1), [o, p] = m([]), [j, z] = m(""), [x, S] = m(null), [D, J] = m(!1), {
     services: {
       cvforceDatahub: d
     },
@@ -44,15 +44,15 @@ const Ae = ({
     }
   } = re(ne);
   w(() => {
-    r.length && A(s.map((e) => r.find((t) => t.id === e.id)));
-  }, [s, r]), w(() => {
+    o.length && A(s.map((e) => o.find((t) => t.id === e.id)));
+  }, [s, o]), w(() => {
     i && E();
-  }, [i]), w(() => {
-    !i && o && p(o.map((e) => N(g({}, e), {
+  }, [i, r]), w(() => {
+    !i && r && p(r.map((e) => N(g({}, e), {
       createdAt: 0,
       updatedAt: 0
     })));
-  }, [i, o]);
+  }, [i, r]);
   const E = () => {
     !i || !d || (T(!0), d.listLabels(i, {
       pageNo: 1,
@@ -67,13 +67,13 @@ const Ae = ({
       label: e
     }]
   }).then((t) => {
-    p([...r, {
+    p([...o, {
       label: e,
       id: t[0],
-      color: k[r.length % 40],
+      color: k[o.length % 40],
       createdAt: Date.now(),
       updatedAt: Date.now()
-    }]), S(null), u && u([...r]);
+    }]), S(null), u && u([...o]);
   }).then(() => !0).catch(() => !1), Q = (e) => {
     let t = [];
     G === "multiple" ? n != null && n.some((l) => l.id === e.id) ? t = n == null ? void 0 : n.filter((l) => l.id !== e.id) : t = [...n, e] : n != null && n.some((l) => l.id === e.id) ? t = [] : t = [e], A(t), M && M(t);
@@ -82,8 +82,8 @@ const Ae = ({
   }, W = (e) => {
     if (!i || !d)
       return Promise.resolve(!1);
-    const t = r.findIndex((l) => l.id === e.id);
-    return d.patchLabel(i, e.id, e).then(() => (t < 0 || (r[t] = e, p([...r]), u && u([...r])), !0)).catch(() => !1);
+    const t = o.findIndex((l) => l.id === e.id);
+    return d.patchLabel(i, e.id, e).then(() => (t < 0 || (o[t] = e, p([...o]), u && u([...o])), !0)).catch(() => !1);
   }, X = (e) => {
     le.confirm({
       title: "确认要删除当前标签吗？",
@@ -91,13 +91,13 @@ const Ae = ({
       onOk: () => {
         if (!i || !d)
           return;
-        const t = r.findIndex((c) => c.id === e), l = n.findIndex((c) => c.id === e);
+        const t = o.findIndex((c) => c.id === e), l = n.findIndex((c) => c.id === e);
         return d.deleteLabel(i, e).then(() => {
-          l > -1 && (n.splice(l, 1), A([...n])), r.splice(t, 1), p([...r]), u && u([...r]), E();
+          l > -1 && (n.splice(l, 1), A([...n])), o.splice(t, 1), p([...o]), u && u([...o]), E();
         });
       }
     });
-  }, b = (r == null ? void 0 : r.filter((e) => !j || e.label.includes(j))) || [];
+  }, b = (o == null ? void 0 : o.filter((e) => !j || e.label.includes(j))) || [];
   return /* @__PURE__ */ h("div", {
     className: "label-list-wrap",
     children: [/* @__PURE__ */ h(B, {
@@ -133,7 +133,7 @@ const Ae = ({
           disabled: x !== null || v,
           onClick: () => {
             S({
-              color: k[r.length % 40],
+              color: k[o.length % 40],
               label: ""
             });
           }
@@ -173,7 +173,7 @@ const Ae = ({
           extra: F ? t < 10 ? /* @__PURE__ */ h("span", {
             className: "shortcut",
             children: ["快捷键", t]
-          }) : null : ((l = o.find((c) => c.label === e.label)) == null ? void 0 : l.count) || 0,
+          }) : null : ((l = r.find((c) => c.label === e.label)) == null ? void 0 : l.count) || 0,
           label: e.label,
           color: e.color,
           onClick: () => {

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

@@ -604,7 +604,8 @@ const Pn = (I) => {
                     current: 1
                   })));
                 },
-                loadVersionData: Ee
+                loadVersionData: Ee,
+                markType: x.markType
               })]
             })
           }),

package/dist/es/components/PicZipImportModal/config.mjs

@@ -1,11 +1,21 @@
-import { MB as e } from "../../constant.mjs";
-const g = {
-  maxImageSize: 14 * e,
+var j = Object.defineProperty, l = Object.defineProperties;
+var s = Object.getOwnPropertyDescriptors;
+var i = Object.getOwnPropertySymbols;
+var r = Object.prototype.hasOwnProperty, d = Object.prototype.propertyIsEnumerable;
+var n = (e, g, p) => g in e ? j(e, g, { enumerable: !0, configurable: !0, writable: !0, value: p }) : e[g] = p, m = (e, g) => {
+  for (var p in g || (g = {}))
+    r.call(g, p) && n(e, p, g[p]);
+  if (i)
+    for (var p of i(g))
+      d.call(g, p) && n(e, p, g[p]);
+  return e;
+}, a = (e, g) => l(e, s(g));
+import { MB as o } from "../../constant.mjs";
+const t = {
+  maxImageSize: 14 * o,
   imageMimeTypes: ["image/jpeg", "image/jpg", "image/png", "image/bmp"],
   imageAccept: "image/png, image/jpeg, image/jpg, image/bmp",
   imageFormatsText: "jpg、png 、jpeg 、bmp",
-  labeledExampleKey: "FileImportType.Pro.LabelType.Unlabeled",
-  unlabeledExampleKey: "FileImportType.Pro.LabelType.Labeled",
   labelFormat: "json",
   zipUploadTexts: {
     labeled: {
@@ -15,16 +25,12 @@ const g = {
       description: ["压缩包内图片格式要求为：图片类型为jpg/png/bmp/jpeg，单张图片不超过14M；"]
     }
   }
-}, a = {
-  maxImageSize: 10 * e,
+}, c = {
+  maxImageSize: 10 * o,
   // VLM 可能是 10M（可根据实际需求调整）
   imageMimeTypes: ["image/jpeg", "image/jpg", "image/png"],
   imageAccept: "image/png, image/jpeg, image/jpg",
   imageFormatsText: "jpg、png 、jpeg",
-  labeledExampleKey: "FileImportType.Pro.LabelType.Unlabeled",
-  // 暂时使用默认，如果不同可后续修改
-  unlabeledExampleKey: "FileImportType.Pro.LabelType.Labeled",
-  // 暂时使用默认，如果不同可后续修改
   labelFormat: "jsonl",
   // VLM 使用 jsonl 格式
   zipUploadTexts: {
@@ -41,7 +47,16 @@ const g = {
       ]
     }
   }
-}, l = (p) => p === "vlm" ? a : g;
+}, b = a(m({}, t), {
+  zipUploadTexts: {
+    labeled: {
+      description: ["压缩包内每张图片（jpg、png 、jpeg 、bmp格式）需要对应一个json文件，名称需一致，位置处在一级目录下；", "json文件须符合labelme标注规范，仅支持矩形框，必须包含标签、标签类型和两点坐标，格式可参考样例。"]
+    },
+    unlabeled: {
+      description: ["压缩包内图片格式要求为：图片类型为jpg/png/bmp/jpeg，单张图片不超过14M；"]
+    }
+  }
+}), u = (e) => e === "vlm" ? c : e === "detection" ? b : t;
 export {
-  l as getImportConfig
+  u as getImportConfig
 };