@nocobase/client 1.2.10-alpha → 1.2.12-alpha

package/es/data-source/collection/Collection.d.ts

@@ -113,6 +113,7 @@ export declare class Collection {
     get isThrough(): boolean;
     get autoCreate(): boolean;
     get resource(): string;
+    setOption(key: string, value: any): this;
     getOptions(): CollectionOptions;
     getOption<K extends keyof CollectionOptions>(key: K): CollectionOptions[K];
     /**

package/es/index.mjs

@@ -3801,6 +3801,9 @@ class Collection {
   get resource() {
     return this.options.resource;
   }
+  setOption(t, o) {
+    return this.options[t] = o, this;
+  }
   getOptions() {
     return this.options;
   }
@@ -3926,7 +3929,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.10-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.12-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",
@@ -3947,9 +3950,9 @@ const name = "@nocobase/client", version$1 = "1.2.10-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.10-alpha",
-  "@nocobase/sdk": "1.2.10-alpha",
-  "@nocobase/utils": "1.2.10-alpha",
+  "@nocobase/evaluators": "1.2.12-alpha",
+  "@nocobase/sdk": "1.2.12-alpha",
+  "@nocobase/utils": "1.2.12-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -10626,22 +10629,28 @@ function useServiceOptions$1(e) {
       const T = yield u(mergeFilter([F || ((D = o == null ? void 0 : o.params) == null ? void 0 : D.filter)]));
       m(T);
     }), k = _.debounce(I, DEBOUNCE_WAIT);
-    return I(), reaction(() => flatten(F, {
-      breakOn({ key: D }) {
-        return D.startsWith("$") && D !== "$and" && D !== "$or";
-      },
-      transformValue(D) {
-        if (!isVariable(D))
-          return D;
-        const $ = getVariableName(D), q = d($);
-        return getValuesByPath(
-          {
-            [$]: (q == null ? void 0 : q.ctx) || {}
-          },
-          getPath(D)
-        );
+    return I(), reaction(
+      () => flatten(F, {
+        breakOn({ key: D }) {
+          return D.startsWith("$") && D !== "$and" && D !== "$or";
+        },
+        transformValue(D) {
+          if (!isVariable(D))
+            return D;
+          const $ = getVariableName(D), q = d($);
+          return getValuesByPath(
+            {
+              [$]: (q == null ? void 0 : q.ctx) || {}
+            },
+            getPath(D)
+          );
+        }
+      }),
+      k,
+      {
+        equals: _.isEqual
       }
-    }), k);
+    );
   }, [
     (b = (S = (C = i.componentProps) == null ? void 0 : C.service) == null ? void 0 : S.params) == null ? void 0 : b.filter,
     r,
@@ -10971,23 +10980,29 @@ function useParsedFilter({ filterOption: e }) {
     });
     l();
     const c = _.debounce(l, DEBOUNCE_WAIT);
-    reaction(() => flatten(e, {
-      breakOn({ key: d }) {
-        return d.startsWith("$") && d !== "$and" && d !== "$or";
-      },
-      transformValue(d) {
-        if (!isVariable(d))
-          return d;
-        const p = getVariableName(d), m = o(p);
-        return getValuesByPath(
-          {
-            [p]: (m == null ? void 0 : m.ctx) || {}
-          },
-          getPath(d)
-        );
+    reaction(
+      () => flatten(e, {
+        breakOn({ key: d }) {
+          return d.startsWith("$") && d !== "$and" && d !== "$or";
+        },
+        transformValue(d) {
+          if (!isVariable(d))
+            return d;
+          const p = getVariableName(d), m = o(p);
+          return getValuesByPath(
+            {
+              [p]: (m == null ? void 0 : m.ctx) || {}
+            },
+            getPath(d)
+          );
+        }
+      }),
+      c,
+      {
+        equals: _.isEqual
       }
-    }), c);
-  }, [JSON.stringify(e), i]), {
+    );
+  }, [JSON.stringify(e)]), {
     /** 数据范围的筛选参数 */
     filter: n,
     /** 表示是否正在解析筛选参数中的变量 */
@@ -11355,59 +11370,46 @@ const ColDivider = (e) => {
       InitializerComponent: l,
       showDivider: o
     }), [i, a, l, o]);
-    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: x, children: /* @__PURE__ */ jsx(
-      "div",
-      {
-        className: cls(
-          "nb-grid-container"
-          // css`
-          //   & {
-          //     margin-bottom: ${designable ? 0 : -token.marginLG}px;
-          //   }
-          // `,
-        ),
-        children: /* @__PURE__ */ jsx("div", { className: cls(`nb-grid ${p.container}`), style: { position: "relative" }, ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
-          /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
-            o ? /* @__PURE__ */ jsx(
-              RowDivider,
-              {
-                rows: u,
-                first: !0,
-                id: `${c}_0`,
-                data: {
-                  breakRemoveOn: breakRemoveOnGrid,
-                  wrapSchema: wrapRowSchema,
-                  insertAdjacent: "afterBegin",
-                  schema: i
-                }
+    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: x, children: /* @__PURE__ */ jsx("div", { className: cls("nb-grid-container"), children: /* @__PURE__ */ jsx("div", { className: cls(`nb-grid ${p.container}`), style: { position: "relative" }, ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
+      /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
+        o ? /* @__PURE__ */ jsx(
+          RowDivider,
+          {
+            rows: u,
+            first: !0,
+            id: `${c}_0`,
+            data: {
+              breakRemoveOn: breakRemoveOnGrid,
+              wrapSchema: wrapRowSchema,
+              insertAdjacent: "afterBegin",
+              schema: i
+            }
+          }
+        ) : null,
+        u.map((f, C) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+          h ? /* @__PURE__ */ jsx(SchemaComponent, { name: f.name, schema: f, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: f.name, schema: f }),
+          o ? /* @__PURE__ */ jsx(
+            RowDivider,
+            {
+              rows: u,
+              index: C,
+              id: `${c}_${C + 1}`,
+              data: {
+                breakRemoveOn: breakRemoveOnGrid,
+                wrapSchema: wrapRowSchema,
+                insertAdjacent: "afterEnd",
+                schema: f
               }
-            ) : null,
-            u.map((f, C) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-              h ? /* @__PURE__ */ jsx(SchemaComponent, { name: f.name, schema: f, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: f.name, schema: f }),
-              o ? /* @__PURE__ */ jsx(
-                RowDivider,
-                {
-                  rows: u,
-                  index: C,
-                  id: `${c}_${C + 1}`,
-                  data: {
-                    breakRemoveOn: breakRemoveOnGrid,
-                    wrapSchema: wrapRowSchema,
-                    insertAdjacent: "afterEnd",
-                    schema: f
-                  }
-                }
-              ) : null
-            ] }, C))
-          ] }),
-          a({
-            style: {
-              marginBottom: m.marginLG
             }
-          })
-        ] }) })
-      }
-    ) }) });
+          ) : null
+        ] }, C))
+      ] }),
+      a({
+        style: {
+          marginBottom: m.marginLG
+        }
+      })
+    ] }) }) }) }) });
   },
   { displayName: "Grid" }
 );
@@ -13103,7 +13105,10 @@ const useParseDefaultValue = () => {
           const F = { [S]: (b == null ? void 0 : b.ctx) || {} }, I = getPath(t.default), k = getValuesByPath(F, I);
           return k === void 0 ? Math.random() : k;
         },
-        () => C({ forceUpdate: !0 })
+        () => C({ forceUpdate: !0 }),
+        {
+          equals: _.isEqual
+        }
       )) : console.error(`useParseDefaultValue: can not find variable ${S}`);
     } else
       e.value == null && (c || u) && e.setValue(t.default);
@@ -28862,22 +28867,22 @@ const useFieldComponentOptions = () => {
   if (!(!(i != null && i.heightMode) || l === HeightMode.DEFAULT))
     return l === HeightMode.FULL_HEIGHT ? window.innerHeight - a : c;
 }, useTableSize = () => {
-  const [e, t] = useState(), [o, n] = useState(), r = useRef(null), i = useTableHeight(), a = useCallback(
+  const [e, t] = useState(), o = useRef(null), n = useTableHeight(), r = useCallback(
     debounce(() => {
-      var d;
-      if (!r.current)
+      var c;
+      if (!o.current)
         return;
-      const c = r.current.getBoundingClientRect();
-      (d = r.current.querySelector(".ant-table")) != null && d.getBoundingClientRect() && (n(c.width), t(i));
+      const a = o.current.getBoundingClientRect();
+      (c = o.current.querySelector(".ant-table")) != null && c.getBoundingClientRect() && t(a.width);
     }, 100),
-    [i]
-  ), l = useCallback(
-    (c) => {
-      r.current = c && c.children ? c.children[0] : null, a();
+    [n]
+  ), i = useCallback(
+    (a) => {
+      o.current = a && a.children ? a.children[0] : null, r();
     },
-    [a]
+    [r]
   );
-  return useEventListener("resize", a), { height: e, width: o, tableSizeRefCallback: l };
+  return useEventListener("resize", r), { height: n, width: e, tableSizeRefCallback: i };
 }, hasActionContainerInParentChain = (e) => e ? e["x-component"] === "Action.Container" ? !0 : hasActionContainerInParentChain(e.parent) : null, useFieldModeOptions = (e) => {
   var x;
   const { t } = useTranslation(), { getCollectionJoinField: o, getCollection: n } = useCollectionManager_deprecated(), r = useFieldSchema(), i = (e == null ? void 0 : e.fieldSchema) || r, a = useField(), l = useForm(), c = (i == null ? void 0 : i["x-read-pretty"]) || a.readPretty || l.readPretty, u = e == null ? void 0 : e.fieldSchema, { getField: d } = useCollection_deprecated(), p = (e == null ? void 0 : e.collectionField) || d(i.name) || o(i["x-collection-field"]), { label: m } = ((x = i["x-component-props"]) == null ? void 0 : x.fieldNames) || {};
@@ -29786,7 +29791,7 @@ const useFormBlockHeight = () => {
                     return [A, w, M].map((E) => JSON.stringify(E)).join(",");
                   },
                   getSubscriber(x, S, m, r, i),
-                  { fireImmediately: !0 }
+                  { fireImmediately: !0, equals: _.isEqual }
                 )
               );
             });
@@ -32430,7 +32435,7 @@ const InternalNesterCss = css`
     const e = useField(), t = useFieldSchema(), o = useInsertSchema("Nester"), { options: n } = useAssociationFieldContext(), r = (l = (a = t["x-decorator-props"]) == null ? void 0 : a.showTitle) != null ? l : !0, { actionName: i } = useACLActionParamsContext();
     return useEffect(() => {
       o(schema$1.Nester);
-    }, []), /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: n.target, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { actionPath: `${n.target}:${i}`, children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
+    }, []), /* @__PURE__ */ jsx(CollectionProvider_deprecated, { name: n.target, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { actionPath: `${n.target}:${i || "view"}`, children: /* @__PURE__ */ jsx(FormLayout, { layout: "vertical", children: /* @__PURE__ */ jsx(
       "div",
       {
         className: cx(
@@ -35678,40 +35683,71 @@ const InternalGridCardBlockProvider = (e) => {
 GridCard.Item = GridCardItem;
 GridCard.Designer = GridCardDesigner;
 GridCard.Decorator = GridCardBlockProvider;
+const { Search } = Input$3, useStyle = (e) => createStyles(({ css: t }) => ({
+  popoverContent: t`
+        width: 26em;
+        ${!e && "max-"}height: 20em;
+        overflow-y: auto;
+      `
+}))();
 function IconField(e) {
-  const t = useFormLayout(), { value: o, onChange: n, disabled: r } = e, [i, a] = useState(!1), { t: l } = useTranslation();
+  const { fontSizeXL: t } = theme.useToken().token, o = [...icons.keys()], n = useFormLayout(), { value: r, onChange: i, disabled: a, iconSize: l = t, searchable: c = !0 } = e, [u, d] = useState(!1), [p, m] = useState(o), { t: h } = useTranslation(), { styles: x } = useStyle(c), f = debounce((C) => {
+    var b;
+    const S = (b = C == null ? void 0 : C.trim()) != null ? b : "";
+    m(
+      S.length ? o.filter((y) => y.split(" ").some((F) => F.includes(S))) : o
+    );
+  }, 250);
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       StablePopover,
       {
         placement: "bottom",
-        open: i,
-        onOpenChange: (c) => {
-          r || a(c);
+        open: u,
+        onOpenChange: (C) => {
+          a || d(C);
         },
-        content: /* @__PURE__ */ jsx("div", { style: { width: "26em", maxHeight: "20em", overflowY: "auto" }, children: [...icons.keys()].map((c) => /* @__PURE__ */ jsx(
+        content: /* @__PURE__ */ jsx("div", { className: x.popoverContent, children: p.length === 0 ? /* @__PURE__ */ jsx(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE }) : p.map((C) => /* @__PURE__ */ jsx(
           "span",
           {
-            style: { fontSize: 18, marginRight: 10, cursor: "pointer" },
+            title: C.replace(/outlined|filled|twotone$/i, ""),
+            style: { fontSize: l, marginRight: 10, cursor: "pointer" },
             onClick: () => {
-              n(c), a(!1);
+              i(C), d(!1);
             },
-            children: /* @__PURE__ */ jsx(Icon, { type: c })
+            children: /* @__PURE__ */ jsx(Icon, { type: C })
           },
-          c
+          C
         )) }),
-        title: l("Icon"),
+        title: /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsx("div", { children: h("Icon") }),
+          c && /* @__PURE__ */ jsx(
+            Search,
+            {
+              style: { marginTop: 8 },
+              role: "search",
+              name: "icon-search",
+              placeholder: h("Search"),
+              allowClear: !0,
+              onSearch: f,
+              onChange: (C) => {
+                var S;
+                return f((S = C.target) == null ? void 0 : S.value);
+              }
+            }
+          )
+        ] }),
         trigger: "click",
-        children: /* @__PURE__ */ jsx(Button, { size: t.size, disabled: r, children: hasIcon(o) ? /* @__PURE__ */ jsx(Icon, { type: o }) : l("Select icon") })
+        children: /* @__PURE__ */ jsx(Button, { size: n.size, disabled: a, children: hasIcon(r) ? /* @__PURE__ */ jsx(Icon, { type: r }) : h("Select icon") })
       }
     ),
-    o && !r && /* @__PURE__ */ jsx(
+    r && !a && /* @__PURE__ */ jsx(
       Button,
       {
-        size: t.size,
+        size: n.size,
         icon: /* @__PURE__ */ jsx(CloseOutlined, {}),
-        onClick: (c) => {
-          n(null);
+        onClick: (C) => {
+          i(null);
         }
       }
     )
@@ -36119,19 +36155,18 @@ const InternalListBlockProvider = (e) => {
               d,
               p,
               css`
-            .ant-spin-nested-loading {
+            .nb-list-container {
               height: ${m ? m + "px" : "100%"};
-              overflow-y: ${m ? "auto" : "null"};
-              .ant-spin-container {
-                width: 100%;
-                overflow-x: clip;
-                padding-right: ${h.paddingSM + "px"};
-              }
+              overflow-y: ${m ? "auto" : null};
+              margin-left: -${h.marginLG}px;
+              margin-right: -${h.marginLG}px;
+              padding-left: ${h.marginLG}px;
+              padding-right: ${h.marginLG}px;
             }
           `
             ),
             children: [
-              /* @__PURE__ */ jsx(
+              /* @__PURE__ */ jsx("div", { className: "nb-list-container", children: /* @__PURE__ */ jsx(
                 List$1,
                 v(g({}, e), {
                   pagination: !a || a.count <= a.pageSize ? !1 : {
@@ -36152,7 +36187,7 @@ const InternalListBlockProvider = (e) => {
                     y
                   )) : null
                 })
-              ),
+              ) }),
               /* @__PURE__ */ jsx(i, {})
             ]
           }
@@ -48409,9 +48444,9 @@ class ViewCollectionTemplate extends CollectionTemplate {
         }
       },
       filterTargetKey: {
-        title: '{{ t("Filter target key")}}',
+        title: '{{ t("Record unique key")}}',
         type: "single",
-        description: '{{t( "Filter data based on the specific field, with the requirement that the field value must be unique.")}}',
+        description: '{{t( "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.")}}',
         "x-decorator": "FormItem",
         "x-component": "Select",
         "x-reactions": ["{{useAsyncDataSource(loadFilterTargetKeys)}}"]
@@ -48486,9 +48521,9 @@ class SqlCollectionTemplate extends CollectionTemplate {
       }
     }, getConfigurableProperties("category")), {
       filterTargetKey: {
-        title: '{{ t("Filter target key")}}',
+        title: '{{ t("Record unique key")}}',
         type: "single",
-        description: '{{t( "Filter data based on the specific field, with the requirement that the field value must be unique.")}}',
+        description: '{{t( "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.")}}',
         "x-decorator": "FormItem",
         "x-component": "Select",
         "x-reactions": ["{{useAsyncDataSource(loadFilterTargetKeys)}}"]

package/es/schema-component/antd/icon-picker/IconPicker.d.ts

@@ -12,6 +12,8 @@ export interface IconPickerProps {
     onChange?: (value: string) => void;
     disabled?: boolean;
     suffix?: React.ReactNode;
+    iconSize?: number;
+    searchable?: boolean;
 }
 export declare const IconPicker: React.ForwardRefExoticComponent<Partial<IconPickerProps> & React.RefAttributes<unknown>>;
 export default IconPicker;