@glodon-aiot/dataset-annotation 3.22.2-alpha.3 → 3.23.0-alpha.2

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

@@ -1,152 +1,150 @@
-var _ = Object.defineProperty, $ = Object.defineProperties;
-var V = Object.getOwnPropertyDescriptors;
+var $ = Object.defineProperty, V = Object.defineProperties;
+var S = Object.getOwnPropertyDescriptors;
 var M = Object.getOwnPropertySymbols;
-var S = Object.prototype.hasOwnProperty, ee = Object.prototype.propertyIsEnumerable;
-var A = (n, l, o) => l in n ? _(n, l, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[l] = o, m = (n, l) => {
-  for (var o in l || (l = {}))
-    S.call(l, o) && A(n, o, l[o]);
+var ee = Object.prototype.hasOwnProperty, ie = Object.prototype.propertyIsEnumerable;
+var A = (d, o, a) => o in d ? $(d, o, { enumerable: !0, configurable: !0, writable: !0, value: a }) : d[o] = a, b = (d, o) => {
+  for (var a in o || (o = {}))
+    ee.call(o, a) && A(d, a, o[a]);
   if (M)
-    for (var o of M(l))
-      ee.call(l, o) && A(n, o, l[o]);
-  return n;
-}, I = (n, l) => $(n, V(l));
-import { jsxs as b, jsx as d } from "react/jsx-runtime";
-import { useRef as B, useState as h, useEffect as g } from "react";
+    for (var a of M(o))
+      ie.call(o, a) && A(d, a, o[a]);
+  return d;
+}, U = (d, o) => V(d, S(o));
+import { jsxs as m, jsx as n } from "react/jsx-runtime";
+import { useRef as B, useState as h, useEffect as w } from "react";
 import { Button as H } from "antd";
 import { useKeyPress as K } from "ahooks";
 import "./style.less.mjs";
-import ie from "../Labels/index.mjs";
-import se from "../LabelMaker/index.mjs";
+import se from "../Labels/index.mjs";
+import le from "../LabelMaker/index.mjs";
 import O from "../../../Iconfont/index.mjs";
-import te from "../../../DetectionStatus/index.mjs";
-const he = (n) => {
-  var P, z, F;
+import oe from "../../../DetectionStatus/index.mjs";
+const ge = (d) => {
+  var u, z, F;
   const {
-    datasetId: l,
-    isImageDetailVisible: o = !0,
+    datasetId: o,
+    isImageDetailVisible: a = !0,
     currentSample: e,
-    onNextClick: v,
-    onPrevClick: L,
+    onNextClick: g,
+    onPrevClick: v,
     labels: r = [],
     editing: q,
-    onRefresh: N,
-    onChange: k,
-    isPreLabel: C,
-    settingHide: U,
-    imgCount: c,
+    onRefresh: L,
+    onChange: C,
+    isPreLabel: p,
+    settingHide: D,
+    imgCount: f,
     readonly: G,
-    showLabelList: D = !0,
+    showLabelList: E = !0,
     renderLabelItem: J,
-    onLoadingChange: w
-  } = n, Q = B(null), T = B({}), [E, W] = h({}), [y, p] = h(), [a, R] = h(), [X, Y] = h(!1), [x, u] = h(!1);
+    onLoadingChange: I
+  } = d, Q = B(null), T = B({}), [P, W] = h({}), [y, N] = h(), [t, R] = h(), [X, Y] = h(!1), [Z, j] = h(), x = !!(e != null && e.fileUrl) && Z !== e.fileUrl;
   K("rightarrow", () => {
-    v && v();
+    g && g();
   }), K("leftarrow", () => {
-    L && L();
-  }), g(() => () => {
-    X && N && N();
-  }, []), g(() => {
-    var s, t;
-    if (p(void 0), (e == null ? void 0 : e.id) !== (a == null ? void 0 : a.id) && R(void 0), !o || !((s = e == null ? void 0 : e.labels) != null && s.length))
+    v && v();
+  }), w(() => () => {
+    X && L && L();
+  }, []), w(() => {
+    var s, l;
+    if (N(void 0), (e == null ? void 0 : e.id) !== (t == null ? void 0 : t.id) && R(void 0), !a || !((s = e == null ? void 0 : e.labels) != null && s.length))
       return;
-    const i = (t = a || e) == null ? void 0 : t.labels.reduce((f, j) => (f[j.id] ? ++f[j.id] : f[j.id] = 1, f), {});
+    const i = (l = t || e) == null ? void 0 : l.labels.reduce((c, k) => (c[k.id] ? ++c[k.id] : c[k.id] = 1, c), {});
     W(i || {});
-  }, [o, e, a]), g(() => {
-    e != null && e.fileUrl && u(!0);
-  }, [e == null ? void 0 : e.fileUrl]), g(() => {
-    w && w(x);
-  }, [x, w]), g(() => {
-    if (a != null && a.labels) {
+  }, [a, e, t]), w(() => {
+    I && I(x, e == null ? void 0 : e.fileUrl);
+  }, [x, e == null ? void 0 : e.fileUrl, I]), w(() => {
+    if (t != null && t.labels) {
       const i = [];
-      a.labels.forEach((s) => {
-        const t = r.find((f) => f.id === s.id);
-        t && i.push(I(m({}, s), {
-          label: t.label
+      t.labels.forEach((s) => {
+        const l = r.find((c) => c.id === s.id);
+        l && i.push(U(b({}, s), {
+          label: l.label
         }));
-      }), a.labels = i, R(m({}, a));
+      }), t.labels = i, R(b({}, t));
     }
   }, [r]);
-  const Z = () => {
-    Q.current && u(!1);
+  const _ = () => {
+    Q.current && j(e == null ? void 0 : e.fileUrl);
   };
-  return window.onresize = Z, /* @__PURE__ */ b("div", {
+  return window.onresize = _, /* @__PURE__ */ m("div", {
     className: "detection-image-detail",
-    children: [/* @__PURE__ */ b("div", {
+    children: [/* @__PURE__ */ m("div", {
       className: "detail-image",
-      children: [U ? /* @__PURE__ */ b("div", {
+      children: [D ? /* @__PURE__ */ m("div", {
         className: "img-detail-info",
-        children: ["第 ", c == null ? void 0 : c.index, " 张 / 共 ", c == null ? void 0 : c.total, " 张"]
-      }) : /* @__PURE__ */ d("div", {
+        children: ["第 ", f == null ? void 0 : f.index, " 张 / 共 ", f == null ? void 0 : f.total, " 张"]
+      }) : /* @__PURE__ */ n("div", {
         className: "img-detail-info",
-        children: c == null ? void 0 : c.index
-      }), /* @__PURE__ */ b("div", {
+        children: f == null ? void 0 : f.index
+      }), /* @__PURE__ */ m("div", {
         className: "detail-content",
-        children: [L && /* @__PURE__ */ d(H, {
+        children: [v && /* @__PURE__ */ n(H, {
           className: "select-prev",
-          icon: /* @__PURE__ */ d(O, {
+          icon: /* @__PURE__ */ n(O, {
             type: "icon-zuojiantou"
           }),
           type: "text",
           disabled: x,
-          onClick: () => L(),
+          onClick: () => v(),
           tabIndex: 0
-        }), /* @__PURE__ */ b("div", {
+        }), /* @__PURE__ */ m("div", {
           className: "select-main",
           ref: T,
-          children: [((P = e == null ? void 0 : e.sampleFileName) == null ? void 0 : P.name) && /* @__PURE__ */ d("div", {
+          children: [((u = e == null ? void 0 : e.sampleFileName) == null ? void 0 : u.name) && /* @__PURE__ */ n("div", {
             className: "img-detail-name-overlay",
             children: e.sampleFileName.name
-          }), /* @__PURE__ */ d("div", {
+          }), /* @__PURE__ */ n("div", {
             className: "detection-status-wrapper",
-            children: /* @__PURE__ */ d(te, {
+            children: /* @__PURE__ */ n(oe, {
               sample: e
             })
-          }), /* @__PURE__ */ d(se, {
+          }), /* @__PURE__ */ n(le, {
             disabled: G,
             imageUrl: (e == null ? void 0 : e.fileUrl) || "",
             pen: y,
-            labels: ((z = a ? a.labels : e == null ? void 0 : e.labels) == null ? void 0 : z.map((i) => {
+            labels: ((z = t ? t.labels : e == null ? void 0 : e.labels) == null ? void 0 : z.map((i) => {
               var s;
-              return I(m({}, i), {
-                color: ((s = r.find((t) => t.id === i.id)) == null ? void 0 : s.color) || ""
+              return U(b({}, i), {
+                color: ((s = r.find((l) => l.id === i.id)) == null ? void 0 : s.color) || ""
               });
             })) || [],
-            onImageLoad: () => u(!1),
-            onImageError: () => u(!1),
+            onImageLoad: () => j(e == null ? void 0 : e.fileUrl),
+            onImageError: () => j(e == null ? void 0 : e.fileUrl),
             onChange: (i) => {
-              if (p(void 0), !e)
+              if (N(void 0), !e)
                 return;
-              const s = I(m({}, e), {
-                labels: i.map((t) => ({
-                  id: t.id,
-                  label: t.label,
-                  box: t.box
+              const s = U(b({}, e), {
+                labels: i.map((l) => ({
+                  id: l.id,
+                  label: l.label,
+                  box: l.box
                 }))
               });
-              R(s), k && k(s);
+              R(s), C && C(s);
             },
-            isPreLabel: C,
+            isPreLabel: p,
             renderLabelItem: J
-          }, D ? "with-slide" : "no-slide")]
-        }), v && /* @__PURE__ */ d(H, {
+          }, E ? "with-slide" : "no-slide")]
+        }), g && /* @__PURE__ */ n(H, {
           className: "select-next",
-          icon: /* @__PURE__ */ d(O, {
+          icon: /* @__PURE__ */ n(O, {
             type: "icon-youjiantou"
           }),
           type: "text",
           disabled: x,
-          onClick: () => v()
+          onClick: () => g()
         })]
       })]
-    }), (!!(r != null && r.length) || q) && D && /* @__PURE__ */ d("div", {
+    }), (!!(r != null && r.length) || q) && E && /* @__PURE__ */ n("div", {
       className: "detail-slide",
-      children: /* @__PURE__ */ d(ie, {
-        datasetId: l,
+      children: /* @__PURE__ */ n(se, {
+        datasetId: o,
         selectMode: "single",
-        data: ((F = Object.keys(E)) == null ? void 0 : F.map((i) => {
-          const s = r.find((t) => t.id === i);
+        data: ((F = Object.keys(P)) == null ? void 0 : F.map((i) => {
+          const s = r.find((l) => l.id === i);
           if (s)
-            return s.count = E[i], s;
+            return s.count = P[i], s;
         }).filter((i) => !!i)) || [],
         shortcut: !0,
         selected: y ? [y] : [],
@@ -156,21 +154,21 @@ const he = (n) => {
             return;
           }
           if (!i.length) {
-            p(void 0);
+            N(void 0);
             return;
           }
-          const s = r == null ? void 0 : r.find((t) => i[0].label === t.label);
-          p(s);
+          const s = r == null ? void 0 : r.find((l) => i[0].label === l.label);
+          N(s);
         },
         onListChange: () => {
-          Y(!0), N && N();
+          Y(!0), L && L();
         },
-        isPreLabel: C,
-        settingHide: U
+        isPreLabel: p,
+        settingHide: D
       })
     })]
   });
 };
 export {
-  he as default
+  ge as default
 };

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

@@ -1,51 +1,60 @@
-import { jsxs as n, jsx as i } from "react/jsx-runtime";
-import { useState as K } from "react";
-import { Modal as u, Tabs as O, Space as V, Button as s, Tooltip as x } from "antd";
-import { useKeyPress as I } from "ahooks";
-import B from "../ImageDetail/index.mjs";
+import { jsxs as d, jsx as i } from "react/jsx-runtime";
+import { useState as x, useCallback as z } from "react";
+import { Modal as N, Button as l, Tabs as F, Space as H, Tooltip as R } from "antd";
+import { useKeyPress as k } from "ahooks";
+import q from "../ImageDetail/index.mjs";
 import "./style.less.mjs";
-import F from "../../../DataEmpty/index.mjs";
-import { ISampleActionType as c } from "../../index.mjs";
-const W = (L) => {
+import G from "../../../DataEmpty/index.mjs";
+import { ISampleActionType as h } from "../../index.mjs";
+const _ = (w) => {
   const {
-    datasetId: N,
-    setIsImageDetailVisible: m,
-    isImageDetailVisible: f = !0,
+    datasetId: D,
+    setIsImageDetailVisible: b,
+    isImageDetailVisible: p = !0,
     currentSample: e,
     onNextClick: o,
-    onPrevClick: l,
+    onPrevClick: s,
     onSave: a,
-    onDeleteSample: h,
-    labels: w = [],
-    onRefresh: v,
-    onChange: D,
-    isPreLabel: r,
-    settingHide: k,
-    imgCount: H,
-    showLabelList: M = !0,
-    renderLabelItem: E,
-    onEnterEdit: p,
-    filterItems: b,
-    filterMode: T,
-    onFilterChange: g,
+    onDeleteSample: g,
+    labels: v = [],
+    onRefresh: M,
+    onChange: T,
+    isPreLabel: n,
+    settingHide: E,
+    imgCount: J,
+    showLabelList: j = !0,
+    renderLabelItem: A,
+    onEnterEdit: y,
+    onBackToDetail: C,
+    onLoadingChange: c,
+    filterItems: u,
+    filterMode: B,
+    onFilterChange: I,
     previewMode: t = !0,
-    canLabel: d = !1,
-    canDelete: y = !1
-  } = L, [C, j] = K(!1);
-  return I("rightarrow", () => {
+    canLabel: r = !1,
+    canDelete: L = !1
+  } = w, [f, K] = x(!1), O = z((m, V) => {
+    K(m), c == null || c(m, V);
+  }, [c]);
+  return k("rightarrow", () => {
     t || o && o(e == null ? void 0 : e.confirmStatus);
-  }), I("leftarrow", () => {
-    t || l && l(e == null ? void 0 : e.confirmStatus);
-  }), /* @__PURE__ */ n(u, {
-    title: /* @__PURE__ */ i("div", {
+  }), k("leftarrow", () => {
+    t || s && s(e == null ? void 0 : e.confirmStatus);
+  }), /* @__PURE__ */ d(N, {
+    title: /* @__PURE__ */ d("div", {
       className: "detection-sample-detail-title",
-      children: /* @__PURE__ */ i("span", {
+      children: [/* @__PURE__ */ i("span", {
         children: t ? "详情" : "标注"
-      })
+      }), !t && r && e && C && /* @__PURE__ */ i(l, {
+        size: "small",
+        onClick: () => C(e.confirmStatus),
+        disabled: f,
+        children: "返回详情"
+      })]
     }),
     width: "100%",
-    open: f,
-    onCancel: () => m(!1),
+    open: p,
+    onCancel: () => b(!1),
     footer: null,
     centered: !0,
     wrapClassName: "detection-modal-wrap",
@@ -56,61 +65,61 @@ const W = (L) => {
     destroyOnClose: !1,
     children: [/* @__PURE__ */ i("div", {
       className: "detail-tabs",
-      children: !t && b && /* @__PURE__ */ i(O, {
-        activeKey: T,
-        items: b,
-        onChange: (A) => g && g(A)
+      children: !t && u && /* @__PURE__ */ i(F, {
+        activeKey: B,
+        items: u,
+        onChange: (m) => I && I(m)
       })
-    }), e ? /* @__PURE__ */ i(B, {
-      datasetId: N,
-      isImageDetailVisible: f,
-      setIsImageDetailVisible: m,
+    }), e ? /* @__PURE__ */ i(q, {
+      datasetId: D,
+      isImageDetailVisible: p,
+      setIsImageDetailVisible: b,
       currentSample: e,
       onNextClick: t ? () => o == null ? void 0 : o(e == null ? void 0 : e.confirmStatus) : void 0,
-      onPrevClick: t ? () => l == null ? void 0 : l(e == null ? void 0 : e.confirmStatus) : void 0,
-      labels: w,
+      onPrevClick: t ? () => s == null ? void 0 : s(e == null ? void 0 : e.confirmStatus) : void 0,
+      labels: v,
       editing: !t,
-      onRefresh: v,
-      onChange: D,
-      isPreLabel: r,
-      settingHide: k,
-      readonly: t || !d,
-      showLabelList: t ? !1 : M,
-      renderLabelItem: E,
-      onLoadingChange: j
-    }) : /* @__PURE__ */ i(F, {}), e && /* @__PURE__ */ i("div", {
+      onRefresh: M,
+      onChange: T,
+      isPreLabel: n,
+      settingHide: E,
+      readonly: t || !r,
+      showLabelList: t ? !1 : j,
+      renderLabelItem: A,
+      onLoadingChange: O
+    }) : /* @__PURE__ */ i(G, {}), e && /* @__PURE__ */ i("div", {
       className: "detail-footer",
-      children: t ? /* @__PURE__ */ n(V, {
-        children: [p && d && /* @__PURE__ */ i("div", {
+      children: t ? /* @__PURE__ */ d(H, {
+        children: [y && r && /* @__PURE__ */ i("div", {
           className: "detail-actions",
-          children: /* @__PURE__ */ i(s, {
+          children: /* @__PURE__ */ i(l, {
             type: "primary",
-            onClick: p,
+            onClick: y,
             children: "标注"
           })
-        }), y && /* @__PURE__ */ i(s, {
+        }), L && /* @__PURE__ */ i(l, {
           danger: !0,
-          onClick: h,
+          onClick: g,
           children: "删除数据"
         })]
-      }) : /* @__PURE__ */ n("div", {
+      }) : /* @__PURE__ */ d("div", {
         className: "footer-bar",
         children: [/* @__PURE__ */ i("div", {
           className: "footer-left"
-        }), /* @__PURE__ */ n("div", {
+        }), /* @__PURE__ */ d("div", {
           className: "footer-center",
-          children: [/* @__PURE__ */ i(s, {
-            onClick: () => l == null ? void 0 : l(e == null ? void 0 : e.confirmStatus),
-            disabled: C,
+          children: [/* @__PURE__ */ i(l, {
+            onClick: () => s == null ? void 0 : s(e == null ? void 0 : e.confirmStatus),
+            disabled: f,
             children: "上一张"
-          }), /* @__PURE__ */ i(s, {
+          }), /* @__PURE__ */ i(l, {
             onClick: () => o == null ? void 0 : o(e == null ? void 0 : e.confirmStatus),
-            disabled: C,
+            disabled: f,
             children: "下一张"
           })]
-        }), /* @__PURE__ */ n("div", {
+        }), /* @__PURE__ */ d("div", {
           className: "footer-right",
-          children: [d && e.confirmStatus === 1 && /* @__PURE__ */ i(x, {
+          children: [r && e.confirmStatus === 1 && /* @__PURE__ */ i(R, {
             title: /* @__PURE__ */ i("span", {
               style: {
                 color: "#ff9800"
@@ -118,36 +127,36 @@ const W = (L) => {
               children: 'AI预标注数据,请"确认标注"完成审核'
             }),
             placement: "top",
-            children: /* @__PURE__ */ i(s, {
+            children: /* @__PURE__ */ i(l, {
               type: "primary",
               onClick: () => {
-                u.confirm({
+                N.confirm({
                   title: "确认",
                   content: "是否确认当前标注？",
                   onOk: () => {
-                    a == null || a(0, c.Confirm);
+                    a == null || a(0, h.Confirm);
                   }
                 });
               },
-              disabled: r,
+              disabled: n,
               className: "confirm-label-btn",
               children: "确认标注"
             })
-          }), d && e.confirmStatus === 1 && /* @__PURE__ */ i(s, {
+          }), r && e.confirmStatus === 1 && /* @__PURE__ */ i(l, {
             type: "primary",
-            onClick: () => a == null ? void 0 : a(1, c.Save),
-            disabled: r,
+            onClick: () => a == null ? void 0 : a(1, h.Save),
+            disabled: n,
             children: "保存标注"
-          }), d && e.confirmStatus !== 1 && /* @__PURE__ */ i(s, {
+          }), r && e.confirmStatus !== 1 && /* @__PURE__ */ i(l, {
             type: "primary",
             onClick: () => {
-              a == null || a(0, c.Confirm);
+              a == null || a(0, h.Confirm);
             },
-            disabled: r,
+            disabled: n,
             children: "保存标注"
-          }), y && /* @__PURE__ */ i(s, {
-            onClick: h,
-            disabled: r,
+          }), L && /* @__PURE__ */ i(l, {
+            onClick: g,
+            disabled: n,
             children: "删除数据"
           })]
         })]
@@ -156,5 +165,5 @@ const W = (L) => {
   });
 };
 export {
-  W as default
+  _ as default
 };