@nocobase/client 1.9.37 → 1.9.38

package/es/block-provider/TableUidContext.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+/// <reference types="react" />
+export declare const TableUidContext: import("react").Context<string>;

package/es/index.mjs

@@ -8855,7 +8855,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.37", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.38", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -8876,9 +8876,9 @@ const name = "@nocobase/client", version = "1.9.37", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.37",
-  "@nocobase/sdk": "1.9.37",
-  "@nocobase/utils": "1.9.37",
+  "@nocobase/evaluators": "1.9.38",
+  "@nocobase/sdk": "1.9.38",
+  "@nocobase/utils": "1.9.38",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -9914,93 +9914,93 @@ const SubFormProvider = (e) => {
     fieldSchema: n,
     parent: o
   };
-}, useColumnSettings = (e) => {
-  const { t } = useTranslation(), n = `nocobase_table_column_settings_${e}`, o = useCallback(() => {
+}, TableUidContext = createContext(null), useColumnSettings = (e) => {
+  const { t } = useTranslation(), n = useContext(TableUidContext), o = `nocobase_table_column_settings_${n}`, r = useCallback(() => {
     try {
-      const i = localStorage.getItem(n);
-      return i ? JSON.parse(i) : null;
-    } catch (i) {
-      return console.warn("Failed to parse table column settings from localStorage:", i), null;
+      const l = localStorage.getItem(o);
+      return l ? JSON.parse(l) : null;
+    } catch (l) {
+      return console.warn("Failed to parse table column settings from localStorage:", l), null;
     }
-  }, [n]), r = useCallback(
-    (i) => {
+  }, [o]), a = useCallback(
+    (l) => {
       try {
-        const l = JSON.stringify(i);
-        localStorage.setItem(n, l);
-        const c = new CustomEvent("nocobase-table-settings-changed", {
+        const c = JSON.stringify(l);
+        localStorage.setItem(o, c);
+        const u = new CustomEvent("nocobase-table-settings-changed", {
           detail: {
-            key: n,
-            tableId: e,
-            settings: i
+            key: o,
+            tableId: n,
+            settings: l
           }
         });
-        window.dispatchEvent(c);
-      } catch (l) {
-        console.warn("Failed to save table column settings to localStorage:", l), message.error(t("Failed to save table settings"));
+        window.dispatchEvent(u);
+      } catch (c) {
+        console.warn("Failed to save table column settings to localStorage:", c), message.error(t("Failed to save table settings"));
       }
     },
-    [n, e, t]
-  ), a = useCallback(() => {
+    [o, n, t]
+  ), i = useCallback(() => {
     try {
-      localStorage.removeItem(n);
-      const i = new CustomEvent("nocobase-table-settings-changed", {
+      localStorage.removeItem(o);
+      const l = new CustomEvent("nocobase-table-settings-changed", {
         detail: {
-          key: n,
-          tableId: e,
+          key: o,
+          tableId: n,
           settings: null
         }
       });
-      window.dispatchEvent(i);
-    } catch (i) {
-      console.warn("Failed to clear table column settings from localStorage:", i), message.error(t("Failed to clear table settings"));
+      window.dispatchEvent(l);
+    } catch (l) {
+      console.warn("Failed to clear table column settings from localStorage:", l), message.error(t("Failed to clear table settings"));
     }
-  }, [n, e, t]);
+  }, [o, n, t]);
   return {
-    getSettings: o,
-    saveSettings: r,
-    clearSettings: a
+    getSettings: r,
+    saveSettings: a,
+    clearSettings: i
   };
 }, useTableColumnIntegration = (e, t = !0) => {
-  const n = useFieldSchema(), o = (n == null ? void 0 : n["x-uid"]) || "default", { getSettings: r } = useColumnSettings(o), [a, i] = useState(0);
+  const n = useContext(TableUidContext), { getSettings: o } = useColumnSettings(), [r, a] = useState(0);
   useEffect(() => {
-    const u = (d) => {
-      const { key: p, tableId: m } = d.detail;
-      (p.includes(o) || m === o) && i((h) => h + 1);
+    const c = (u) => {
+      const { key: d, tableId: p } = u.detail;
+      (d.includes(n) || p === n) && a((m) => m + 1);
     };
-    return window.addEventListener("nocobase-table-settings-changed", u), () => {
-      window.removeEventListener("nocobase-table-settings-changed", u);
+    return window.addEventListener("nocobase-table-settings-changed", c), () => {
+      window.removeEventListener("nocobase-table-settings-changed", c);
     };
-  }, [o]);
-  const l = useMemo(() => r(), [r, a]);
+  }, [n]);
+  const i = useMemo(() => o(), [o, r]);
   return {
     columns: useMemo(() => {
-      if (!t || !l || l.length === 0)
+      if (!t || !i || i.length === 0)
         return e;
-      const u = /* @__PURE__ */ new Map();
-      l.forEach((g) => {
-        u.set(g.key, g);
+      const c = /* @__PURE__ */ new Map();
+      i.forEach((h) => {
+        c.set(h.key, h);
       });
-      const d = e.map((g) => {
-        const f = u.get(g.key);
-        if (f) {
-          const C = g.columnHidden || !f.visible, b = f.width || g.width, S = f.fixed || g.fixed;
-          return P(x({}, g), {
-            columnHidden: C,
-            fixed: S,
-            width: b,
-            _orderIndex: f.order
+      const u = e.map((h) => {
+        const g = c.get(h.key);
+        if (g) {
+          const f = h.columnHidden || !g.visible, C = g.width || h.width, b = g.fixed || h.fixed;
+          return P(x({}, h), {
+            columnHidden: f,
+            fixed: b,
+            width: C,
+            _orderIndex: g.order
           });
         }
-        return g;
-      }), p = [], m = [];
-      d.forEach((g) => {
-        g._orderIndex !== void 0 ? p.push(g) : m.push(g);
-      }), p.sort((g, f) => (g._orderIndex || 0) - (f._orderIndex || 0));
-      const h = [...p, ...m];
-      return h.forEach((g) => {
-        delete g._orderIndex;
-      }), h;
-    }, [e, l])
+        return h;
+      }), d = [], p = [];
+      u.forEach((h) => {
+        h._orderIndex !== void 0 ? d.push(h) : p.push(h);
+      }), d.sort((h, g) => (h._orderIndex || 0) - (g._orderIndex || 0));
+      const m = [...d, ...p];
+      return m.forEach((h) => {
+        delete h._orderIndex;
+      }), m;
+    }, [e, i])
   };
 }, TableSkeleton = ({ rows: e = 5, columns: t = 6 }) => {
   const { token: n } = useToken$1(), o = n.controlHeight * 2.06, r = n.controlHeight * 1.75, a = useMemo(
@@ -10869,7 +10869,7 @@ const InternalTableBlockProvider = (e) => {
   else
     u = "__nochildren__";
   const d = useMemo(() => createForm(), [i]);
-  return c ? null : /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { treeTable: i }, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: d, children: /* @__PURE__ */ jsx(BlockProvider, P(x({ name: e.name || "table" }, e), { params: l, runWhenParamsChanged: !0, children: /* @__PURE__ */ jsx(InternalTableBlockProvider, P(x({}, e), { childrenColumnName: u, params: l })) })) }) });
+  return c ? null : /* @__PURE__ */ jsx(TableUidContext.Provider, { value: n["x-uid"], children: /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { treeTable: i }, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: d, children: /* @__PURE__ */ jsx(BlockProvider, P(x({ name: e.name || "table" }, e), { params: l, runWhenParamsChanged: !0, children: /* @__PURE__ */ jsx(InternalTableBlockProvider, P(x({}, e), { childrenColumnName: u, params: l })) })) }) }) });
 }), useTableBlockContext = () => useContext(TableBlockContext), useTableBlockContextBasicValue = () => useContext(TableBlockContextBasicValue), NOOP = () => {
 }, CollectOperatorsContext = createContext(null), CollectOperators = (e) => {
   const t = useRef(e.defaultOperators || {}), n = useCallback((i, l) => {
@@ -30076,72 +30076,74 @@ const useCreateActionProps = () => {
   }, [e, t, n, o]);
 }, useEditTableActionProps = () => {
   const e = useField(), t = useFieldSchema(), n = useTableColumns$2(), o = useCallback(() => {
-    let g = t;
-    for (; g; ) {
-      const f = (b) => {
-        if (!(b != null && b.properties))
+    let h = t;
+    for (; h; ) {
+      const g = (C) => {
+        if (!(C != null && C.properties))
           return null;
-        for (const S in b.properties) {
-          const y = b.properties[S];
-          if (y["x-component"] === "TableV2")
+        for (const b in C.properties) {
+          const S = C.properties[b];
+          if (S["x-component"] === "TableV2")
+            return S;
+          const y = g(S);
+          if (y)
             return y;
-          const v = f(y);
-          if (v)
-            return v;
         }
         return null;
-      }, C = f(g);
-      if (C)
-        return C;
-      if (!g.parent)
+      }, f = g(h);
+      if (f)
+        return f;
+      if (!h.parent)
         break;
-      g = g.parent;
+      h = h.parent;
     }
-    return g;
-  }, [t]), r = useMemo(() => o(), [o]), a = useMemo(() => (r == null ? void 0 : r["x-uid"]) || "default", [r]), { getSettings: i, saveSettings: l, clearSettings: c } = useColumnSettings(a), [u, d] = useState(i()), p = useMemo(() => {
+    return h;
+  }, [t]), r = useMemo(() => o(), [o]);
+  useMemo(() => (r == null ? void 0 : r["x-uid"]) || "default", [r]);
+  const { getSettings: a, saveSettings: i, clearSettings: l } = useColumnSettings(), [c, u] = useState(a()), d = useMemo(() => {
     if (n.length === 0)
       return [];
-    if (!u || u.length === 0)
+    if (!c || c.length === 0)
       return n;
-    const g = /* @__PURE__ */ new Map();
-    return u.forEach((C) => {
-      g.set(C.key, C);
-    }), n.map((C) => {
-      const b = g.get(C.key);
-      return b ? P(x({}, C), {
-        visible: b.visible,
-        order: b.order,
-        width: b.width || C.width,
-        fixed: b.fixed || C.fixed
-      }) : C;
-    }).sort((C, b) => (C.order || 0) - (b.order || 0));
-  }, [n, u]);
+    const h = /* @__PURE__ */ new Map();
+    return c.forEach((f) => {
+      h.set(f.key, f);
+    }), n.map((f) => {
+      const C = h.get(f.key);
+      return C ? P(x({}, f), {
+        visible: C.visible,
+        order: C.order,
+        width: C.width || f.width,
+        fixed: C.fixed || f.fixed
+      }) : f;
+    }).sort((f, C) => (f.order || 0) - (C.order || 0));
+  }, [n, c]);
   useEffect(() => {
-    p.length > 0 && (e.dataSource = p);
-  }, [p, e]);
-  const m = useCallback(
-    (g) => {
-      if (!(g != null && g.columns) || !Array.isArray(g.columns))
+    d.length > 0 && (e.dataSource = d);
+  }, [d, e]);
+  const p = useCallback(
+    (h) => {
+      if (!(h != null && h.columns) || !Array.isArray(h.columns))
         return;
-      const f = g.columns.map((C, b) => ({
-        key: C.key,
-        title: C.title,
-        dataIndex: C.dataIndex,
-        visible: C.visible,
-        fixed: C.fixed,
-        width: C.width,
-        order: b
+      const g = h.columns.map((f, C) => ({
+        key: f.key,
+        title: f.title,
+        dataIndex: f.dataIndex,
+        visible: f.visible,
+        fixed: f.fixed,
+        width: f.width,
+        order: C
       }));
-      l(f);
+      i(g);
     },
-    [l]
-  ), h = useCallback(() => {
-    c(), d(i());
-  }, [c]);
+    [i]
+  ), m = useCallback(() => {
+    l(), u(a());
+  }, [l]);
   return {
-    columns: p,
-    onSubmit: m,
-    onReset: h
+    columns: d,
+    onSubmit: p,
+    onReset: m
   };
 }, useDetailsPaginationProps = () => {
   var r, a, i, l, c, u, d, p, m, h, g, f, C, b, S, y, v;
@@ -33049,7 +33051,7 @@ const createSubmitActionSettings = new SchemaSettings({
         l
       )) && d.push(!0), t.stateOfLinkageRules = P(x({}, t.stateOfLinkageRules), {
         disabled: d
-      }), t.disabled = last(d), t.componentProps.disabled = last(d);
+      }), t.data = t.data || {}, t.data.disabled = last(d), t.componentProps.disabled = last(d);
       break;
     case ActionType.Active:
       (yield conditionAnalyses(
@@ -33057,13 +33059,13 @@ const createSubmitActionSettings = new SchemaSettings({
         l
       )) ? d.push(!1) : d.push(!!((g = t.componentProps) != null && g.disabled)), t.stateOfLinkageRules = P(x({}, t.stateOfLinkageRules), {
         disabled: d
-      }), t.disabled = last(d), t.componentProps.disabled = last(d);
+      }), t.data = t.data || {}, t.data.disabled = last(d), t.componentProps.disabled = last(d);
       break;
     default:
       return null;
   }
 }), setInitialActionState = (e) => {
-  e.data = e.data || {}, e.display = "visible", e.disabled = !1, e.data.hidden = !1, e.componentProps.disabled = !1;
+  e.data = e.data || {}, e.display = "visible", e.data.hidden = !1, e.data.disabled = !1, e.componentProps.disabled = !1;
 }, MenuGroup = (e) => e.children;
 function ButtonEditor$1(e) {
   var i, l, c, u, d;
@@ -40368,7 +40370,7 @@ const ActionLink = withDynamicSchemaProps(
     element: Z,
     disabled: Q,
     loading: ne
-  } = (F == null ? void 0 : F(w)) || {}, ee = Y.disabled || a.disabled || ((he = a.data) == null ? void 0 : he.disabled) || I || Q, re = useMemo(() => {
+  } = (F == null ? void 0 : F(w)) || {}, ee = Y.disabled || ((he = a.data) == null ? void 0 : he.disabled) || I || Q, re = useMemo(() => {
     var fe;
     return P(x({}, v), {
       opacity: r && (((fe = a == null ? void 0 : a.data) == null ? void 0 : fe.hidden) || !X) && 0.1,
@@ -40515,14 +40517,14 @@ const RenderButton = ({
         return;
       G.preventDefault(), G.stopPropagation();
       const U = yield getVariableValue(M(F == null ? void 0 : F.title, { title: E(y.title) }), V), K = yield getVariableValue(M(F == null ? void 0 : F.content, { title: E(y.title) }), V);
-      if (console.log(U, K), !a && n) {
+      if (!a && n) {
         const J = () => {
           b ? b(G, () => {
             var Z, Q;
             S !== !1 && (T == null || T(!0), (Q = (Z = N()) == null ? void 0 : Z.refresh) == null || Q.call(Z));
           }) : isBulkEditAction(y) || !j() ? (v(!0), I == null || I()) : ["view", "update", "create", "customize:popup"].includes(y["x-action"]) && y["x-uid"] ? A.current() : (v(!0), I == null || I());
         };
-        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? ((Y = y["x-action-settings"]) != null && Y.skipValidator || (yield (X = z == null ? void 0 : z.submit) == null ? void 0 : X.call(z)), w.confirm({
+        (F == null ? void 0 : F.enable) !== !1 && (F != null && F.content) ? ((Y = y == null ? void 0 : y["x-action-settings"]) != null && Y.skipValidator || (yield (X = z == null ? void 0 : z.submit) == null ? void 0 : X.call(z)), w.confirm({
           title: M(U, { title: D || B || (t == null ? void 0 : t.title) }),
           content: M(K, { title: D || B || (t == null ? void 0 : t.title) }),
           onOk: J
@@ -55666,7 +55668,10 @@ const supportTypes = ["string", "bigInt", "integer", "uuid", "uid", "nanoid"], S
 }, OverridingCollectionField = (e) => {
   const t = useRecord(), n = useCollectionParentRecordData();
   return /* @__PURE__ */ jsx(OverridingFieldAction, x({ item: t, parentItem: n }, e));
-}, getIsOverriding = (e, t, n) => t.find((r) => r.name === n.name).collectionName === e, OverridingFieldAction = (e) => {
+}, getIsOverriding = (e, t, n) => {
+  const o = t.find((r) => r.name === n.name);
+  return (o == null ? void 0 : o.collectionName) === e;
+}, OverridingFieldAction = (e) => {
   const { scope: t, getContainer: n, item: o, parentItem: r, children: a, currentCollection: i } = e, { target: l, through: c } = o, { getInterface: u, getCollection: d, getCurrentCollectionFields: p, getChildrenCollections: m, collections: h } = useCollectionManager_deprecated(), [g, f] = useState(!1), [C, b] = useState({}), S = useAPIClient(), { t: y } = useTranslation(), v = useCompile(), I = (j) => {
     var O;
     return j && ((O = m(j)) == null ? void 0 : O.map(($) => $.name).concat([j]));
@@ -56047,6 +56052,9 @@ const getSchema$4 = (e, t, n) => {
       [uid()]: {
         type: "void",
         "x-component": "Action.Drawer",
+        "x-component-props": {
+          getContainer: o
+        },
         "x-decorator": "Form",
         "x-decorator-props": {
           useValues: "{{ useValuesFromRecord }}"
@@ -56091,11 +56099,14 @@ const getSchema$4 = (e, t, n) => {
   };
 }, useValuesFromRecord = (e) => {
   const t = useRecord(), n = useRequest(
-    () => Promise.resolve({
-      data: P(x({}, omit$1(cloneDeep(t), ["__parent", "__collectionName"])), {
-        category: t == null ? void 0 : t.category.map((r) => r.id)
-      })
-    }),
+    () => {
+      var r;
+      return Promise.resolve({
+        data: P(x({}, omit$1(cloneDeep(t), ["__parent", "__collectionName"])), {
+          category: (r = t == null ? void 0 : t.category) == null ? void 0 : r.map((a) => a.id)
+        })
+      });
+    },
     P(x({}, e), {
       manual: !0
     })
@@ -56128,7 +56139,8 @@ const getSchema$4 = (e, t, n) => {
           const g = i(o.template), f = getSchema$3(
             x({}, g),
             o,
-            m
+            m,
+            n
           );
           d(f), c(!0);
         }),
@@ -61260,28 +61272,36 @@ class CollectionPlugin extends Plugin {
   addFieldInterfaceGroups() {
     this.dataSourceManager.addFieldInterfaceGroups({
       basic: {
-        label: '{{t("Basic")}}'
+        label: '{{t("Basic")}}',
+        order: 1
       },
       choices: {
-        label: '{{t("Choices")}}'
+        label: '{{t("Choices")}}',
+        order: 20
       },
       media: {
-        label: '{{t("Media")}}'
+        label: '{{t("Media")}}',
+        order: 40
       },
       datetime: {
-        label: '{{t("Date & Time")}}'
+        label: '{{t("Date & Time")}}',
+        order: 80
       },
       relation: {
-        label: '{{t("Relation")}}'
+        label: '{{t("Relation")}}',
+        order: 100
       },
       advanced: {
-        label: '{{t("Advanced type")}}'
+        label: '{{t("Advanced type")}}',
+        order: 200
       },
       systemInfo: {
-        label: '{{t("System info")}}'
+        label: '{{t("System info")}}',
+        order: 400
       },
       others: {
-        label: '{{t("Others")}}'
+        label: '{{t("Others")}}',
+        order: 800
       }
     });
   }