@nocobase/client 1.9.0-beta.15 → 1.9.0-beta.17

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

@@ -8,12 +8,13 @@
  */
 export * from './BlockProvider';
 export * from './BlockSchemaComponentProvider';
+export * from './DetailsBlockProvider';
 export * from './FilterFormBlockProvider';
 export * from './FormBlockProvider';
 export * from './FormFieldProvider';
+export * from './hooks';
+export { useLinkActionProps } from './hooks/index';
 export * from './TableBlockProvider';
 export * from './TableFieldProvider';
 export * from './TableSelectorProvider';
-export * from './DetailsBlockProvider';
-export * from './hooks';
-export { useLinkActionProps } from './hooks/index';
+export * from './TemplateBlockProvider';

package/es/index.mjs

@@ -2718,6 +2718,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get TargetKey() {
     return TargetKey;
   },
+  get TemplateBlockProvider() {
+    return TemplateBlockProvider;
+  },
   get TemplateSummary() {
     return TemplateSummary;
   },
@@ -4230,6 +4233,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useTabsContext() {
     return useTabsContext;
   },
+  get useTemplateBlockContext() {
+    return useTemplateBlockContext;
+  },
   get useTitleFieldOptions() {
     return useTitleFieldOptions;
   },
@@ -8850,7 +8856,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.0-beta.15", 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.0-beta.17", 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",
@@ -8871,11 +8877,13 @@ const name = "@nocobase/client", version = "1.9.0-beta.15", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.0-beta.15",
-  "@nocobase/sdk": "1.9.0-beta.15",
-  "@nocobase/utils": "1.9.0-beta.15",
+  "@nocobase/evaluators": "1.9.0-beta.17",
+  "@nocobase/sdk": "1.9.0-beta.17",
+  "@nocobase/utils": "1.9.0-beta.17",
   ahooks: "^3.7.2",
   antd: "5.24.2",
+  "antd-mobile": "^5.41.1",
+  "antd-mobile-icons": "^0.3.0",
   "antd-style": "3.7.1",
   axios: "^1.7.0",
   "bignumber.js": "^9.1.2",
@@ -22368,7 +22376,7 @@ const SchemaSettingsModalItem = (e) => {
   );
 }, SchemaSettingsLinkageRules = function(t) {
   var w;
-  const { collectionName: n, readPretty: o, Component: r, afterSubmit: a, title: i, returnScope: l } = t, c = useFieldSchema(), { form: u } = useFormBlockContext(), { dn: d } = useDesignable(), { t: p } = useTranslation(), { getTemplateById: m } = useSchemaTemplateManager(), h = useVariables$1(), g = useLocalVariables$1(), f = useRecord(), { type: C } = useFormBlockType(), b = (w = t == null ? void 0 : t.category) != null ? w : LinkageRuleCategory.default, S = (t == null ? void 0 : t.type) || (c != null && c["x-action"] || ["Action", "Action.Link"].includes(c["x-component"]) ? "button" : "field"), y = findGridSchema(c) || c, v = useLinkageCollectionFilterOptions(n), I = useLinkageCollectionFieldOptions(n, o), F = {
+  const { collectionName: n, readPretty: o, Component: r, afterSubmit: a, title: i, returnScope: l } = t, c = useFieldSchema(), { form: u } = useFormBlockContext(), { dn: d } = useDesignable(), { t: p } = useTranslation(), { getTemplateById: m } = useSchemaTemplateManager(), h = useVariables$1(), g = useLocalVariables$1(), f = useRecord(), { type: C } = useFormBlockType(), b = (w = t == null ? void 0 : t.category) != null ? w : LinkageRuleCategory.default, S = (t == null ? void 0 : t.type) || (c != null && c["x-action"] || ["Action", "Action.Link", "WorkbenchAction"].includes(c["x-component"]) ? "button" : "field"), y = findGridSchema(c) || c, v = useLinkageCollectionFilterOptions(n), I = useLinkageCollectionFieldOptions(n, o), F = {
     [LinkageRuleCategory.default]: p("Linkage rules"),
     [LinkageRuleCategory.style]: p("Style")
   }, R = LinkageRuleDataKeyMap[b], T = useCallback(() => (y == null ? void 0 : y[R]) || (c == null ? void 0 : c[R]) || [], [y, c, R]), D = i || F[b] || p("Linkage rules"), B = useFlag(), N = useMemo(
@@ -30097,21 +30105,21 @@ const useCreateActionProps = () => {
     onReset: h
   };
 }, useDetailsPaginationProps = () => {
-  var o, r, a, i, l, c, u, d, p, m, h, g, f, C, b;
-  const e = useDetailsBlockContext(), t = ((a = (r = (o = e.service) == null ? void 0 : o.data) == null ? void 0 : r.meta) == null ? void 0 : a.count) || 0, n = (c = (l = (i = e.service) == null ? void 0 : i.data) == null ? void 0 : l.meta) == null ? void 0 : c.page;
+  var r, a, i, l, c, u, d, p, m, h, g, f, C, b, S, y, v;
+  const e = useDetailsBlockContext(), t = ((i = (a = (r = e.service) == null ? void 0 : r.data) == null ? void 0 : a.meta) == null ? void 0 : i.count) || 0, n = (u = (c = (l = e.service) == null ? void 0 : l.data) == null ? void 0 : c.meta) == null ? void 0 : u.page, { hasNext: o } = ((p = (d = e.service) == null ? void 0 : d.data) == null ? void 0 : p.meta) || {};
   if (!t && n) {
-    let y;
+    let F;
     return {
       simple: !0,
-      current: ((p = (d = (u = e.service) == null ? void 0 : u.data) == null ? void 0 : d.meta) == null ? void 0 : p.page) || 1,
+      current: ((g = (h = (m = e.service) == null ? void 0 : m.data) == null ? void 0 : h.meta) == null ? void 0 : g.page) || 1,
       pageSize: 1,
       showSizeChanger: !1,
       align: "center",
-      onChange(v) {
+      onChange(R) {
         return q(this, null, function* () {
-          var F, R;
-          const I = (R = (F = e.service) == null ? void 0 : F.params) == null ? void 0 : R[0];
-          e.service.run(P(x({}, I), { page: v }));
+          var D, B;
+          const T = (B = (D = e.service) == null ? void 0 : D.params) == null ? void 0 : B[0];
+          e.service.run(P(x({}, T), { page: R }));
         });
       },
       style: {
@@ -30120,7 +30128,7 @@ const useCreateActionProps = () => {
       },
       showTotal: !1,
       showTitle: !1,
-      total: (g = (h = (m = e.service) == null ? void 0 : m.data) == null ? void 0 : h.data) != null && g.length ? 1 * n + 1 : 1 * n,
+      total: ((b = (C = (f = e.service) == null ? void 0 : f.data) == null ? void 0 : C.data) == null ? void 0 : b.length) < 1 || !o ? 1 * n : 1 * n + 1,
       className: css`
         .ant-pagination-simple-pager {
           display: none !important;
@@ -30131,16 +30139,16 @@ const useCreateActionProps = () => {
   return {
     simple: !0,
     hidden: t <= 1,
-    current: ((b = (C = (f = e.service) == null ? void 0 : f.data) == null ? void 0 : C.meta) == null ? void 0 : b.page) || 1,
+    current: ((v = (y = (S = e.service) == null ? void 0 : S.data) == null ? void 0 : y.meta) == null ? void 0 : v.page) || 1,
     total: t,
     pageSize: 1,
     showSizeChanger: !1,
     align: "center",
-    onChange(y) {
+    onChange(F) {
       return q(this, null, function* () {
-        var I, F;
-        const v = (F = (I = e.service) == null ? void 0 : I.params) == null ? void 0 : F[0];
-        e.service.run(P(x({}, v), { page: y }));
+        var T, D;
+        const R = (D = (T = e.service) == null ? void 0 : T.params) == null ? void 0 : D[0];
+        e.service.run(P(x({}, R), { page: F }));
       });
     },
     style: {
@@ -30963,11 +30971,14 @@ const SortableProvider = (e) => {
   return e.id ? e.id : (n = t.address) == null ? void 0 : n.toString();
 }, InternalSortableItem = observer$1(
   (e) => {
-    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, a = Y(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), i = useMemo(() => ({
-      insertAdjacent: "afterEnd",
-      schema: t,
-      removeParentsIfNoChildren: r != null ? r : !0
-    }), [t, r]);
+    const l = useSortableItemProps(e), { schema: t, id: n, eid: o, removeParentsIfNoChildren: r } = l, a = Y(l, ["schema", "id", "eid", "removeParentsIfNoChildren"]), i = useMemo(() => {
+      var c, u, d;
+      return {
+        insertAdjacent: "afterEnd",
+        schema: ((u = (c = t.parent) == null ? void 0 : c.parent) == null ? void 0 : u["x-component"]) === "BlockTemplate" ? (d = t.parent) == null ? void 0 : d.parent : t,
+        removeParentsIfNoChildren: r != null ? r : !0
+      };
+    }, [t, r]);
     return /* @__PURE__ */ jsx(SortableProvider, { id: n, data: i, children: /* @__PURE__ */ jsx(Sortable, P(x({ id: o }, a), { children: e.children })) });
   },
   { displayName: "InternalSortableItem" }
@@ -31215,7 +31226,7 @@ const DragHandler = (e) => {
   };
 }, BlockItem = withDynamicSchemaProps(
   (e) => {
-    const { className: t, children: n, style: o } = useProps(e), { componentCls: r, hashId: a } = useStyles$9(), i = useFieldSchema(), { render: l } = useSchemaToolbarRender(i), { getAriaLabel: c } = useGetAriaLabelOfBlockItem(e.name), u = useMemo(() => c(), [c]), d = useCollection(), p = i["x-decorator"] === "FormItem" && i["x-block-linkage-rules"], m = /* @__PURE__ */ jsxs(
+    const { className: t, children: n, style: o } = useProps(e), { componentCls: r, hashId: a } = useStyles$9(), i = useFieldSchema(), { render: l } = useSchemaToolbarRender(i), { getAriaLabel: c } = useGetAriaLabelOfBlockItem(e.name), u = useMemo(() => c(), [c]), d = useCollection(), p = i["x-decorator"] === "FormItem" && i["x-block-linkage-rules"], m = i["x-component"] === "Iframe" && i["x-block-linkage-rules"], h = /* @__PURE__ */ jsxs(
       SortableItem,
       {
         role: "button",
@@ -31228,7 +31239,7 @@ const DragHandler = (e) => {
         ]
       }
     );
-    return d && !p ? m : /* @__PURE__ */ jsx(BlockLinkageRuleProvider, { children: m });
+    return d && !p && !m ? h : /* @__PURE__ */ jsx(BlockLinkageRuleProvider, { children: h });
   },
   { displayName: "BlockItem" }
 ), TestDesigner = () => {
@@ -31909,7 +31920,7 @@ const useParseDefaultValue = () => {
         const j = transformVariableValue(B, {
           targetCollectionField: D
         });
-        j == null || j === "" ? e.mounted && (e.setInitialValue(void 0), e.setValue(void 0)) : p() ? h === 0 && m(j) : (e.setInitialValue(j), e.setValue(j)), e.loading = !1;
+        j == null || j === "" ? e.mounted && (e.setInitialValue(void 0), e.setValue(void 0)) : p() ? h === 0 && m(j) : c ? e.setValue(j) : e.setInitialValue(j), e.loading = !1;
       } else
         !/\{\{.+\}\}/g.test(t.default) && e.setInitialValue && e.setInitialValue(t.default);
     }), v = _.debounce(y, DEBOUNCE_WAIT);
@@ -44048,7 +44059,7 @@ function useBeforeUpload(e) {
         }));
       }
       const a = validate(r, e);
-      return a ? (r.status = "error", r.response = t(a)) : r.status === "error" && (delete r.status, delete r.response), a ? !1 : r;
+      return a ? (n.status = "error", n.response = t(a)) : n.status === "error" && (delete r.status, delete r.response), a ? !1 : Promise.resolve(r);
     },
     [e]
   );
@@ -59275,7 +59286,7 @@ class OBOFieldInterface extends CollectionFieldInterface {
         }
       }
     });
-    k(this, "availableTypes", ["hasOne"]);
+    k(this, "availableTypes", ["belongsTo"]);
     k(this, "properties", x(x({
       "uiSchema.title": {
         type: "string",
@@ -70220,6 +70231,7 @@ export {
   TabsContextProvider,
   TargetForeignKey,
   TargetKey,
+  TemplateBlockProvider,
   TemplateSummary,
   Templates,
   TestDesigner,
@@ -70724,6 +70736,7 @@ export {
   useTableSelectorProps$4 as useTableSelectorProps,
   useTableSize,
   useTabsContext,
+  useTemplateBlockContext,
   useTitleFieldOptions,
   useToken,
   useUIConfigurationPermissions,

package/es/schema-component/antd/upload/shared.d.ts

@@ -87,4 +87,4 @@ export declare function toValueItem(data: any): any;
 export declare const toItem: (file: any) => any;
 export declare const toFileList: (fileList: any) => any[];
 export declare function validate(file: any, rules: Record<string, any>): string;
-export declare function useBeforeUpload(rules: any): (file: any, fileList: any) => any;
+export declare function useBeforeUpload(rules: any): (file: any, fileList: any) => false | Promise<any>;