@nocobase/client 1.6.12 → 1.6.14

package/es/common/SelectWithTitle.d.ts

@@ -14,4 +14,4 @@ export interface SelectWithTitleProps {
     fieldNames?: any;
     onChange?: (...args: any[]) => void;
 }
-export declare function SelectWithTitle({ title, defaultValue, onChange, options, fieldNames }: SelectWithTitleProps): React.JSX.Element;
+export declare function SelectWithTitle({ title, defaultValue, onChange, options, fieldNames, ...others }: SelectWithTitleProps): React.JSX.Element;

package/es/index.mjs

@@ -7470,26 +7470,39 @@ function replaceVariables(n, r) {
     };
   });
 }
-function SelectWithTitle({ title: e, defaultValue: t, onChange: o, options: n, fieldNames: r }) {
-  const [i, a] = useState(!1), l = useRef(null);
+function SelectWithTitle(a) {
+  var l = a, {
+    title: e,
+    defaultValue: t,
+    onChange: o,
+    options: n,
+    fieldNames: r
+  } = l, i = Y(l, [
+    "title",
+    "defaultValue",
+    "onChange",
+    "options",
+    "fieldNames"
+  ]);
+  const [c, u] = useState(!1), d = useRef(null);
   return /* @__PURE__ */ jsxs(
     "div",
     {
       style: { alignItems: "center", display: "flex", justifyContent: "space-between" },
-      onClick: (c) => {
-        c.stopPropagation(), a((u) => !u);
+      onClick: (p) => {
+        p.stopPropagation(), u((m) => !m);
       },
       onMouseLeave: () => {
-        l.current = setTimeout(() => {
-          a(!1);
+        d.current = setTimeout(() => {
+          u(!1);
         }, 200);
       },
       children: [
         e,
         /* @__PURE__ */ jsx(
           Select$1,
-          {
-            open: i,
+          P(x({}, i), {
+            open: c,
             "data-testid": `select-${e}`,
             popupMatchSelectWidth: !1,
             bordered: !1,
@@ -7500,9 +7513,9 @@ function SelectWithTitle({ title: e, defaultValue: t, onChange: o, options: n, f
             options: n,
             style: { textAlign: "right", minWidth: 100 },
             onMouseEnter: () => {
-              clearTimeout(l.current);
+              clearTimeout(d.current);
             }
-          }
+          })
         )
       ]
     }
@@ -9168,7 +9181,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.12", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.14", 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",
@@ -9190,9 +9203,9 @@ const name = "@nocobase/client", version = "1.6.12", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.12",
-  "@nocobase/sdk": "1.6.12",
-  "@nocobase/utils": "1.6.12",
+  "@nocobase/evaluators": "1.6.14",
+  "@nocobase/sdk": "1.6.14",
+  "@nocobase/utils": "1.6.14",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -15272,7 +15285,7 @@ const wrapRowSchema = (e) => {
   schema: e
 })), Grid = observer$1(
   (e) => {
-    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((S) => a(S), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { componentCls: p, hashId: m } = useStyles$g(), h = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
+    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((b) => a(b), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { componentCls: p, hashId: m } = useStyles$g(), h = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
     useEffect(() => {
       n.current && (d == null || d(n.current));
     }, [d]);
@@ -15282,10 +15295,10 @@ const wrapRowSchema = (e) => {
       renderSchemaInitializer: a,
       InitializerComponent: l,
       showDivider: o
-    }), [i, a, l, o]), f = useRefreshFieldSchema(), C = useRefreshComponent(), b = useCallback(() => {
-      f == null || f(), C == null || C();
-    }, [C, f]);
-    return /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: b, children: /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: g, children: /* @__PURE__ */ jsx("div", { className: cls("nb-grid-container"), children: /* @__PURE__ */ jsx("div", { className: cls(`nb-grid ${p} ${m}`), ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
+    }), [i, a, l, o]), f = useRefreshFieldSchema(), C = useCallback(() => {
+      f == null || f();
+    }, [f]);
+    return /* @__PURE__ */ jsx(RefreshComponentProvider, { refresh: C, children: /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: g, children: /* @__PURE__ */ jsx("div", { className: cls("nb-grid-container"), children: /* @__PURE__ */ jsx("div", { className: cls(`nb-grid ${p} ${m}`), ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
       /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
         o ? /* @__PURE__ */ jsx(
           RowDivider,
@@ -15296,18 +15309,18 @@ const wrapRowSchema = (e) => {
             data: getRowDividerData(i, "afterBegin")
           }
         ) : null,
-        u.map((S, y) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-          h ? /* @__PURE__ */ jsx(SchemaComponent, { name: S.name, schema: S, distributed: !0 }) : /* @__PURE__ */ jsx(NocoBaseRecursionField, { name: S.name, schema: S, isUseFormilyField: !0 }),
+        u.map((b, S) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+          h ? /* @__PURE__ */ jsx(SchemaComponent, { name: b.name, schema: b, distributed: !0 }) : /* @__PURE__ */ jsx(NocoBaseRecursionField, { name: b.name, schema: b, isUseFormilyField: !0 }),
           o ? /* @__PURE__ */ jsx(
             RowDivider,
             {
               rows: u,
-              index: y,
-              id: `${c}_${y + 1}`,
-              data: getRowDividerData(S, "afterEnd")
+              index: S,
+              id: `${c}_${S + 1}`,
+              data: getRowDividerData(b, "afterEnd")
             }
           ) : null
-        ] }, y))
+        ] }, S))
       ] }),
       a()
     ] }) }) }) }) }) });
@@ -21460,8 +21473,8 @@ const findGridSchema = (e) => e.reduceProperties((t, o) => {
     }
   );
 }, SchemaSettingsSelectItem = (e) => {
-  const a = e, { title: t, options: o, value: n, onChange: r } = a, i = Y(a, ["title", "options", "value", "onChange"]);
-  return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsx(SelectWithTitle, { title: t, defaultValue: n, onChange: r, options: o }) }));
+  const l = e, { title: t, options: o, value: n, onChange: r, optionRender: i } = l, a = Y(l, ["title", "options", "value", "onChange", "optionRender"]);
+  return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, a), { children: /* @__PURE__ */ jsx(SelectWithTitle, { title: t, defaultValue: n, onChange: r, options: o, optionRender: i }) }));
 }, SchemaSettingsCascaderItem = (e) => {
   const a = e, { title: t, options: o, value: n, onChange: r } = a, i = Y(a, ["title", "options", "value", "onChange"]);
   return /* @__PURE__ */ jsx(SchemaSettingsItem, P(x({ title: t }, i), { children: /* @__PURE__ */ jsxs("div", { style: { alignItems: "center", display: "flex", justifyContent: "space-between" }, children: [
@@ -36597,7 +36610,7 @@ const useBuiltInVariables = () => {
   delete requested[e];
 }, uniq = (e) => !Array.isArray(e) || !_.isObject(e[0]) ? e : _.uniqBy(e, (t) => "id" in t ? t.id : JSON.stringify(t)), VariablesContext = createContext(null);
 VariablesContext.displayName = "VariablesContext";
-const variablesStore = {}, getFieldPath = (e, t) => {
+const variablesStore = {}, getFieldPath$1 = (e, t) => {
   let o, n;
   return {
     fieldPath: e.split(".").map((a) => t[a] ? (o = t[a].dataSource, n = t[a], t[a].collectionName) : a).join("."),
@@ -36612,9 +36625,9 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       var R, M;
       const y = C.split("."), v = y[0], F = mergeVariableToCollectionNameWithLocalVariables(variablesStore, b);
       let I = mergeCtxWithLocalVariables(o.current, b);
-      const { fieldPath: w, dataSource: k, variableOption: D } = getFieldPath(v, F);
+      const { fieldPath: w, dataSource: k, variableOption: D } = getFieldPath$1(v, F);
       let N = w;
-      const { fieldPath: j } = getFieldPath(C, F), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(j, k)) == null ? void 0 : R.target;
+      const { fieldPath: j } = getFieldPath$1(C, F), O = y.length === 1 ? D == null ? void 0 : D.collectionName : (R = r(j, k)) == null ? void 0 : R.target;
       if (!(v in I))
         throw new Error(`VariablesProvider: ${v} is not found`);
       for (let $ = 0; $ < y.length; $++) {
@@ -36624,7 +36637,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             dataSource: k,
             collectionName: O
           };
-        const T = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath(z, F), E = r(L, k), q = (M = i(N, k)) == null ? void 0 : M.getPrimaryKey();
+        const T = y[$], z = y.slice(0, $ + 1).join("."), { fieldPath: L } = getFieldPath$1(z, F), E = r(L, k), q = (M = i(N, k)) == null ? void 0 : M.getPrimaryKey();
         if (Array.isArray(I)) {
           const G = I.map((U) => {
             if (!(S != null && S.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T]) && (U == null ? void 0 : U[q]) != null && E != null && E.target) {
@@ -36719,7 +36732,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
       const S = mergeVariableToCollectionNameWithLocalVariables(
         variablesStore,
         b
-      ), y = getPath(C), { fieldPath: v, dataSource: F } = getFieldPath(y, S);
+      ), y = getPath(C), { fieldPath: v, dataSource: F } = getFieldPath$1(y, S);
       let I = r(v, F);
       return !I && !y.includes(".") && (I = {
         target: (w = S[y]) == null ? void 0 : w.collectionName
@@ -48504,7 +48517,12 @@ const AppendsTreeSelect = (e) => {
     const l = /\{\{\$[a-zA-Z_]\w*(?:\.[a-zA-Z_]\w*)*\.(\w+)\.id\}\}/, c = (p = (d = (u = i == null ? void 0 : i.value) == null ? void 0 : u.match) == null ? void 0 : d.call(u, l)) == null ? void 0 : p[1];
     c && n.push(c);
   }), n;
-}, InternalAssociationSelect$1 = observer$1(
+};
+function getFieldPath(e) {
+  const t = e.lastIndexOf(".");
+  return t === -1 ? e : e.slice(0, t);
+}
+const InternalAssociationSelect$1 = observer$1(
   (e) => {
     var w;
     const I = e, { objectValue: t = !0, addMode: o } = I, n = Y(I, ["objectValue", "addMode"]), r = useField(), i = useFieldSchema(), a = useServiceOptions$1((i == null ? void 0 : i["x-component-props"]) || e), { options: l } = useAssociationFieldContext(), c = isVariable$1(e.value) ? void 0 : e.value, u = Array.isArray(c) ? c.filter(Boolean) : c, [d, p] = useState(u), m = (w = i["x-component-props"]) == null ? void 0 : w.addMode, { t: h } = useTranslation(), { multiple: g } = e, f = useForm(), b = useAPIClient().resource(l.target), S = useCollectionRecordData(), y = useContext(SchemaComponentContext);
@@ -48515,8 +48533,9 @@ const AppendsTreeSelect = (e) => {
       const k = uid();
       return f.addEffects(k, () => {
         onFieldInputValueChange("*", (D) => {
-          var j, O, B, R, M;
-          (filterAnalyses((B = (O = (j = r.componentProps) == null ? void 0 : j.service) == null ? void 0 : O.params) == null ? void 0 : B.filter) || []).includes((R = D == null ? void 0 : D.props) == null ? void 0 : R.name) && r.value && isEqual(D == null ? void 0 : D.indexes, r == null ? void 0 : r.indexes) && ((M = D == null ? void 0 : D.props) == null ? void 0 : M.name) !== r.props.name && (r.setValue(null), p(null));
+          var B, R, M, $, T, z;
+          const N = filterAnalyses((M = (R = (B = r.componentProps) == null ? void 0 : B.service) == null ? void 0 : R.params) == null ? void 0 : M.filter) || [], j = getFieldPath(D.address.entire), O = getFieldPath(r.address.entire);
+          N.includes(($ = D == null ? void 0 : D.props) == null ? void 0 : $.name) && r.value && isEqual(D == null ? void 0 : D.indexes, r == null ? void 0 : r.indexes) && ((T = D == null ? void 0 : D.props) == null ? void 0 : T.name) !== r.props.name && (!((z = r == null ? void 0 : r.indexes) != null && z.length) || isEqual(j, O)) && (r.setValue(null), p(null));
         });
       }), () => {
         f.removeEffects(k);

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

@@ -72,6 +72,9 @@ export interface SchemaSettingsRemoveProps {
 export declare const SchemaSettingsRemove: FC<SchemaSettingsRemoveProps>;
 export interface SchemaSettingsSelectItemProps extends Omit<SchemaSettingsItemProps, 'onChange' | 'onClick'>, Omit<SelectWithTitleProps, 'title' | 'defaultValue'> {
     value?: SelectWithTitleProps['defaultValue'];
+    optionRender?: (option: any, info: {
+        index: number;
+    }) => React.ReactNode;
 }
 export declare const SchemaSettingsSelectItem: FC<SchemaSettingsSelectItemProps>;
 export type SchemaSettingsCascaderItemProps = CascaderProps<any> & Omit<MenuItemProps, 'title'> & {