@nocobase/client 1.3.29-beta → 1.3.31-beta

package/es/index.mjs

@@ -328,6 +328,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get AssociationField() {
     return AssociationField;
   },
+  get AssociationFieldMode() {
+    return AssociationFieldMode;
+  },
   get AssociationFieldModeProvider() {
     return AssociationFieldModeProvider;
   },
@@ -748,6 +751,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useActionContext() {
     return useActionContext;
   },
+  get useAssociationFieldModeContext() {
+    return useAssociationFieldModeContext;
+  },
   get useBackButton() {
     return useBackButton;
   },
@@ -1005,6 +1011,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get AssociationField() {
     return AssociationField;
   },
+  get AssociationFieldMode() {
+    return AssociationFieldMode;
+  },
   get AssociationFieldModeProvider() {
     return AssociationFieldModeProvider;
   },
@@ -2949,6 +2958,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get useAssociationCreateActionProps() {
     return useAssociationCreateActionProps;
   },
+  get useAssociationFieldModeContext() {
+    return useAssociationFieldModeContext;
+  },
   get useAssociationFilterBlockProps() {
     return useAssociationFilterBlockProps;
   },
@@ -4110,7 +4122,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.3.29-beta", 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.31-beta", 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",
@@ -4131,9 +4143,9 @@ const name = "@nocobase/client", version$1 = "1.3.29-beta", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.3.29-beta",
-  "@nocobase/sdk": "1.3.29-beta",
-  "@nocobase/utils": "1.3.29-beta",
+  "@nocobase/evaluators": "1.3.31-beta",
+  "@nocobase/sdk": "1.3.31-beta",
+  "@nocobase/utils": "1.3.31-beta",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.4.5",
@@ -5715,7 +5727,7 @@ const mergeFilter = (e, t = "$and") => {
   $and: Object.keys(e).map((i) => {
     let a = _.get(e, i);
     const l = o(`${n}.${i}`);
-    return l != null && l.target && (a = getValuesByPath(a, l.targetKey || "id"), i = `${i}.${l.targetKey || "id"}`), !a && a !== 0 && a !== !1 ? null : {
+    return l != null && l.target && (a = getValuesByPath(a, l.targetKey || "id"), i = `${i}.${l.targetKey || "id"}`, (l == null ? void 0 : l.interface) === "chinaRegion" && (a = _.last(a))), !a && a !== 0 && a !== !1 ? null : {
       [i]: {
         [t[i] || "$eq"]: a
       }
@@ -9674,7 +9686,7 @@ const DataSourceApplicationProvider = (n) => {
   );
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx("div", { onMouseOver: () => o(!0), children: e.children || n }),
-    /* @__PURE__ */ jsx(Modal, { open: t, footer: null, onCancel: () => o(!1), width: "60%", children: /* @__PURE__ */ jsx(ErrorFallback, g({}, e)) })
+    /* @__PURE__ */ jsx(Modal, { zIndex: 1e4, open: t, footer: null, onCancel: () => o(!1), width: "60%", children: /* @__PURE__ */ jsx(ErrorFallback, g({}, e)) })
   ] });
 }, { Paragraph, Text: Text$1, Link } = Typography, useDownloadLogs = (e, t = {}) => {
   const o = useLocationNoUpdate(), [n, r] = React.useState(!1), i = useAPIClient();
@@ -10996,6 +11008,7 @@ const useFormItemInitializerFields = (e) => {
       onClick() {
       },
       componentProps: F(g({}, a), {
+        hideSearch: !1,
         icon: null,
         title: p || h("Other records"),
         name: "otherRecords",
@@ -14858,7 +14871,7 @@ const useUpdateSchemaTemplateActionProps = () => {
     /* @__PURE__ */ jsx(PageHeader, { style: { backgroundColor: "white" }, ghost: !1, title: e("Block templates") }),
     /* @__PURE__ */ jsx("div", { style: { margin: "var(--nb-spacing)" }, children: /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }) })
   ] });
-}, BlockTemplatesPane = () => /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }), MENU_ITEM_HEIGHT = 40, STEP = 15, SearchCollections = ({ value: e, onChange: t }) => {
+}, BlockTemplatesPane = () => /* @__PURE__ */ jsx(SchemaComponent, { schema: uiSchemaTemplatesSchema }), MENU_ITEM_HEIGHT = 32, STEP = 15, SearchCollections = ({ value: e, onChange: t }) => {
   const { t: o } = useTranslation(), [n, r] = useState(e), i = React.useRef(null);
   return useEffect(() => {
     r(e);
@@ -18260,13 +18273,13 @@ const PopupVisibleProvider = ({ children: e, visible: t, setVisible: o }) => {
     z(void 0, null, function* () {
       const m = n.map((C) => {
         var S;
-        return ((S = getStoredPopupContext(C.popupuid)) == null ? void 0 : S.schema) || findSchemaByUid(C.popupuid, t.root) || r(C.popupuid);
+        return ((S = getStoredPopupContext(C.popupuid)) == null ? void 0 : S.schema) || findSchemaByUid(C.popupuid, t == null ? void 0 : t.root) || r(C.popupuid);
       }), x = (yield Promise.all(m)).map((C, S) => {
         if (_.isEmpty(C))
           return get404Schema();
         const b = n[S];
         if (b.puid) {
-          const y = findSchemaByUid(b.puid, t.root);
+          const y = findSchemaByUid(b.puid, t == null ? void 0 : t.root);
           y && c(_.omit(y, "parent"), C);
         }
         const v = _.cloneDeep(_.omit(C, "parent"));
@@ -35469,7 +35482,9 @@ const ButtonLinkList = (e) => {
     ) }) });
   },
   { displayName: "InternalSubTable" }
-), defaultModeToComponent = {
+);
+var AssociationFieldMode = /* @__PURE__ */ ((e) => (e.Picker = "Picker", e.Nester = "Nester", e.PopoverNester = "PopoverNester", e.Select = "Select", e.SubTable = "SubTable", e.FileManager = "FileManager", e.CascadeSelect = "CascadeSelect", e.Tag = "Tag", e))(AssociationFieldMode || {});
+const defaultModeToComponent = {
   Picker: InternalPicker,
   Nester: InternalNester,
   PopoverNester: InternalPopoverNester,
@@ -35479,19 +35494,20 @@ const ButtonLinkList = (e) => {
   CascadeSelect: InternalCascadeSelect
 }, AssociationFieldModeContext = createContext({
   modeToComponent: defaultModeToComponent,
-  getComponent: (e) => defaultModeToComponent[e]
+  getComponent: (e) => defaultModeToComponent[e],
+  getDefaultComponent: (e) => defaultModeToComponent[e]
 }), AssociationFieldModeProvider = (e) => {
   const t = useAssociationFieldModeContext(), o = useMemo(
     () => g(g({}, t.modeToComponent), e.modeToComponent),
     [t.modeToComponent, e.modeToComponent]
   ), n = useCallback(
-    (i) => {
-      const a = o[i];
-      return _.isFunction(a) ? a(defaultModeToComponent[i]) : a || defaultModeToComponent[i];
-    },
+    (a) => o[a] || defaultModeToComponent[a],
     [o]
-  ), r = useMemo(() => ({ modeToComponent: o, getComponent: n }), [n, o]);
-  return /* @__PURE__ */ jsx(AssociationFieldModeContext.Provider, { value: r, children: e.children });
+  ), r = useCallback((a) => defaultModeToComponent[a], []), i = useMemo(
+    () => ({ modeToComponent: o, getComponent: n, getDefaultComponent: r }),
+    [n, o, r]
+  );
+  return /* @__PURE__ */ jsx(AssociationFieldModeContext.Provider, { value: i, children: e.children });
 }, useAssociationFieldModeContext = () => React.useContext(AssociationFieldModeContext), AssociationFieldProvider = observer$1(
   (e) => {
     var m, h, x;
@@ -59051,6 +59067,7 @@ export {
   AssignedFieldValues,
   AssociatedFields,
   AssociationField,
+  AssociationFieldMode,
   AssociationFieldModeProvider,
   AssociationFilter,
   AssociationFilterDesignerDelete,
@@ -59699,6 +59716,7 @@ export {
   useAssociatedFormItemInitializerFields,
   useAssociatedTableColumnInitializerFields,
   useAssociationCreateActionProps,
+  useAssociationFieldModeContext,
   useAssociationFilterBlockProps,
   useAssociationFilterProps,
   useAssociationName,

package/es/schema-component/antd/association-field/AssociationFieldModeProvider.d.ts

@@ -18,11 +18,12 @@ export declare enum AssociationFieldMode {
     Tag = "Tag"
 }
 interface AssociationFieldModeProviderProps {
-    modeToComponent: Partial<Record<AssociationFieldMode, React.FC | ((originalCom: React.FC) => React.FC)>>;
+    modeToComponent: Partial<Record<AssociationFieldMode, React.FC>>;
 }
 export declare const AssociationFieldModeProvider: React.FC<AssociationFieldModeProviderProps>;
 export declare const useAssociationFieldModeContext: () => {
     modeToComponent: AssociationFieldModeProviderProps['modeToComponent'];
     getComponent: (mode: AssociationFieldMode) => React.FC;
+    getDefaultComponent: (mode: AssociationFieldMode) => React.FC;
 };
 export {};

package/es/schema-component/antd/association-field/index.d.ts

@@ -6,5 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export { AssociationFieldModeProvider } from './AssociationFieldModeProvider';
+export { AssociationFieldMode, AssociationFieldModeProvider, useAssociationFieldModeContext, } from './AssociationFieldModeProvider';
 export declare const AssociationField: any;