@glodon-aiot/dataset-annotation 3.3.2-beta.0 → 3.3.2-beta.2

package/dist/es/components/OcrAnnotation/PreLabelOCR/PreLabelModal.mjs

@@ -1,20 +1,20 @@
-var x = (I, c, i) => new Promise((V, y) => {
-  var T = (d) => {
+var x = (I, d, i) => new Promise((V, y) => {
+  var T = (u) => {
     try {
-      m(i.next(d));
+      m(i.next(u));
     } catch (N) {
       y(N);
     }
-  }, t = (d) => {
+  }, t = (u) => {
     try {
-      m(i.throw(d));
+      m(i.throw(u));
     } catch (N) {
       y(N);
     }
-  }, m = (d) => d.done ? V(d.value) : Promise.resolve(d.value).then(T, t);
-  m((i = i.apply(I, c)).next());
+  }, m = (u) => u.done ? V(u.value) : Promise.resolve(u.value).then(T, t);
+  m((i = i.apply(I, d)).next());
 });
-import { jsx as a, jsxs as v } from "react/jsx-runtime";
+import { jsx as a, jsxs as g } from "react/jsx-runtime";
 import { useState as f, useContext as Y, useEffect as O } from "react";
 import { Form as h, Modal as Z, Button as C, Select as E, Tooltip as G, Tag as ee, InputNumber as te, Space as z, Spin as ae } from "antd";
 import { LoadingOutlined as ne } from "@ant-design/icons";
@@ -37,20 +37,20 @@ const re = [{
   key: "SUCCESS",
   color: "#2DC159",
   name: "已完成"
-}], ve = (I) => {
+}], ge = (I) => {
   var j;
   const {
-    datasetId: c,
+    datasetId: d,
     versionId: i,
     isVisible: V,
     onClose: y,
     setIsTaskChange: T,
     record: t,
     datasetType: m
-  } = I, [d, N] = f([]), [A, M] = f([]), [S] = h.useForm(), [l, L] = f(), [F, q] = f(), [b, R] = f(""), k = h.useWatch("service", S), [B, _] = f(!1), {
+  } = I, [u, N] = f([]), [A, M] = f([]), [S] = h.useForm(), [l, L] = f(), [F, q] = f(), [b, R] = f(""), k = h.useWatch("service", S), [B, _] = f(!1), {
     services: {
-      cvforceDatahub: r,
-      cvforceModelService: g
+      cvforceDatahub: o,
+      cvforceModelService: v
     },
     featuresConfig: {
       labelManager: oe
@@ -65,49 +65,49 @@ const re = [{
   }, []), O(() => {
     t && L(t), t != null && t.lastTaskResult && q(JSON.parse(t == null ? void 0 : t.lastTaskResult));
   }, [t]), O(() => {
-    var e, n, s, o, u;
+    var e, n, s, r, c;
     S.setFieldsValue({
       service: {
         value: (e = l == null ? void 0 : l.params) == null ? void 0 : e.serviceId,
         label: (n = l == null ? void 0 : l.params) == null ? void 0 : n.serviceName
       },
       data: (s = l == null ? void 0 : l.params) == null ? void 0 : s.data,
-      confidence: (u = (o = l == null ? void 0 : l.params) == null ? void 0 : o.confidence) != null ? u : 0.6
+      confidence: (c = (r = l == null ? void 0 : l.params) == null ? void 0 : r.confidence) != null ? c : 0.6
     }), R((l == null ? void 0 : l.state) || "PENDING");
   }, [l]), O(() => {
     !k || !k.value || m !== "ocr" && Promise.all([U(), W(k.value)]).then(([e, n]) => {
       if (!e)
         return;
-      const s = e.filter((o) => {
-        if (!(n != null && n.find((u) => u === o)))
-          return o;
+      const s = e.filter((r) => {
+        if (!(n != null && n.find((c) => c === r)))
+          return r;
       });
       _(!!s.length), S.validateFields(["service"]);
     });
   }, [k]);
   const U = () => {
-    if (!(!c || !i))
-      return r == null ? void 0 : r.getDatasetsIdVersionsVidLabelcount(c, i).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
-  }, W = (e) => g == null ? void 0 : g.getModelServiceById(e).then((n) => {
+    if (!(!d || !i))
+      return o == null ? void 0 : o.getDatasetsIdVersionsVidLabelcount(d, i).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
+  }, W = (e) => v == null ? void 0 : v.getModelServiceById(e).then((n) => {
     const s = n.deployOptions.confidence;
-    return s == null ? void 0 : s.map((u) => u.label);
+    return s == null ? void 0 : s.map((c) => c.label);
   }), $ = () => {
-    g == null || g.openModelServices({
+    v == null || v.openModelServices({
       signName: J,
       state: "Running"
     }).then((e) => {
-      const s = (e || []).map((o) => {
-        var u;
+      const s = (e || []).map((r) => {
+        var c;
         return {
-          label: o.name,
-          value: o.id,
-          confidence: ((u = o.deployOptions.confidence) == null ? void 0 : u.map((X) => X.label)) || []
+          label: r.name,
+          value: r.id,
+          confidence: ((c = r.deployOptions.confidence) == null ? void 0 : c.map((X) => X.label)) || []
         };
       });
       N(s);
     });
   }, H = () => {
-    !c || !i || r == null || r.getDatasetsIdVersionsVidSamples(c, i, {
+    !d || !i || o == null || o.getDatasetsIdVersionsVidSamples(d, i, {
       labels: "nocode",
       pageNo: 1,
       pageSize: 1
@@ -120,7 +120,7 @@ const re = [{
       }]);
     });
   }, w = () => {
-    !c || !i || !(l != null && l.taskId) || r == null || r.delPreLabelTask(c, i, l.taskId).then((e) => {
+    !d || !i || !(l != null && l.taskId) || o == null || o.delPreLabelTask(d, i, l.taskId).then((e) => {
       T((n) => !n), R("PENDING");
     });
   }, K = () => {
@@ -128,16 +128,17 @@ const re = [{
   }, Q = () => {
     w(), S.resetFields(), L(void 0);
   }, D = (e) => {
-    if (!c || !i || !e.service)
+    var s;
+    if (!d || !i || !e.service)
       return;
     const n = {
       serviceId: e.service.value,
-      serviceName: e.service.label,
+      serviceName: (s = u.find((r) => r.value === e.service.value)) == null ? void 0 : s.label,
       data: "nolabel",
       confidence: e.confidence
     };
-    r == null || r.postPreLabelTask(c, i, n).then((s) => {
-      T((o) => !o);
+    o == null || o.postPreLabelTask(d, i, n).then((r) => {
+      T((c) => !c);
     });
   };
   return /* @__PURE__ */ a(Z, {
@@ -171,7 +172,7 @@ const re = [{
       onClick: P,
       children: "返回"
     }, "cancel")],
-    children: /* @__PURE__ */ v(h, {
+    children: /* @__PURE__ */ g(h, {
       onFinish: D,
       name: "preLabelForm",
       labelAlign: "right",
@@ -201,7 +202,7 @@ const re = [{
         children: /* @__PURE__ */ a(E, {
           labelInValue: !0,
           disabled: (t == null ? void 0 : t.state) === p.Started,
-          children: d.map((e) => /* @__PURE__ */ a(E.Option, {
+          children: u.map((e) => /* @__PURE__ */ a(E.Option, {
             value: e.value,
             disabled: e.disabled,
             children: /* @__PURE__ */ a(G, {
@@ -245,7 +246,7 @@ const re = [{
         })
       }), /* @__PURE__ */ a(h.Item, {
         label: "标注状态",
-        children: /* @__PURE__ */ v(z, {
+        children: /* @__PURE__ */ g(z, {
           className: "mark-status",
           children: [b === p.Started ? /* @__PURE__ */ a(ae, {
             indicator: /* @__PURE__ */ a(ne, {
@@ -258,17 +259,17 @@ const re = [{
             className: `status-tip status-tip-${b || "PENDING"}`
           }), /* @__PURE__ */ a("span", {
             children: ((j = re.find((e) => e.key == b)) == null ? void 0 : j.name) || "待确认"
-          }), (b === p.Started || b === p.Success) && /* @__PURE__ */ v(z, {
+          }), (b === p.Started || b === p.Success) && /* @__PURE__ */ g(z, {
             style: {
               marginLeft: 14
             },
             size: 14,
-            children: [/* @__PURE__ */ v("span", {
+            children: [/* @__PURE__ */ g("span", {
               children: [F.successCount || 0, "/", F.allCount || 0]
-            }), /* @__PURE__ */ v("span", {
+            }), /* @__PURE__ */ g("span", {
               children: ["已标注数据：", F.successCount || 0, " 张"]
             })]
-          }), b === p.Success && /* @__PURE__ */ v("span", {
+          }), b === p.Success && /* @__PURE__ */ g("span", {
             children: ["，失败：", F.failCount || 0, " 张"]
           })]
         })
@@ -277,5 +278,5 @@ const re = [{
   });
 };
 export {
-  ve as default
+  ge as default
 };

package/dist/es/components/PreLabelOCR/PreLabelModal.mjs

@@ -1,18 +1,18 @@
-var V = (E, o, r) => new Promise((I, y) => {
-  var T = (c) => {
+var V = (E, c, i) => new Promise((I, y) => {
+  var T = (d) => {
     try {
-      p(r.next(c));
+      p(i.next(d));
     } catch (N) {
       y(N);
     }
-  }, t = (c) => {
+  }, t = (d) => {
     try {
-      p(r.throw(c));
+      p(i.throw(d));
     } catch (N) {
       y(N);
     }
-  }, p = (c) => c.done ? I(c.value) : Promise.resolve(c.value).then(T, t);
-  p((r = r.apply(E, o)).next());
+  }, p = (d) => d.done ? I(d.value) : Promise.resolve(d.value).then(T, t);
+  p((i = i.apply(E, c)).next());
 });
 import { jsx as a, jsxs as S } from "react/jsx-runtime";
 import { useState as g, useContext as Y, useEffect as D } from "react";
@@ -21,8 +21,8 @@ import { LoadingOutlined as ne } from "@ant-design/icons";
 import { PreLabelTaskStatus as u } from "@glodon-aiot/apis";
 import "./style.less.mjs";
 import le from "../../DatasetContext/index.mjs";
-import { detectionPreService as se, ocrPreService as re } from "../../constant.mjs";
-const ie = [{
+import { detectionPreService as se, ocrPreService as ie } from "../../constant.mjs";
+const re = [{
   index: 0,
   key: "PENDING",
   color: "#0F64FF",
@@ -40,19 +40,19 @@ const ie = [{
 }], fe = (E) => {
   var j;
   const {
-    datasetId: o,
-    versionId: r,
+    datasetId: c,
+    versionId: i,
     isVisible: I,
     onClose: y,
     setIsTaskChange: T,
     record: t,
     datasetType: p
-  } = E, [c, N] = g([]), [A, q] = g([]), [v] = h.useForm(), [l, x] = g(), [F, B] = g(), [b, L] = g(""), k = h.useWatch("service", v), [_, J] = g(!1), {
+  } = E, [d, N] = g([]), [A, q] = g([]), [v] = h.useForm(), [l, x] = g(), [F, B] = g(), [b, L] = g(""), k = h.useWatch("service", v), [_, J] = g(!1), {
     services: {
       cvforceDatahub: m,
       cvforceModelService: f
     }
-  } = Y(le), M = p === "detection" ? se : re, P = () => {
+  } = Y(le), M = p === "detection" ? se : ie, P = () => {
     y();
   };
   D(() => {
@@ -60,49 +60,49 @@ const ie = [{
   }, []), D(() => {
     t && x(t), t != null && t.lastTaskResult && B(JSON.parse(t == null ? void 0 : t.lastTaskResult));
   }, [t]), D(() => {
-    var e, n, s, i, d;
+    var e, n, s, r, o;
     v.setFieldsValue({
       service: {
         value: (e = l == null ? void 0 : l.params) == null ? void 0 : e.serviceId,
         label: (n = l == null ? void 0 : l.params) == null ? void 0 : n.serviceName
       },
       data: (s = l == null ? void 0 : l.params) == null ? void 0 : s.data,
-      confidence: (d = (i = l == null ? void 0 : l.params) == null ? void 0 : i.confidence) != null ? d : 0.6
+      confidence: (o = (r = l == null ? void 0 : l.params) == null ? void 0 : r.confidence) != null ? o : 0.6
     }), L((l == null ? void 0 : l.state) || "PENDING");
   }, [l]), D(() => {
     !k || !k.value || p !== "ocr" && Promise.all([U(), W(k.value)]).then(([e, n]) => {
       if (!e)
         return;
-      const s = e.filter((i) => {
-        if (!(n != null && n.find((d) => d === i)))
-          return i;
+      const s = e.filter((r) => {
+        if (!(n != null && n.find((o) => o === r)))
+          return r;
       });
       J(!!s.length), v.validateFields(["service"]);
     });
   }, [k]);
   const U = () => {
-    if (!(!o || !r || !m))
-      return m.getDatasetsIdVersionsVidLabelcount(o, r).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
+    if (!(!c || !i || !m))
+      return m.getDatasetsIdVersionsVidLabelcount(c, i).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
   }, W = (e) => f == null ? void 0 : f.getModelServiceById(e).then((n) => {
     const s = n.deployOptions.confidence;
-    return s == null ? void 0 : s.map((d) => d.label);
+    return s == null ? void 0 : s.map((o) => o.label);
   }), $ = () => {
     f == null || f.openModelServices({
       signName: M,
       state: "Running"
     }).then((e) => {
-      const s = (e || []).map((i) => {
-        var d;
+      const s = (e || []).map((r) => {
+        var o;
         return {
-          label: i.name,
-          value: i.id,
-          confidence: ((d = i.deployOptions.confidence) == null ? void 0 : d.map((X) => X.label)) || []
+          label: r.name,
+          value: r.id,
+          confidence: ((o = r.deployOptions.confidence) == null ? void 0 : o.map((X) => X.label)) || []
         };
       });
       N(s);
     });
   }, H = () => {
-    !o || !r || !m || m.getDatasetsIdVersionsVidSamples(o, r, {
+    !c || !i || !m || m.getDatasetsIdVersionsVidSamples(c, i, {
       labels: "nocode",
       pageNo: 1,
       pageSize: 1
@@ -115,7 +115,7 @@ const ie = [{
       }]);
     });
   }, R = () => {
-    !o || !r || !(l != null && l.taskId) || !m || m.delPreLabelTask(o, r, l.taskId).then((e) => {
+    !c || !i || !(l != null && l.taskId) || !m || m.delPreLabelTask(c, i, l.taskId).then((e) => {
       T((n) => !n), L("PENDING");
     });
   }, K = () => {
@@ -123,16 +123,17 @@ const ie = [{
   }, Q = () => {
     R(), v.resetFields(), x(void 0);
   }, w = (e) => {
-    if (!o || !r || !e.service || !m)
+    var s;
+    if (!c || !i || !e.service || !m)
       return;
     const n = {
       serviceId: e.service.value,
-      serviceName: e.service.label,
+      serviceName: (s = d.find((r) => r.value === e.service.value)) == null ? void 0 : s.label,
       data: "nolabel",
       confidence: e.confidence
     };
-    m.postPreLabelTask(o, r, n).then((s) => {
-      T((i) => !i);
+    m.postPreLabelTask(c, i, n).then((r) => {
+      T((o) => !o);
     });
   };
   return /* @__PURE__ */ a(Z, {
@@ -196,7 +197,7 @@ const ie = [{
         children: /* @__PURE__ */ a(O, {
           labelInValue: !0,
           disabled: (t == null ? void 0 : t.state) === u.Started,
-          children: c.map((e) => /* @__PURE__ */ a(O.Option, {
+          children: d.map((e) => /* @__PURE__ */ a(O.Option, {
             value: e.value,
             disabled: e.disabled,
             children: /* @__PURE__ */ a(G, {
@@ -252,7 +253,7 @@ const ie = [{
           }) : /* @__PURE__ */ a("span", {
             className: `status-tip status-tip-${b || "PENDING"}`
           }), /* @__PURE__ */ a("span", {
-            children: ((j = ie.find((e) => e.key == b)) == null ? void 0 : j.name) || "待确认"
+            children: ((j = re.find((e) => e.key == b)) == null ? void 0 : j.name) || "待确认"
           }), (b === u.Started || b === u.Success) && /* @__PURE__ */ S(z, {
             style: {
               marginLeft: 14