@nocobase/client 1.3.52 → 1.3.54

package/es/collection-manager/interfaces/index.d.ts

@@ -8,7 +8,6 @@
  */
 export * from './checkbox';
 export * from './checkboxGroup';
-export * from './chinaRegion';
 export * from './collection';
 export * from './color';
 export * from './createdAt';

package/es/data-source/collection-fields-to-initializer-items/utils/type.d.ts

@@ -69,7 +69,7 @@ export interface CollectionFieldDefaultInitializerItem {
     schema: ISchema;
 }
 export interface CollectionFieldGetInitializerItemResult {
-    find?: (schema: Schema, key: string, action: string) => any;
+    find?: (schema: Schema, key: string, action: string, name?: string) => any;
     remove?: (schema: Schema, cb: (schema: Schema, stopProps: Record<string, any>) => void) => void;
 }
 export interface CommonCollectionFieldsProps {

package/es/index.d.ts

@@ -24,7 +24,6 @@ export * from './appInfo';
 export * from './application';
 export * from './async-data-provider';
 export * from './block-provider';
-export * from './china-region';
 export * from './collection-manager';
 export * from './common';
 export * from './css-variable';

package/es/index.mjs

@@ -54,7 +54,7 @@ export * from "@emotion/css";
 import jsxRuntime, { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import * as formilyReact from "@formily/react";
 import { SchemaOptionsContext, SchemaExpressionScopeContext, Schema, useField, useFieldSchema, useExpressionScope, useForm, Observer, observer as observer$1, connect, SchemaComponentsContext, ExpressionScope, FormProvider as FormProvider$1, RecursionField, mapProps, mapReadPretty, FormContext, useFormEffects, FieldContext, ObjectField, ArrayField, createSchemaField, SchemaContext } from "@formily/react";
-import _, { filter, get, uniqBy, every, some, findIndex, set as set$1, concat, isObject as isObject$1, isString, isEmpty as isEmpty$1, isEqual, cloneDeep as cloneDeep$1, last, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
+import _, { filter, get, uniqBy, every, some, findIndex, set as set$1, concat, isObject as isObject$1, isString, isEmpty as isEmpty$1, isEqual, cloneDeep as cloneDeep$1, last, clone, debounce, castArray, differenceBy, unionBy, omit as omit$1, isFunction as isFunction$1, isBoolean, uniq as uniq$2, pick as pick$1 } from "lodash";
 import React, { createContext, useContext, useCallback, useRef, useEffect, isValidElement, useMemo, useState, memo, createElement, Fragment as Fragment$1, useLayoutEffect, forwardRef, useImperativeHandle, useTransition, createRef } from "react";
 import * as ReactRouterDom from "react-router-dom";
 import { useNavigate, useLocation, Outlet, useHref, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, useParams, Link as Link$1, Navigate, NavLink, useSearchParams, useOutletContext, useMatch, Router } from "react-router-dom";
@@ -763,6 +763,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useColumnSchema() {
     return useColumnSchema$1;
   },
+  get useCurrentPopupContext() {
+    return useCurrentPopupContext;
+  },
   get useDatePickerContext() {
     return useDatePickerContext;
   },
@@ -1146,12 +1149,6 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get CheckboxGroupFieldInterface() {
     return CheckboxGroupFieldInterface;
   },
-  get ChinaRegionFieldInterface() {
-    return ChinaRegionFieldInterface;
-  },
-  get ChinaRegionProvider() {
-    return ChinaRegionProvider;
-  },
   get ClearCollectionFieldContext() {
     return ClearCollectionFieldContext;
   },
@@ -3141,6 +3138,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useCurrentDocumentTitle() {
     return useCurrentDocumentTitle;
   },
+  get useCurrentPopupContext() {
+    return useCurrentPopupContext;
+  },
   get useCurrentRoleVariable() {
     return useCurrentRoleVariable;
   },
@@ -4140,7 +4140,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.52", 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.3.54", 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",
@@ -4161,9 +4161,9 @@ const name = "@nocobase/client", version$1 = "1.3.52", license = "AGPL-3.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.52",
-  "@nocobase/sdk": "1.3.52",
-  "@nocobase/utils": "1.3.52",
+  "@nocobase/evaluators": "1.3.54",
+  "@nocobase/sdk": "1.3.54",
+  "@nocobase/utils": "1.3.54",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -10377,10 +10377,10 @@ const BlockTemplateContext = createContext({ componentNamePrefix: "" }), BlockTe
       }
     }), (n = e.values) == null || delete n[t.name];
   };
-}, findTableColumn = (e, t, o, n = 0) => e.reduceProperties((r, i) => {
-  if (i[t] === o)
+}, findTableColumn = (e, t, o, n) => e.reduceProperties((r, i) => {
+  if (i[t] === o && (!n || i.name === n))
     return i;
-  const a = i.reduceProperties((l, c) => c[t] === o ? c : l);
+  const a = i.reduceProperties((l, c) => c[t] === o && (!n || c.name === n) ? c : l);
   return a || r;
 }), quickEditField$1 = [
   "attachment",
@@ -14454,7 +14454,7 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
   return useEffect(() => {
     var k, T, D, $, V, O, N, R, B, j, w, M, q, L, E;
     if (!((k = t == null ? void 0 : t.service) != null && k.loading)) {
-      const K = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((U) => _.omit(U, i == null ? void 0 : i.foreignKey));
+      const K = (D = (T = t == null ? void 0 : t.service) == null ? void 0 : T.data) == null ? void 0 : D.data.map((U) => U);
       e.value = K, ($ = e == null ? void 0 : e.setInitialValue) == null || $.call(e, K), e.data = e.data || {}, e.data.selectedRowKeys = (O = (V = t == null ? void 0 : t.field) == null ? void 0 : V.data) == null ? void 0 : O.selectedRowKeys, e.componentProps.pagination = e.componentProps.pagination || {}, e.componentProps.pagination.pageSize = (B = (R = (N = t == null ? void 0 : t.service) == null ? void 0 : N.data) == null ? void 0 : R.meta) == null ? void 0 : B.pageSize, e.componentProps.pagination.total = (M = (w = (j = t == null ? void 0 : t.service) == null ? void 0 : j.data) == null ? void 0 : w.meta) == null ? void 0 : M.count, e.componentProps.pagination.current = (E = (L = (q = t == null ? void 0 : t.service) == null ? void 0 : q.data) == null ? void 0 : L.meta) == null ? void 0 : E.page;
     }
   }, [
@@ -35579,9 +35579,6 @@ const ButtonLinkList = (e) => {
                   border: none !important;
                   background: none;
                 }
-                .ant-checkbox-wrapper {
-                  margin-left: 8px;
-                }
                 .ant-table {
                   margin: 0px !important;
                 }
@@ -35593,6 +35590,7 @@ const ButtonLinkList = (e) => {
             `,
         layout: "vertical",
         bordered: !1,
+        feedbackLayout: "popover",
         children: /* @__PURE__ */ jsx(
           SchemaOptionsContext.Provider,
           {
@@ -37629,21 +37627,21 @@ const blockDeleteSettings = new SchemaSettings({
         "changeOnSelectLast",
         "changeOnSelect",
         "maxLevel"
-      ]), m = h(h({}, defaultFieldNames), e.fieldNames), g = l(e), { loading: x, run: f } = a(
+      ]), m = h(h({}, defaultFieldNames), e.fieldNames), g = isFunction$1(l) ? l(e) : [], { loading: x, run: f } = isFunction$1(l) ? a(
         {
           onSuccess(y) {
             t.dataSource = (y == null ? void 0 : y.data) || [];
           }
         },
         e
-      ), C = () => toArr$3(o).map((y) => typeof y == "object" ? y[m.value] : y), S = (y, P) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: y.map((A, k) => {
+      ) : {}, C = () => toArr$3(o).map((y) => typeof y == "object" ? y[m.value] : y), S = (y, P) => /* @__PURE__ */ jsx(Space$1, { split: "/", children: y.map((A, k) => {
         if (P[k])
           return /* @__PURE__ */ jsx("span", { children: A }, k);
         const T = toArr$3(o).filter(Boolean).find((D) => D[m.value] === A);
         return /* @__PURE__ */ jsx("span", { children: (T == null ? void 0 : T[m.label]) || A }, k);
       }) }), b = (y) => {
         var P;
-        y && !((P = t.dataSource) != null && P.length) && f();
+        y && !((P = t.dataSource) != null && P.length) && (f == null || f());
       };
       return /* @__PURE__ */ jsx(
         Cascader$1,
@@ -47449,80 +47447,6 @@ class CheckboxGroupFieldInterface extends CollectionFieldInterface {
     ["Table", "Kanban"].includes(n) && (o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].ellipsis = !0);
   }
 }
-class ChinaRegionFieldInterface extends CollectionFieldInterface {
-  constructor() {
-    super(...arguments);
-    I(this, "name", "chinaRegion");
-    I(this, "type", "object");
-    I(this, "group", "choices");
-    I(this, "order", 7);
-    I(this, "title", '{{t("China region")}}');
-    I(this, "isAssociation", !0);
-    I(this, "default", {
-      interface: "chinaRegion",
-      type: "belongsToMany",
-      target: "chinaRegions",
-      targetKey: "code",
-      sortBy: "level",
-      uiSchema: {
-        type: "array",
-        "x-component": "Cascader",
-        "x-component-props": {
-          useDataSource: "{{ useChinaRegionDataSource }}",
-          useLoadData: "{{ useChinaRegionLoadData }}",
-          changeOnSelectLast: !1,
-          labelInValue: !0,
-          maxLevel: 3,
-          fieldNames: {
-            label: "name",
-            value: "code",
-            children: "children"
-          }
-        }
-      }
-    });
-    I(this, "availableTypes", ["belongsToMany"]);
-    I(this, "properties", F(h({}, defaultProps), {
-      "uiSchema.x-component-props.maxLevel": {
-        type: "number",
-        "x-component": "Radio.Group",
-        "x-decorator": "FormItem",
-        title: '{{t("Select level")}}',
-        default: 3,
-        enum: [
-          { value: 1, label: '{{t("Province")}}' },
-          { value: 2, label: '{{t("City")}}' },
-          { value: 3, label: '{{t("Area")}}' },
-          { value: 4, label: '{{t("Street")}}', disabled: !0 },
-          { value: 5, label: '{{t("Village")}}', disabled: !0 }
-        ]
-      },
-      "uiSchema.x-component-props.changeOnSelectLast": {
-        type: "boolean",
-        "x-component": "Checkbox",
-        "x-content": '{{t("Must select to the last level")}}',
-        "x-decorator": "FormItem"
-      }
-    }));
-    I(this, "filterable", {
-      children: [
-        {
-          name: "name",
-          title: '{{t("Province/city/area name")}}',
-          operators: string,
-          schema: {
-            title: '{{t("Province/city/area name")}}',
-            type: "string",
-            "x-component": "Input"
-          }
-        }
-      ]
-    });
-  }
-  initialize(o) {
-    o.through || (o.through = `t_${uid()}`), o.foreignKey || (o.foreignKey = `f_${uid()}`), o.otherKey || (o.otherKey = `f_${uid()}`), o.sourceKey || (o.sourceKey = "id"), o.targetKey || (o.targetKey = "id");
-  }
-}
 class CollectionSelectFieldInterface extends CollectionFieldInterface {
   constructor() {
     super(...arguments);
@@ -51193,7 +51117,6 @@ class CollectionPlugin extends Plugin {
     this.dataSourceManager.addFieldInterfaces([
       CheckboxFieldInterface,
       CheckboxGroupFieldInterface,
-      ChinaRegionFieldInterface,
       CollectionSelectFieldInterface,
       ColorFieldInterface,
       CreatedAtFieldInterface,
@@ -54245,48 +54168,7 @@ class AntdConfigPlugin extends Plugin {
     });
   }
 }
-const useChinaRegionDataSource = (e) => {
-  const o = useField().componentProps.maxLevel;
-  return useRequest(
-    {
-      resource: "chinaRegions",
-      action: "list",
-      params: {
-        sort: "code",
-        paginate: !1,
-        filter: {
-          level: 1
-        }
-      }
-    },
-    F(h({}, e), {
-      onSuccess(n) {
-        var r;
-        e == null || e.onSuccess({
-          data: ((r = n == null ? void 0 : n.data) == null ? void 0 : r.map((i) => (o !== 1 && (i.isLeaf = !1), i))) || []
-        });
-      }
-    })
-  );
-}, useChinaRegionLoadData = () => {
-  const e = useAPIClient(), t = useField(), o = t.componentProps.maxLevel;
-  return (n) => {
-    var i;
-    const r = n[n.length - 1];
-    ((i = r == null ? void 0 : r.children) == null ? void 0 : i.length) > 0 || (r.loading = !0, e.resource("chinaRegions").list({
-      sort: "code",
-      paginate: !1,
-      filter: {
-        parentCode: r.code
-      }
-    }).then(({ data: a }) => {
-      var l;
-      r.loading = !1, r.children = ((l = a == null ? void 0 : a.data) == null ? void 0 : l.map((c) => (o > c.level && (c.isLeaf = !1), c))) || [], t.dataSource = [...t.dataSource];
-    }).catch((a) => {
-      error(a);
-    }));
-  };
-}, ChinaRegionProvider = (e) => /* @__PURE__ */ jsx(SchemaComponentOptions, { scope: { useChinaRegionDataSource, useChinaRegionLoadData }, children: e.children }), PinnedPluginListContext = createContext({ items: {} });
+const PinnedPluginListContext = createContext({ items: {} });
 PinnedPluginListContext.displayName = "PinnedPluginListContext";
 const PinnedPluginListProvider = (e) => {
   const { children: t, items: o } = e, n = useContext(PinnedPluginListContext);
@@ -59289,8 +59171,6 @@ export {
   Checkbox,
   CheckboxFieldInterface,
   CheckboxGroupFieldInterface,
-  ChinaRegionFieldInterface,
-  ChinaRegionProvider,
   ClearCollectionFieldContext,
   Collection,
   CollectionCategoriesContext,
@@ -59954,6 +59834,7 @@ export {
   useCreateTableBlock,
   useCurrentAppInfo,
   useCurrentDocumentTitle,
+  useCurrentPopupContext,
   useCurrentRoleVariable,
   useCurrentRoles,
   useCurrentSchema,

package/es/schema-component/antd/page/index.d.ts

@@ -11,7 +11,7 @@ export * from './FixedBlock';
 export * from './FixedBlockDesignerItem';
 export * from './Page';
 export * from './Page.Settings';
-export { PagePopups } from './PagePopups';
+export { PagePopups, useCurrentPopupContext } from './PagePopups';
 export { getStoredPopupContext, storePopupContext } from './pagePopupUtils';
 export * from './PageTab.Settings';
 export { PopupSettingsProvider, usePopupSettings } from './PopupSettingsProvider';

package/es/schema-initializer/utils.d.ts

@@ -82,7 +82,7 @@ export declare const gridRowColWrap: (schema: ISchema) => {
 export declare const removeTableColumn: (schema: any, cb: any) => void;
 export declare const removeGridFormItem: (schema: any, cb: any) => void;
 export declare const useRemoveGridFormItem: () => (schema: any, cb: any) => void;
-export declare const findTableColumn: (schema: Schema, key: string, action: string, deepth?: number) => unknown;
+export declare const findTableColumn: (schema: Schema, key: string, action: string, name: string) => unknown;
 export declare function useTableColumnInitializerFields(): SchemaInitializerItemType[];
 export declare function useAssociatedTableColumnInitializerFields(): SchemaInitializerItemType[];
 export declare function useInheritsTableColumnInitializerFields(): {