@nocobase/client 1.2.35-alpha → 1.2.37-alpha

package/es/index.mjs

@@ -2048,6 +2048,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get SchemaSettingsNumberFormat() {
     return SchemaSettingsNumberFormat;
   },
+  get SchemaSettingsPagingMode() {
+    return SchemaSettingsPagingMode;
+  },
   get SchemaSettingsPlugin() {
     return SchemaSettingsPlugin;
   },
@@ -3977,7 +3980,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.35-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.37-alpha", 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.1.4",
@@ -3998,9 +4001,9 @@ const name = "@nocobase/client", version$1 = "1.2.35-alpha", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.35-alpha",
-  "@nocobase/sdk": "1.2.35-alpha",
-  "@nocobase/utils": "1.2.35-alpha",
+  "@nocobase/evaluators": "1.2.37-alpha",
+  "@nocobase/sdk": "1.2.37-alpha",
+  "@nocobase/utils": "1.2.37-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -14529,6 +14532,38 @@ function createModalSettingsItem(e) {
     }
   };
 }
+function SchemaSettingsPagingMode() {
+  const e = useField(), t = useFieldSchema(), { t: o } = useTranslation(), { dn: n } = useDesignable(), { service: r } = useTableBlockContext(), i = [
+    {
+      value: "default",
+      label: o("Default")
+    },
+    {
+      value: "simplePaginate",
+      label: o("Simple Paginate")
+    }
+  ];
+  return /* @__PURE__ */ jsx(
+    SchemaSettingsSelectItem,
+    {
+      title: o("Paging mode"),
+      options: i,
+      value: e.decoratorProps.pagingMode || "default",
+      onChange: (a) => {
+        var c;
+        t["x-decorator-props"].pagingMode = a;
+        const l = g({}, (c = r.params) == null ? void 0 : c[0]);
+        a === "simplePaginate" ? l.simplePaginate = !0 : delete l.simplePaginate, r.run({ params: l }), e.decoratorProps.pagingMode = a, n.emit("patch", {
+          schema: {
+            "x-uid": t["x-uid"],
+            "x-decorator-props": t["x-decorator-props"]
+          }
+        }), n.refresh();
+      }
+    },
+    "paging-mode"
+  );
+}
 const tableBlockSettings = new SchemaSettings({
   name: "blockSettings:table",
   items: [
@@ -14644,6 +14679,10 @@ const tableBlockSettings = new SchemaSettings({
         };
       }
     },
+    {
+      name: "pagingMode",
+      Component: SchemaSettingsPagingMode
+    },
     {
       name: "ConnectDataBlocks",
       Component: SchemaSettingsConnectDataBlocks,
@@ -15368,18 +15407,19 @@ const InternalTableBlockProvider = (e) => {
   }
   return { params: o, parseVariableLoading: n };
 }, TableBlockProvider = withDynamicSchemaProps((e) => {
-  const t = e.resource || e.association, o = useFieldSchema(), { getCollection: n, getCollectionField: r } = useCollectionManager_deprecated(e.dataSource), i = n(e.collection, e.dataSource), { treeTable: a } = (o == null ? void 0 : o["x-decorator-props"]) || {}, { params: l, parseVariableLoading: c } = useTableBlockParamsCompat(e);
-  let u = "children";
+  const t = e.resource || e.association, o = useFieldSchema(), { getCollection: n, getCollectionField: r } = useCollectionManager_deprecated(e.dataSource), i = n(e.collection, e.dataSource), { treeTable: a, pagingMode: l } = (o == null ? void 0 : o["x-decorator-props"]) || {}, { params: c, parseVariableLoading: u } = useTableBlockParamsCompat(e);
+  let d = "children";
   if (a)
     if (t != null && t.includes(".")) {
-      const p = r(t);
-      p != null && p.treeChildren && (u = p.name), l.tree = !0;
+      const m = r(t);
+      m != null && m.treeChildren && (d = m.name), c.tree = !0;
     } else {
-      const p = i.fields.find((m) => m.treeChildren);
-      p && (u = p.name), l.tree = !0;
+      const m = i.fields.find((h) => h.treeChildren);
+      m && (d = m.name), c.tree = !0;
     }
-  const d = useMemo(() => createForm(), [a]);
-  return c ? null : /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { treeTable: a }, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: d, children: /* @__PURE__ */ jsx(BlockProvider, F(g({ name: e.name || "table" }, e), { params: l, runWhenParamsChanged: !0, children: /* @__PURE__ */ jsx(InternalTableBlockProvider, F(g({}, e), { childrenColumnName: u, params: l })) })) }) });
+  l === "simplePaginate" ? c.simplePaginate = !0 : c == null || delete c.simplePaginate;
+  const p = useMemo(() => createForm(), [a]);
+  return u ? null : /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { treeTable: a }, children: /* @__PURE__ */ jsx(FormContext.Provider, { value: p, children: /* @__PURE__ */ jsx(BlockProvider, F(g({ name: e.name || "table" }, e), { params: c, runWhenParamsChanged: !0, children: /* @__PURE__ */ jsx(InternalTableBlockProvider, F(g({}, e), { childrenColumnName: d, params: c })) })) }) });
 }), useTableBlockContext = () => useContext(TableBlockContext), useTableBlockProps = () => {
   var l, c, u, d, p, m, h, f, x, C;
   const e = useField(), t = useFieldSchema(), o = useTableBlockContext(), n = (u = (c = (l = t.parent) == null ? void 0 : l["x-decorator-props"]) == null ? void 0 : c.params) == null ? void 0 : u.sort, { getDataBlocks: r } = useFilterBlock(), i = (d = o == null ? void 0 : o.service) == null ? void 0 : d.loading, a = useMemo(() => {
@@ -15417,10 +15457,10 @@ const InternalTableBlockProvider = (e) => {
     onChange: useCallback(
       ({ current: S, pageSize: b }, y, v) => {
         var w, M, N;
-        const I = o.dragSort ? o.dragSortBy : v.order ? v.order === "ascend" ? [v.field] : [`-${v.field}`] : n || o.dragSortBy, A = b || ((N = (M = (w = t.parent) == null ? void 0 : w["x-decorator-props"]) == null ? void 0 : M.params) == null ? void 0 : N.pageSize), k = F(g({}, a == null ? void 0 : a[0]), { page: S || 1, pageSize: A });
+        const I = v.order ? v.order === "ascend" ? [v.field] : [`-${v.field}`] : n || o.dragSortBy, A = b || ((N = (M = (w = t.parent) == null ? void 0 : w["x-decorator-props"]) == null ? void 0 : M.params) == null ? void 0 : N.pageSize), k = F(g({}, a == null ? void 0 : a[0]), { page: S || 1, pageSize: A });
         I && (k.sort = I), o.service.run(k);
       },
-      [n, a]
+      [n, a, o.dragSort]
     ),
     onClickRow: useCallback(
       (S, b, y) => {
@@ -18402,7 +18442,7 @@ const DynamicComponent$1 = (e) => {
     collectionField: { uiSchema: o, collectionName: r },
     uiSchema: o,
     blockCollectionName: r
-  }), m = useMemo(() => ({ minWidth: 150, maxWidth: 430, marginLeft: 5 }), []), h = useCallback(
+  }), m = useMemo(() => ({ minWidth: 150, maxWidth: 430 }), []), h = useCallback(
     (y) => {
       n({
         mode: i,
@@ -18420,15 +18460,28 @@ const DynamicComponent$1 = (e) => {
       });
     },
     [r, i, n]
-  ), C = useMemo(() => ({ minWidth: 460 }), []), S = useMemo(() => p(d, {
+  ), C = useMemo(() => ({ minWidth: 460, borderRadius: 0 }), []), S = useMemo(() => p(d, {
     value: t == null ? void 0 : t.value
   }), [p, t == null ? void 0 : t.value, d]), b = {
     // 常量
-    constant: /* @__PURE__ */ jsx("div", { role: "button", "aria-label": "dynamic-component-linkage-rules", style: m, children: React.createElement(DynamicComponent$1, {
-      value: t == null ? void 0 : t.value,
-      schema: o,
-      onChange: h
-    }) }),
+    constant: /* @__PURE__ */ jsx(
+      "div",
+      {
+        role: "button",
+        "aria-label": "dynamic-component-linkage-rules",
+        style: m,
+        className: css`
+          .ant-input-affix-wrapper {
+            border-radius: 0px;
+          }
+        `,
+        children: React.createElement(DynamicComponent$1, {
+          value: t == null ? void 0 : t.value,
+          schema: o,
+          onChange: h
+        })
+      }
+    ),
     // 表达式
     express: /* @__PURE__ */ jsxs("div", { role: "button", "aria-label": "dynamic-component-linkage-rules", style: f, children: [
       /* @__PURE__ */ jsx(
@@ -18459,7 +18512,7 @@ const DynamicComponent$1 = (e) => {
         style: { width: 150 },
         onChange: (y) => {
           a(y), n({
-            mode: y
+            mode: t == null ? void 0 : t.mode
           });
         },
         children: [
@@ -18469,7 +18522,7 @@ const DynamicComponent$1 = (e) => {
         ]
       }
     ),
-    b[i]
+    b[(t == null ? void 0 : t.mode) || i]
   ] });
 }, findOption = (e = [], t) => {
   var r;
@@ -18707,7 +18760,7 @@ const useStyles$f = createStyles(() => ({
   return /* @__PURE__ */ jsx(
     Input$3.TextArea,
     {
-      value: r.title,
+      value: r.title || n("Linkage rule"),
       defaultValue: n("Linkage rule"),
       onChange: (a) => {
         a.stopPropagation(), t.field.value.splice(o, 1, F(g({}, r), { title: a.target.value }));
@@ -34631,17 +34684,49 @@ const useColumnsDeepMemoized = (e) => {
   const n = e, { index: t } = n, o = K(n, ["index"]);
   return /* @__PURE__ */ jsx("div", F(g({ className: cls("nb-table-index"), style: { padding: "0 8px 0 16px" } }, o), { children: t }));
 }, usePaginationProps$1 = (e, t) => {
-  const { t: o } = useTranslation(), n = useMemo(
+  const { t: o } = useTranslation(), n = useField(), { token: r } = useToken(), i = useMemo(
     () => g(g({}, e), t),
     [JSON.stringify(g(g({}, e), t))]
-  ), r = useCallback((a) => o("Total {{count}} items", { count: a }), [o]), i = useMemo(
-    () => g({
-      showTotal: r,
+  ), { total: a, current: l, pageSize: c } = i || {}, u = useCallback(
+    (p) => o("Total {{count}} items", { count: p }),
+    [o, a]
+  ), d = useMemo(() => {
+    var p;
+    return a ? g({
+      showTotal: u,
       showSizeChanger: !0
-    }, n),
-    [n, o, r]
-  );
-  return t === !1 || !t && e === !1 || i.total <= i.pageSize ? !1 : i;
+    }, i) : F(g({
+      showTotal: !1,
+      simple: !0,
+      showTitle: !1,
+      showSizeChanger: !0,
+      hideOnSinglePage: !1
+    }, i), {
+      total: ((p = n.value) == null ? void 0 : p.length) < c ? c * l : c * l + 1,
+      className: css`
+          .ant-pagination-simple-pager {
+            display: none !important;
+          }
+        `,
+      itemRender: (m, h, f) => h === "prev" ? /* @__PURE__ */ jsxs(
+        "div",
+        {
+          style: { display: "flex" },
+          className: css`
+                  .ant-pagination-item-link {
+                    min-width: ${r.controlHeight}px;
+                  }
+                `,
+          children: [
+            f,
+            " ",
+            /* @__PURE__ */ jsx("div", { style: { marginLeft: "7px" }, children: l })
+          ]
+        }
+      ) : f
+    });
+  }, [i, o, u]);
+  return t === !1 || !t && e === !1 || d.total <= d.pageSize ? !1 : d;
 }, headerClass = css`
   max-width: 300px;
   white-space: nowrap;
@@ -35010,7 +35095,7 @@ const useColumnsDeepMemoized = (e) => {
       const { setVisible: v } = useActionContext(), { selectedRows: I, setSelectedRows: A } = useContext(RecordPickerContext);
       return {
         onClick() {
-          I.map((k) => o.value.push(k)), o.onInput(o.value), A([]), v(!1);
+          I.map((k) => o.value.push(k)), o.onInput(o.value), o.initialValue = o.value, A([]), v(!1);
         }
       };
     }, y = () => {
@@ -40509,6 +40594,7 @@ const TableActionColumnDesigner = (e) => {
         }
       }
     ),
+    /* @__PURE__ */ jsx(SchemaSettingsPagingMode, {}),
     /* @__PURE__ */ jsx(SchemaSettingsConnectDataBlocks, { type: FilterBlockType.TABLE, emptyDescription: u("No blocks to connect") }),
     h && /* @__PURE__ */ jsx(SchemaSettingsDivider, {}),
     h && /* @__PURE__ */ jsx(SchemaSettingsTemplate, { componentName: "Table", collectionName: e, resourceName: m }),
@@ -57721,6 +57807,7 @@ export {
   SchemaSettingsManager,
   SchemaSettingsModalItem,
   SchemaSettingsNumberFormat,
+  SchemaSettingsPagingMode,
   SchemaSettingsPlugin,
   SchemaSettingsPopupItem,
   SchemaSettingsProvider,

package/es/schema-settings/SchemaSettingsPagingMode.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.
+ */
+import React from 'react';
+export declare function SchemaSettingsPagingMode(): React.JSX.Element;

package/es/schema-settings/index.d.ts

@@ -20,6 +20,7 @@ export * from './SchemaSettingsSortingRule';
 export * from './SchemaSettingsTemplate';
 export * from './SchemaSettingsBlockHeightItem';
 export * from './setDefaultSortingRulesSchemaSettingsItem';
+export * from './SchemaSettingsPagingMode';
 export * from './setTheDataScopeSchemaSettingsItem';
 export * from './hooks/useGetAriaLabelOfDesigner';
 export * from './hooks/useIsAllowToSetDefaultValue';