@glodon-aiot/dataset-annotation 3.16.0-alpha.35 → 3.16.0-alpha.37

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
 };