@glodon-aiot/dataset-annotation 3.25.1-alpha.4 → 3.25.1-alpha.6

package/dist/es/components/OcrAnnotation/OCRBoxDetail/index.mjs

@@ -2,17 +2,17 @@ var Ne = Object.defineProperty, ke = Object.defineProperties;
 var we = Object.getOwnPropertyDescriptors;
 var pe = Object.getOwnPropertySymbols;
 var ze = Object.prototype.hasOwnProperty, Le = Object.prototype.propertyIsEnumerable;
-var Ie = (p, u, s) => u in p ? Ne(p, u, { enumerable: !0, configurable: !0, writable: !0, value: s }) : p[u] = s, k = (p, u) => {
+var Ie = (p, u, s) => u in p ? Ne(p, u, { enumerable: !0, configurable: !0, writable: !0, value: s }) : p[u] = s, w = (p, u) => {
   for (var s in u || (u = {}))
     ze.call(u, s) && Ie(p, s, u[s]);
   if (pe)
     for (var s of pe(u))
       Le.call(u, s) && Ie(p, s, u[s]);
   return p;
-}, V = (p, u) => ke(p, we(u));
-import { jsxs as P, Fragment as Ve, jsx as x } from "react/jsx-runtime";
-import { Tabs as ye, Space as me, Button as K, Tooltip as Pe, Modal as Te, message as w } from "antd";
-import { useContext as Oe, useRef as z, useState as I, useEffect as W } from "react";
+}, P = (p, u) => ke(p, we(u));
+import { jsxs as T, Fragment as Ve, jsx as x } from "react/jsx-runtime";
+import { Tabs as ye, Space as me, Button as K, Tooltip as Pe, Modal as Te, message as z } from "antd";
+import { useContext as Oe, useRef as L, useState as I, useEffect as W } from "react";
 import "./style.less.mjs";
 import De from "../../DataEmpty/index.mjs";
 import qe from "../../../DatasetContext/index.mjs";
@@ -24,8 +24,8 @@ const {
   const {
     visible: u,
     selectSampleId: s,
-    datasetId: C,
-    versionId: R,
+    datasetId: R,
+    versionId: N,
     ocrMarkTmpl: Me,
     onClose: $e,
     onSave: j,
@@ -42,13 +42,13 @@ const {
     services: {
       cvforceDatahub: m
     }
-  } = Oe(qe), T = z(null), [e, h] = I(), _ = z({}), [je, M] = I(0), [y, B] = I(() => s && (S != null && S.length) ? S : []), [O, N] = I(() => s && U !== void 0 ? U : -1), [d, D] = I(() => s && J ? k({}, J) : !s && J ? {
+  } = Oe(qe), O = L(null), [e, h] = I(), _ = L({}), [je, M] = I(0), [y, B] = I(() => s && (S != null && S.length) ? S : []), [V, k] = I(() => s && U !== void 0 ? U : -1), [d, D] = I(() => s && J ? w({}, J) : !s && J ? {
     current: 1,
     pageSize: J.pageSize
   } : {
     current: 1,
     pageSize: 50
-  }), [re, ie] = I(0), [se, oe] = I(0), [ce, le] = I(0), [o, ve] = I(() => s && ne ? ne : s ? "" : "nocode"), de = z(!1), ae = z(0), ee = z(0), L = z(!1), $ = z(!1), b = z({}), [E, A] = I(!1), [te, F] = I(!1), Se = () => {
+  }), [re, ie] = I(0), [se, oe] = I(0), [ce, le] = I(0), [o, ve] = I(() => s && ne ? ne : s ? "" : "nocode"), de = L(!1), ae = L(0), ee = L(0), C = L(!1), $ = L(!1), b = L({}), [E, A] = I(!1), [te, F] = I(!1), Se = () => {
     switch (o) {
       case "nocode":
       case "hascode":
@@ -71,114 +71,116 @@ const {
     }
   };
   W(() => {
-    if (!C || !R) {
-      L.current = !1;
+    if (!R || !N) {
+      C.current = !1;
       return;
     }
-    const t = d.current || 1, n = d.pageSize || 50;
+    const t = d.current || 1, r = d.pageSize || 50;
     if (!de.current && s && (S != null && S.length) && J && U !== void 0) {
-      const c = S.find((r) => r.id === s);
+      const c = S.find((n) => n.id === s);
       if (c) {
-        de.current = !0, $.current = !0, L.current = !1, h(c), M(S.length), q();
+        de.current = !0, $.current = !0, C.current = !1, h(c), M(S.length), q();
         return;
       }
     }
     const f = ++ee.current;
-    m == null || m.getDatasetsIdVersionsVidSamples(C, R, {
+    m == null || m.getDatasetsIdVersionsVidSamples(R, N, {
       labels: Ce(),
       pageNo: t,
-      pageSize: n,
+      pageSize: r,
       confirmStatus: Se()
     }).then((c) => {
       if (f !== ee.current)
         return;
-      const r = c.recordList || [];
-      B(r);
-      const g = V(k({}, d), {
+      const n = c.recordList || [];
+      B(n);
+      const g = P(w({}, d), {
         current: t,
-        pageSize: n,
+        pageSize: r,
         total: c.totalResults
       });
       if (delete g.type, D(g), Y == null || Y({
         current: t,
-        pageSize: n,
+        pageSize: r,
         total: c.totalResults
-      }), d.type === "next" && r.length) {
-        N(0);
+      }), d.type === "next" && n.length) {
+        k(0);
         const l = c.recordList[0];
-        h(l), M(r.length), o !== void 0 && (b.current[o] = {
+        h(l), M(n.length), o !== void 0 && (b.current[o] = {
           index: 0,
           page: t
         });
         return;
       }
-      if (d.type === "prev" && r.length) {
+      if (d.type === "prev" && n.length) {
         const i = d.pageSize - 1;
-        N(i);
+        k(i);
         const l = c.recordList[i];
-        h(l), M(r.length), o !== void 0 && (b.current[o] = {
+        h(l), M(n.length), o !== void 0 && (b.current[o] = {
           index: i,
           page: t
         });
         return;
       }
-      if (r.find((i) => i.id === s) && !$.current) {
+      if (n.find((i) => i.id === s) && !$.current) {
         if (s) {
-          $.current = !0, h(r.find((l) => l.id === s));
-          const i = r.findIndex((l) => l.id === s);
-          N(i), o !== void 0 && (b.current[o] = {
+          $.current = !0, h(n.find((l) => l.id === s));
+          const i = n.findIndex((l) => l.id === s);
+          k(i), o !== void 0 && (b.current[o] = {
             index: i,
             page: t
           });
         } else {
-          const i = b.current[o], l = i == null ? void 0 : i.index, a = l !== void 0 && l >= 0 && l < r.length ? l : 0;
-          h(r[a]), N(a);
+          const i = b.current[o], l = i == null ? void 0 : i.index, a = l !== void 0 && l >= 0 && l < n.length ? l : 0;
+          h(n[a]), k(a);
         }
-        M(r.length);
+        M(n.length);
       } else if (s && !$.current)
-        $.current = !0, m.getDatasetsIdVersionsVidSsamplesSid(C, R, s).then((i) => {
+        $.current = !0, m.getDatasetsIdVersionsVidSsamplesSid(R, N, s).then((i) => {
           h(i);
         });
       else {
-        const i = b.current[o], l = i == null ? void 0 : i.index, a = l !== void 0 && l >= 0 && l < r.length ? l : 0;
-        h(r[a]), N(a), M(r.length);
+        const i = b.current[o], l = i == null ? void 0 : i.index, a = l !== void 0 && l >= 0 && l < n.length ? l : 0;
+        h(n[a]), k(a), M(n.length);
       }
     }).finally(() => {
-      f === ee.current && (L.current = !1);
+      f === ee.current && (C.current = !1);
     }), q();
-  }, [d.current, o, C, R]), W(() => {
+  }, [d.current, o, R, N]), W(() => {
     e != null && e.id && (Z == null || Z(e.id));
   }, [e == null ? void 0 : e.id]);
   const q = () => {
-    !C || !R || m == null || m.getDatasetsIdVersionsVidLabelcount(C, R, {
+    !R || !N || m == null || m.getDatasetsIdVersionsVidLabelcount(R, N, {
       label: "allcode",
       confirmStatus: 2
     }).then((t) => {
-      const n = t.find((r) => r.id === "allcodeid"), f = t.find((r) => r.id === "nocodeid"), c = t.find((r) => r.id === "pendingid");
-      ie(n ? n.count : 0), oe(f ? f.count : 0), le(c ? c.count : 0);
+      const r = t.find((n) => n.id === "allcodeid"), f = t.find((n) => n.id === "nocodeid"), c = t.find((n) => n.id === "pendingid");
+      ie(r ? r.count : 0), oe(f ? f.count : 0), le(c ? c.count : 0);
     });
   }, H = (t) => {
-    y && B((n) => {
+    y && B((r) => {
       var v, i;
-      const f = !!(e && ((v = e.labels) != null && v.length && o === "nocode" || !((i = e.labels) != null && i.length) && o === "hascode" || t === !0)), c = f ? O : O + 1;
-      let r = n, g = d.total;
+      const f = !!(e && ((v = e.labels) != null && v.length && o === "nocode" || !((i = e.labels) != null && i.length) && o === "hascode" || t === !0)), c = f ? V : V + 1;
+      let n = r, g = d.total;
       if (e && f) {
-        const l = n.findIndex((a) => a.id === e.id);
-        l > -1 && (r = n.slice(0, l).concat(n.slice(l + 1)), g && (g = g - 1, D((a) => V(k({}, a), {
+        const l = r.findIndex((a) => a.id === e.id);
+        l > -1 && (n = r.slice(0, l).concat(r.slice(l + 1)), g && (g = g - 1, D((a) => P(w({}, a), {
           total: g
         }))));
       }
-      if (c >= r.length) {
+      if (c >= n.length) {
+        if (C.current)
+          return n;
         const l = (d.current - 1) * d.pageSize + c;
-        g == null || l >= g ? (r.length > 0 && O >= r.length && setTimeout(() => {
-          const a = r.length - 1;
-          N(a);
-          const Re = r[a];
+        g == null || l >= g ? (n.length > 0 && V >= n.length && setTimeout(() => {
+          const a = n.length - 1;
+          k(a);
+          const Re = n[a];
           h(Re), o !== void 0 && (b.current[o] = {
             index: a,
             page: d.current || 1
           });
-        }, 0), w.error("已经是最后一个了")) : L.current || (L.current = !0, D((a) => V(k({}, a), {
+        }, 0), z.error("已经是最后一个了")) : C.current || (C.current = !0, D((a) => P(w({}, a), {
           current: a.current + 1,
           // total 要带上，否则翻页请求回来之前判空会误报“已经是最后一个了”
           total: g,
@@ -186,36 +188,36 @@ const {
         })));
       } else
         setTimeout(() => {
-          N(c);
-          const l = r[c];
+          k(c);
+          const l = n[c];
           h(l), o !== void 0 && (b.current[o] = {
             index: c,
             page: d.current || 1
           });
         }, 0);
-      return r;
+      return n;
     });
   }, ue = () => {
-    var r, g;
-    if (!y)
+    var n, g;
+    if (!y || V - 1 < 0 && C.current)
       return;
-    let t, n = d.total;
-    if (e && y && ((r = e.labels) != null && r.length && o === "nocode" || !((g = e.labels) != null && g.length) && o === "hascode")) {
+    let t, r = d.total;
+    if (e && y && ((n = e.labels) != null && n.length && o === "nocode" || !((g = e.labels) != null && g.length) && o === "hascode")) {
       const v = y.findIndex((i) => i.id === e.id);
-      v > -1 && (t = y.slice(0, v).concat(y.slice(v + 1)), n && (n = n - 1, D((i) => V(k({}, i), {
-        total: n
+      v > -1 && (t = y.slice(0, v).concat(y.slice(v + 1)), r && (r = r - 1, D((i) => P(w({}, i), {
+        total: r
       }))));
     }
-    const f = t || y, c = O - 1;
+    const f = t || y, c = V - 1;
     if (c < 0)
-      (d.current - 1) * d.pageSize + c < 0 ? w.error("已经是第一个了") : L.current || (L.current = !0, D((i) => V(k({}, i), {
+      (d.current - 1) * d.pageSize + c < 0 ? z.error("已经是第一个了") : C.current || (C.current = !0, D((i) => P(w({}, i), {
         current: i.current - 1,
         // total 要带上，否则翻页请求回来之前判空会误报“已经是最后一个了”
-        total: n,
+        total: r,
         type: "prev"
       })));
     else {
-      N(c);
+      k(c);
       const v = f[c];
       h(v), o !== void 0 && (b.current[o] = {
         index: c,
@@ -225,22 +227,22 @@ const {
     t && B(t);
   };
   W(() => {
-    if (!u || !C || !R || !e)
+    if (!u || !R || !N || !e)
       return;
     const t = ++ae.current;
-    m == null || m.getDatasetsIdVersionsVidSsamplesSid(C, R, e.id).then((n) => {
-      t === ae.current && (h(n), _.current = JSON.parse(JSON.stringify(n)));
+    m == null || m.getDatasetsIdVersionsVidSsamplesSid(R, N, e.id).then((r) => {
+      t === ae.current && (h(r), _.current = JSON.parse(JSON.stringify(r)));
     });
   }, [e == null ? void 0 : e.id]), W(() => {
-    T.current && (T.current.width = T.current.offsetWidth, T.current.height = T.current.offsetHeight);
-  }, [T.current]);
+    O.current && (O.current.width = O.current.offsetWidth, O.current.height = O.current.offsetHeight);
+  }, [O.current]);
   const fe = () => !e || !_.current ? !1 : JSON.stringify(e) !== JSON.stringify(_.current), ge = () => {
     if (e)
       if (fe()) {
         A(!0);
         const t = e.confirmStatus === 1 ? Q : j;
-        t == null || t(e).then((n) => {
-          n ? (ue(), q()) : w.error("保存失败");
+        t == null || t(e).then((r) => {
+          r ? (ue(), q()) : z.error("保存失败");
         }).finally(() => {
           A(!1);
         });
@@ -251,27 +253,27 @@ const {
       if (fe()) {
         A(!0);
         const t = e.confirmStatus === 1 ? Q : j;
-        t == null || t(e).then((n) => {
-          n ? (H(), q()) : w.error("保存失败");
+        t == null || t(e).then((r) => {
+          r ? (H(), q()) : z.error("保存失败");
         }).finally(() => {
           A(!1);
         });
       } else
         H();
   };
-  return /* @__PURE__ */ P(Ve, {
-    children: [/* @__PURE__ */ P("div", {
+  return /* @__PURE__ */ T(Ve, {
+    children: [/* @__PURE__ */ T("div", {
       className: "ocr-box-detail-records-content",
-      children: [/* @__PURE__ */ P(ye, {
+      children: [/* @__PURE__ */ T(ye, {
         className: "ocr-box-detail-records-content-tabs",
         activeKey: o,
         onChange: (t) => {
-          O >= 0 && o !== void 0 && o !== null && (b.current[o] = {
-            index: O,
+          V >= 0 && o !== void 0 && o !== null && (b.current[o] = {
+            index: V,
             page: d.current || 1
           });
-          const n = b.current[t], f = (n == null ? void 0 : n.page) || 1;
-          D(V(k({}, d), {
+          const r = b.current[t], f = (r == null ? void 0 : r.page) || 1;
+          D(P(w({}, d), {
             current: f
           })), ve(t), X == null || X(t);
         },
@@ -288,21 +290,21 @@ const {
         currentSample: e,
         categories: be,
         onChange: (t) => {
-          h(t), B((n) => {
-            const f = n.findIndex((c) => c.id === t.id);
-            return n[f] = t, [...n];
+          h(t), B((r) => {
+            const f = r.findIndex((c) => c.id === t.id);
+            return r[f] = t, [...r];
           });
         },
         onNextClick: xe,
         onPrevClick: ge
       }) : /* @__PURE__ */ x(De, {})]
-    }), /* @__PURE__ */ P("div", {
+    }), /* @__PURE__ */ T("div", {
       className: "ocr-box-detail-footer",
       children: [/* @__PURE__ */ x("div", {
         style: {
           width: "420px"
         }
-      }), /* @__PURE__ */ P(me, {
+      }), /* @__PURE__ */ T(me, {
         children: [/* @__PURE__ */ x(K, {
           type: "default",
           onClick: ge,
@@ -314,12 +316,12 @@ const {
           disabled: E || te,
           children: "下一张"
         }, "next")]
-      }), /* @__PURE__ */ P(me, {
+      }), /* @__PURE__ */ T(me, {
         style: {
           width: "420px",
           justifyContent: "flex-end"
         },
-        children: [/* @__PURE__ */ P("span", {
+        children: [/* @__PURE__ */ T("span", {
           className: "ocr-modal-label-num",
           children: ["当前图片标注框数量：", ((he = e == null ? void 0 : e.labels) == null ? void 0 : he.length) || 0]
         }), (e == null ? void 0 : e.confirmStatus) === 1 && /* @__PURE__ */ x(Pe, {
@@ -338,7 +340,7 @@ const {
                 content: "是否确认当前标注？",
                 onOk: () => {
                   e && (F(!0), j(e).then((t) => {
-                    t ? (w.success("保存成功"), H(!0), q()) : w.error("保存失败");
+                    t ? (z.success("保存成功"), H(!0), q()) : z.error("保存失败");
                   }).finally(() => {
                     F(!1);
                   }));
@@ -358,8 +360,8 @@ const {
               return;
             F(!0);
             const t = e.confirmStatus === 1 ? Q : j;
-            t == null || t(e).then((n) => {
-              n ? (w.success("保存成功"), H(), q()) : w.error("保存失败");
+            t == null || t(e).then((r) => {
+              r ? (z.success("保存成功"), H(), q()) : z.error("保存失败");
             }).finally(() => {
               F(!1);
             });

package/dist/es/components/VersionCompare/VersionCompareSelectModal/index.mjs

@@ -1,27 +1,27 @@
-import { jsx as t, jsxs as M } from "react/jsx-runtime";
-import { useContext as k, useState as C, useEffect as A } from "react";
+import { jsx as t, jsxs as L } from "react/jsx-runtime";
+import { useContext as M, useState as C, useEffect as k } from "react";
 import { Form as r, Modal as B, Button as F, Select as S } from "antd";
 import E from "../../../DatasetContext/index.mjs";
 import { MOCK_DATASET_VERSIONS as O } from "../mock.mjs";
 const R = (x) => {
   var b, g;
-  const s = k(E), {
+  const s = M(E), {
     open: l,
     datasetId: d = s.datasetId,
     datasetName: y = (b = s.dataset) == null ? void 0 : b.name,
-    initialBaseVersionId: u,
-    initialTargetVersionId: f,
+    initialBaseVersionId: f,
+    initialTargetVersionId: u,
     versions: n,
     cvforceDatahub: c = (g = s.services) == null ? void 0 : g.cvforceDatahub,
     useMock: h = !1,
     onCancel: p,
-    onConfirm: v
-  } = x, [o] = r.useForm(), [i, a] = C([]), [V, I] = C(!1), D = r.useWatch("baseVersionId", o), T = r.useWatch("targetVersionId", o);
-  return A(() => {
+    onConfirm: T
+  } = x, [o] = r.useForm(), [i, a] = C([]), [V, I] = C(!1), v = r.useWatch("baseVersionId", o), D = r.useWatch("targetVersionId", o);
+  return k(() => {
     if (l) {
       if (o.setFieldsValue({
-        baseVersionId: u,
-        targetVersionId: f
+        baseVersionId: f,
+        targetVersionId: u
       }), n && n.length > 0) {
         a(n);
         return;
@@ -42,13 +42,14 @@ const R = (x) => {
         I(!1);
       });
     }
-  }, [l, d, u, f, n, c, h, s.versions, o]), /* @__PURE__ */ t(B, {
+  }, [l, d, f, u, n, c, h, s.versions, o]), /* @__PURE__ */ t(B, {
     title: "选择对比版本",
     open: l,
     width: 400,
     destroyOnClose: !0,
     maskClosable: !1,
     centered: !0,
+    focusTriggerAfterClose: !1,
     onCancel: p,
     footer: [/* @__PURE__ */ t(F, {
       onClick: p,
@@ -59,7 +60,7 @@ const R = (x) => {
       form: "versionCompareSelectForm",
       children: "开始对比"
     }, "confirm")],
-    children: /* @__PURE__ */ M(r, {
+    children: /* @__PURE__ */ L(r, {
       form: o,
       preserve: !1,
       name: "versionCompareSelectForm",
@@ -70,8 +71,8 @@ const R = (x) => {
         }
       },
       onFinish: (e) => {
-        const w = i.find((m) => m.id === e.baseVersionId), L = i.find((m) => m.id === e.targetVersionId);
-        v(e.baseVersionId, e.targetVersionId, w, L);
+        const w = i.find((m) => m.id === e.baseVersionId), A = i.find((m) => m.id === e.targetVersionId);
+        T(e.baseVersionId, e.targetVersionId, w, A);
       },
       children: [/* @__PURE__ */ t(r.Item, {
         label: "数据集",
@@ -92,7 +93,7 @@ const R = (x) => {
           options: i.map((e) => ({
             label: e.no,
             value: e.id,
-            disabled: e.id === T
+            disabled: e.id === D
           }))
         })
       }), /* @__PURE__ */ t(r.Item, {
@@ -109,7 +110,7 @@ const R = (x) => {
           options: i.map((e) => ({
             label: e.no,
             value: e.id,
-            disabled: e.id === D
+            disabled: e.id === v
           }))
         })
       })]