@glodon-aiot/dataset-annotation 3.16.0-alpha.37 → 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/PreLabelOCR/PreLabelModal.mjs

@@ -1,4 +1,4 @@
-var w = (D, o, r) => new Promise((V, P) => {
+var E = (D, c, r) => new Promise((V, P) => {
   var O = (d) => {
     try {
       p(r.next(d));
@@ -12,11 +12,11 @@ var w = (D, o, r) => new Promise((V, P) => {
       P(y);
     }
   }, p = (d) => d.done ? V(d.value) : Promise.resolve(d.value).then(O, a);
-  p((r = r.apply(D, o)).next());
+  p((r = r.apply(D, c)).next());
 });
 import { jsx as n, jsxs as N } from "react/jsx-runtime";
 import { useState as v, useContext as ee, useEffect as k } from "react";
-import { Form as S, Modal as te, Button as C, Space as j, Spin as ae, Select as z, Tooltip as A, Tag as le, Radio as G } from "antd";
+import { Form as S, Modal as te, Button as C, Space as z, Spin as le, Select as A, Tooltip as G, Tag as ae, Radio as q } from "antd";
 import { PreLabelTaskStatus as u } from "@glodon-aiot/apis";
 import "./style.less.mjs";
 import se from "../../DatasetContext/index.mjs";
@@ -24,35 +24,35 @@ import { detectionPreService as ne, ocrPreService as re } from "../../constant.m
 import ie from "../PreLableTable/index.mjs";
 const fe = (D) => {
   const {
-    datasetId: o,
+    datasetId: c,
     versionId: r,
     isVisible: V,
     onClose: P,
     setIsTaskChange: O,
     record: a,
     datasetType: p
-  } = D, [d, y] = v([]), [q, B] = v([]), [h] = S.useForm(), [l, E] = v(), [L, _] = v(), [f, I] = v(""), m = S.useWatch("service", h), [H, J] = v(!1), [M, T] = v(null), {
+  } = D, [d, y] = v([]), [B, _] = v([]), [h] = S.useForm(), [l, L] = v(), [I, H] = v(), [f, x] = v(""), m = S.useWatch("service", h), [J, M] = v(!1), [W, T] = v(null), {
     services: {
       cvforceDatahub: b,
       cvforceModelService: g
     }
-  } = ee(se), W = p === "detection" ? ne : re, F = () => {
+  } = ee(se), K = p === "detection" ? ne : re, F = () => {
     P();
   };
   k(() => {
-    U(), X();
+    X(), Y();
   }, []), k(() => {
-    a && E(a), a != null && a.lastTaskResult && _(JSON.parse(a == null ? void 0 : a.lastTaskResult));
+    a && L(a), a != null && a.lastTaskResult && H(JSON.parse(a == null ? void 0 : a.lastTaskResult));
   }, [a]), k(() => {
-    var e, t, s, i, c;
+    var e, t, s, i, o;
     h.setFieldsValue({
       service: {
         value: (e = l == null ? void 0 : l.params) == null ? void 0 : e.serviceId,
         label: (t = l == null ? void 0 : l.params) == null ? void 0 : t.serviceName
       },
       data: ((s = l == null ? void 0 : l.params) == null ? void 0 : s.data) || "nolabel",
-      confidence: (c = (i = l == null ? void 0 : l.params) == null ? void 0 : i.confidence) != null ? c : 0.6
-    }), I((l == null ? void 0 : l.state) || "PENDING");
+      confidence: (o = (i = l == null ? void 0 : l.params) == null ? void 0 : i.confidence) != null ? o : 0.6
+    }), x((l == null ? void 0 : l.state) || "PENDING"), console.log(l, "============");
   }, [l]), k(() => {
     if (!m || !m.value) {
       T(null);
@@ -62,72 +62,72 @@ const fe = (D) => {
       T(null);
       return;
     }
-    Promise.all([K(), Q(m.value)]).then(([e, t]) => {
+    Promise.all([Q(), U(m.value)]).then(([e, t]) => {
       if (t && Array.isArray(t) && t.length > 0 ? T(!0) : T(!1), !e)
         return;
       const s = e.filter((i) => {
-        if (!(t != null && t.find((c) => c === i)))
+        if (!(t != null && t.find((o) => o === i)))
           return i;
       });
-      J(!!s.length), h.validateFields(["labels"]);
+      M(!!s.length), h.validateFields(["labels"]);
     }).catch(() => {
       T(!1), h.validateFields(["labels"]);
     });
   }, [m]);
-  const K = () => {
-    if (!(!o || !r || !b))
-      return b.getDatasetsIdVersionsVidLabelcount(o, r).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
-  }, Q = (e) => g == null ? void 0 : g.getModelServiceById(e).then((t) => {
+  const Q = () => {
+    if (!(!c || !r || !b))
+      return b.getDatasetsIdVersionsVidLabelcount(c, r).then((e) => e.filter((s) => s.label !== "nocode").map((s) => s.label));
+  }, U = (e) => g == null ? void 0 : g.getModelServiceById(e).then((t) => {
     const s = t.deployOptions.confidence;
-    return s == null ? void 0 : s.map((c) => c.label);
-  }), U = () => {
+    return s == null ? void 0 : s.map((o) => o.label);
+  }), X = () => {
     g == null || g.openModelServices({
-      signName: W,
+      signName: K,
       state: "Running"
     }).then((e) => {
       const s = (e || []).map((i) => {
-        var c;
+        var o;
         return {
           label: i.name,
           value: i.id,
-          confidence: ((c = i.deployOptions.confidence) == null ? void 0 : c.map(($) => $.label)) || []
+          confidence: ((o = i.deployOptions.confidence) == null ? void 0 : o.map((w) => w.label)) || []
         };
       });
       y(s);
     });
-  }, X = () => {
-    !o || !r || !b || b.getDatasetsIdVersionsVidSamples(o, r, {
+  }, Y = () => {
+    !c || !r || !b || b.getDatasetsIdVersionsVidSamples(c, r, {
       labels: "nocode",
       pageNo: 1,
       pageSize: 1
     }).then((e) => {
       const t = e.recordList || [];
-      B([{
+      _([{
         label: "全部未标注数据",
         value: "nolabel",
         disabled: !t.length
       }]);
     });
-  }, x = () => {
-    !o || !r || !(l != null && l.taskId) || !b || b.delPreLabelTask(o, r, l.taskId).then((e) => {
-      O((t) => !t), I("PENDING");
+  }, R = () => {
+    !c || !r || !(l != null && l.taskId) || !b || b.delPreLabelTask(c, r, l.taskId).then((e) => {
+      O((t) => !t), x("PENDING");
     });
-  }, Y = () => {
-    x();
   }, Z = () => {
-    x(), h.resetFields(), E(void 0);
-  }, R = (e) => {
-    var s;
-    if (!o || !r || !e.service || !b)
+    R();
+  }, $ = () => {
+    R(), h.resetFields(), L(void 0);
+  }, j = (e) => {
+    var s, i;
+    if (!c || !r || !e.service || !b)
       return;
     const t = {
       serviceId: e.service.value,
-      serviceName: (s = d.find((i) => i.value === e.service.value)) == null ? void 0 : s.label,
+      serviceName: (s = d.find((o) => o.value === e.service.value)) == null ? void 0 : s.label,
       data: "nolabel",
-      confidence: e.confidence
+      confidence: (i = e.confidence) != null ? i : 0.6
     };
-    b.postPreLabelTask(o, r, t).then((i) => {
-      O((c) => !c);
+    b.postPreLabelTask(c, r, t).then((o) => {
+      O((w) => !w);
     });
   };
   return /* @__PURE__ */ n(te, {
@@ -147,16 +147,16 @@ const fe = (D) => {
       type: "primary",
       htmlType: "submit",
       form: "preLabelForm",
-      onClick: R,
+      onClick: j,
       children: "确定"
     }, "confirm")] : (a == null ? void 0 : a.state) === u.Started ? [/* @__PURE__ */ n(C, {
-      onClick: Y,
+      onClick: Z,
       children: "终止"
     }, "abort"), /* @__PURE__ */ n(C, {
       onClick: F,
       children: "返回"
     }, "cancel")] : [/* @__PURE__ */ n(C, {
-      onClick: Z,
+      onClick: $,
       children: "新建任务"
     }, "abort"), /* @__PURE__ */ n(C, {
       onClick: F,
@@ -166,7 +166,7 @@ const fe = (D) => {
       style: {
         padding: "80px 0"
       },
-      children: /* @__PURE__ */ N(j, {
+      children: /* @__PURE__ */ N(z, {
         className: "mark-status",
         direction: "vertical",
         align: "center",
@@ -174,22 +174,22 @@ const fe = (D) => {
           width: "100%"
         },
         size: 24,
-        children: [f === u.Started && /* @__PURE__ */ n(ae, {
+        children: [f === u.Started && /* @__PURE__ */ n(le, {
           size: "default"
-        }), (f === u.Started || f === u.Success) && /* @__PURE__ */ N(j, {
+        }), (f === u.Started || f === u.Success) && /* @__PURE__ */ N(z, {
           style: {
             marginLeft: 14
           },
           size: 0,
           children: [/* @__PURE__ */ N("span", {
-            children: ["已标注数据：", L.successCount || 0, " 张，"]
+            children: ["已标注数据：", I.completeCount || 0, " 张，"]
           }), /* @__PURE__ */ N("span", {
-            children: ["共计：", L.allCount || 0, " 张"]
+            children: ["共计：", I.allCount || 0, " 张"]
           })]
         })]
       })
     }) : /* @__PURE__ */ N(S, {
-      onFinish: R,
+      onFinish: j,
       name: "preLabelForm",
       labelAlign: "right",
       labelCol: {
@@ -204,20 +204,20 @@ const fe = (D) => {
         rules: [{
           required: !0
         }, {
-          validator: (e, t) => w(void 0, null, function* () {
+          validator: (e, t) => E(void 0, null, function* () {
             const s = h.getFieldValue("service");
             if (!s.value || !s.label)
               return Promise.reject(new Error("请选择服务"));
           })
         }],
-        children: /* @__PURE__ */ n(z, {
+        children: /* @__PURE__ */ n(A, {
           labelInValue: !0,
           disabled: (a == null ? void 0 : a.state) === u.Started,
-          children: d.map((e) => /* @__PURE__ */ n(z.Option, {
+          children: d.map((e) => /* @__PURE__ */ n(A.Option, {
             value: e.value,
             disabled: e.disabled,
-            children: /* @__PURE__ */ n(A, {
-              title: e.confidence.length ? e.confidence.map((t) => /* @__PURE__ */ n(le, {
+            children: /* @__PURE__ */ n(G, {
+              title: e.confidence.length ? e.confidence.map((t) => /* @__PURE__ */ n(ae, {
                 children: t
               }, t)) : null,
               overlayClassName: "service-tag-tooltip",
@@ -229,15 +229,15 @@ const fe = (D) => {
         label: "标签",
         name: "labels",
         rules: [{
-          validator: (e, t) => w(void 0, null, function* () {
-            if (p === "detection" && (m != null && m.value) && M === !1)
+          validator: (e, t) => E(void 0, null, function* () {
+            if (p === "detection" && (m != null && m.value) && W === !1)
               return Promise.reject(new Error("未获取相关信息"));
-            if (H && p === "detection")
+            if (J && p === "detection")
               return Promise.reject(new Error("所选服务与当前数据集标签不符"));
           })
         }],
         children: /* @__PURE__ */ n(ie, {
-          datasetId: o,
+          datasetId: c,
           service: m
         })
       }), /* @__PURE__ */ n(S.Item, {
@@ -248,11 +248,11 @@ const fe = (D) => {
           message: "请选择数据"
         }],
         initialValue: "nolabel",
-        children: /* @__PURE__ */ n(G.Group, {
+        children: /* @__PURE__ */ n(q.Group, {
           disabled: (a == null ? void 0 : a.state) === u.Started,
-          children: q.map((e) => /* @__PURE__ */ n(A, {
+          children: B.map((e) => /* @__PURE__ */ n(G, {
             title: e.disabled ? "该数据集下不存在未标注的数据" : "当前数据集版本下所有未标注的数据",
-            children: /* @__PURE__ */ n(G, {
+            children: /* @__PURE__ */ n(q, {
               value: e.value,
               disabled: e.disabled,
               children: e.label