@nocobase/client 1.0.1-alpha.3 → 1.2.0-alpha

package/es/index.d.ts

@@ -54,6 +54,7 @@ export * from './testUtils';
 export * from './user';
 export * from './variables';
 export { withDynamicSchemaProps } from './hoc/withDynamicSchemaProps';
+export { SchemaSettingsActionLinkItem } from './modules/actions/link/customizeLinkActionSettings';
 export * from './modules/blocks/BlockSchemaToolbar';
 export * from './modules/blocks/data-blocks/form';
 export * from './modules/blocks/data-blocks/table';

package/es/index.mjs

@@ -1938,6 +1938,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get SchemaSettings() {
     return SchemaSettings;
   },
+  get SchemaSettingsActionLinkItem() {
+    return SchemaSettingsActionLinkItem;
+  },
   get SchemaSettingsActionModalItem() {
     return SchemaSettingsActionModalItem;
   },
@@ -3899,7 +3902,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.0.1-alpha.3", 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.0-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",
@@ -3920,9 +3923,9 @@ const name = "@nocobase/client", version$1 = "1.0.1-alpha.3", license = "AGPL-3.
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.0.1-alpha.3",
-  "@nocobase/sdk": "1.0.1-alpha.3",
-  "@nocobase/utils": "1.0.1-alpha.3",
+  "@nocobase/evaluators": "1.2.0-alpha",
+  "@nocobase/sdk": "1.2.0-alpha",
+  "@nocobase/utils": "1.2.0-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -17992,7 +17995,7 @@ const DynamicComponent$1 = (e) => {
       });
     },
     [r, i, n]
-  ), C = useMemo(() => ({ minWidth: 460, marginRight: 15 }), []), S = useMemo(() => p(d, {
+  ), C = useMemo(() => ({ minWidth: 460 }), []), S = useMemo(() => p(d, {
     value: t == null ? void 0 : t.value
   }), [p, t == null ? void 0 : t.value, d]), b = {
     // 常量
@@ -18030,7 +18033,7 @@ const DynamicComponent$1 = (e) => {
         value: i,
         style: { width: 150 },
         onChange: (y) => {
-          console.log(y), a(y), n({
+          a(y), n({
             mode: y
           });
         },
@@ -20615,7 +20618,7 @@ const createSubmitActionSettings = new SchemaSettings({
   e.data = e.data || {}, e.display = "visible", e.disabled = !1, e.data.hidden = !1, e.componentProps.disabled = !1;
 }, MenuGroup = (e) => e.children;
 function ButtonEditor$1(e) {
-  var a, l, c;
+  var a, l, c, u;
   const t = useField(), o = useFieldSchema(), { dn: n } = useDesignable(), { t: r } = useTranslation(), i = (e == null ? void 0 : e.isLink) || o["x-component"] === "Action.Link";
   return /* @__PURE__ */ jsx(
     SchemaSettingsModalItem,
@@ -20642,25 +20645,33 @@ function ButtonEditor$1(e) {
             "x-visible": !i
             // description: `原字段标题：${collectionField?.uiSchema?.title}`,
           },
+          iconColor: {
+            title: r("Color"),
+            required: !0,
+            default: ((l = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : l.iconColor) || "#1677FF",
+            "x-hidden": !e.hasIconColor,
+            "x-component": "ColorPicker",
+            "x-decorator": "FormItem"
+          },
           type: {
             "x-decorator": "FormItem",
             "x-component": "Radio.Group",
             title: r("Button background color"),
-            default: (l = o == null ? void 0 : o["x-component-props"]) != null && l.danger ? "danger" : ((c = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : c.type) === "primary" ? "primary" : "default",
+            default: (c = o == null ? void 0 : o["x-component-props"]) != null && c.danger ? "danger" : ((u = o == null ? void 0 : o["x-component-props"]) == null ? void 0 : u.type) === "primary" ? "primary" : "default",
             enum: [
               { value: "default", label: '{{t("Default")}}' },
               { value: "primary", label: '{{t("Highlight")}}' },
               { value: "danger", label: '{{t("Danger red")}}' }
             ],
-            "x-visible": !i
+            "x-visible": !e.hasIconColor && !i
           }
         }
       },
-      onSubmit: ({ title: u, icon: d, type: p }) => {
-        o.title = u, t.title = u, t.componentProps.icon = d, t.componentProps.danger = p === "danger", t.componentProps.type = p || t.componentProps.type, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].icon = d, o["x-component-props"].danger = p === "danger", o["x-component-props"].type = p || t.componentProps.type, n.emit("patch", {
+      onSubmit: ({ title: d, icon: p, type: m, iconColor: h }) => {
+        o.title = d, t.title = d, t.componentProps.iconColor = h, t.componentProps.icon = p, t.componentProps.danger = m === "danger", t.componentProps.type = m || t.componentProps.type, o["x-component-props"] = o["x-component-props"] || {}, o["x-component-props"].iconColor = h, o["x-component-props"].icon = p, o["x-component-props"].danger = m === "danger", o["x-component-props"].type = m || t.componentProps.type, n.emit("patch", {
           schema: {
             "x-uid": o["x-uid"],
-            title: u,
+            title: d,
             "x-component-props": g({}, o["x-component-props"])
           }
         }), n.refresh();
@@ -22053,13 +22064,13 @@ const useGetFilterOptions = () => {
     }), d;
   };
   return a(e, 1);
-}, isEmpty = (e) => Array.isArray(e) && e.length === 0 || e && Object.keys(e).length === 0 && Object.getPrototypeOf(e) === Object.prototype, removeNullCondition = (e) => {
-  const t = flat(e || {}), o = {};
-  for (const n in t) {
-    const r = t[n];
-    r != null && !isEmpty(r) && (o[n] = r);
+}, isEmpty = (e) => Array.isArray(e) && e.length === 0 || e && Object.keys(e).length === 0 && Object.getPrototypeOf(e) === Object.prototype, removeNullCondition = (e, t = flat) => {
+  const o = t(e || {}), n = {};
+  for (const r in o) {
+    const i = o[r];
+    i != null && !isEmpty(i) && (n[r] = i);
   }
-  return flat.unflatten(o);
+  return t.unflatten(n);
 }, useFilterActionProps$1 = () => {
   const { name: e } = useCollection_deprecated(), t = useFilterOptions(e), { service: o, props: n } = useBlockRequestContext();
   return useFilterFieldProps({ options: t, service: o, params: n == null ? void 0 : n.params });
@@ -23483,45 +23494,47 @@ const useCreateActionProps = () => {
     e = e.parent;
   }
 }, useDoFilter = () => {
-  const e = useForm(), { getDataBlocks: t } = useFilterBlock(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), { getOperators: n } = useOperators(), r = useFieldSchema(), { name: i } = useCollection(), { targets: a = [], uid: l } = useMemo(() => findFilterTargets(r), [r]), c = useCallback(
-    (...d) => V(void 0, [...d], function* ({ doNothingWhenFilterIsEmpty: u = !1 } = {}) {
+  const e = useForm(), { getDataBlocks: t } = useFilterBlock(), { getCollectionJoinField: o } = useCollectionManager_deprecated(), { getOperators: n } = useOperators(), r = useFieldSchema(), { name: i } = useCollection(), { targets: a = [], uid: l } = useMemo(() => findFilterTargets(r), [r]), c = useCallback(() => removeNullCondition(transformToFilter(e.values, n(), o, i)), [e.values, o, n, i]), u = useCallback(
+    (...p) => V(void 0, [...p], function* ({ doNothingWhenFilterIsEmpty: d = !1 } = {}) {
       try {
         yield Promise.all(
-          t().map((p) => V(void 0, null, function* () {
-            var C, S, b;
-            if (!a.find((y) => y.uid === p.uid))
+          t().map((m) => V(void 0, null, function* () {
+            var S, b, y;
+            if (!a.find((v) => v.uid === m.uid))
               return;
-            const h = ((C = p.service.params) == null ? void 0 : C[0]) || {}, x = ((b = (S = p.service.params) == null ? void 0 : S[1]) == null ? void 0 : b.filters) || {};
-            x[l] = removeNullCondition(
-              transformToFilter(e.values, n(), o, i)
-            );
-            const f = mergeFilter([
-              ...Object.values(x).map((y) => removeNullCondition(y)),
-              p.defaultFilter
+            const x = ((S = m.service.params) == null ? void 0 : S[0]) || {}, f = ((y = (b = m.service.params) == null ? void 0 : b[1]) == null ? void 0 : y.filters) || {};
+            f[l] = c();
+            const C = mergeFilter([
+              ...Object.values(f).map((v) => removeNullCondition(v)),
+              m.defaultFilter
             ]);
-            if (!(u && _.isEmpty(f)))
-              return p.dataLoadingMode === "manual" && _.isEmpty(f) ? p.clearData() : p.doFilter(
-                F(g({}, h), {
+            if (!(d && _.isEmpty(f[l])))
+              return m.dataLoadingMode === "manual" && _.isEmpty(f[l]) ? m.clearData() : m.doFilter(
+                F(g({}, x), {
                   page: 1,
-                  filter: f
+                  filter: C
                 }),
-                { filters: x }
+                { filters: f }
               );
           }))
         );
-      } catch (p) {
-        console.error(p);
+      } catch (m) {
+        console.error(m);
       }
     }),
-    [e.values, o, t, n, i, a, l]
+    [t, c, a, l]
   );
   return useEffect(() => {
-    c({ doNothingWhenFilterIsEmpty: !0 });
+    u({ doNothingWhenFilterIsEmpty: !0 });
   }, [t().length]), {
     /**
      * 用于执行筛选表单的筛选操作
      */
-    doFilter: c
+    doFilter: u,
+    /**
+     * 根据当前表单的值获取 filter
+     */
+    getFilterFromCurrentForm: c
   };
 }, useFilterBlockActionProps = () => {
   const { doFilter: e } = useDoFilter(), t = useField();
@@ -23532,36 +23545,21 @@ const useCreateActionProps = () => {
       });
     }
   };
+}, useDoReset = () => {
+  const e = useForm(), t = useFieldSchema(), { getDataBlocks: o } = useFilterBlock(), { targets: n, uid: r } = findFilterTargets(t), { doFilter: i, getFilterFromCurrentForm: a } = useDoFilter();
+  return {
+    doReset: () => V(void 0, null, function* () {
+      if (yield e.reset(), _.isEmpty(a()))
+        return doReset({ getDataBlocks: o, targets: n, uid: r });
+      yield i();
+    })
+  };
 }, useResetBlockActionProps = () => {
-  const e = useForm(), t = useField(), o = useFieldSchema(), { getDataBlocks: n } = useFilterBlock();
-  return t.data = t.data || {}, {
+  const e = useField(), { doReset: t } = useDoReset();
+  return e.data = e.data || {}, {
     onClick() {
       return V(this, null, function* () {
-        const { targets: i, uid: a } = findFilterTargets(o);
-        e.reset(), t.data.loading = !0;
-        try {
-          yield Promise.all(
-            n().map((l) => V(this, null, function* () {
-              var m, h, x;
-              if (!i.find((f) => f.uid === l.uid))
-                return;
-              if (l.dataLoadingMode === "manual")
-                return l.clearData();
-              const u = ((m = l.service.params) == null ? void 0 : m[0]) || {}, d = ((x = (h = l.service.params) == null ? void 0 : h[1]) == null ? void 0 : x.filters) || {};
-              delete d[a];
-              const p = mergeFilter([...Object.values(d), l.defaultFilter]);
-              return l.doFilter(
-                F(g({}, u), {
-                  page: 1,
-                  filter: p
-                }),
-                { filters: d }
-              );
-            }))
-          ), t.data.loading = !1;
-        } catch (l) {
-          t.data.loading = !1;
-        }
+        e.data.loading = !0, yield t(), e.data.loading = !1;
       });
     }
   };
@@ -24008,6 +24006,37 @@ const useCreateActionProps = () => {
     labelKey: f
   };
 };
+function doReset(n) {
+  return V(this, arguments, function* ({
+    getDataBlocks: e,
+    targets: t,
+    uid: o
+  }) {
+    try {
+      yield Promise.all(
+        e().map((r) => V(this, null, function* () {
+          var u, d, p;
+          if (!t.find((m) => m.uid === r.uid))
+            return;
+          if (r.dataLoadingMode === "manual")
+            return r.clearData();
+          const a = ((u = r.service.params) == null ? void 0 : u[0]) || {}, l = ((p = (d = r.service.params) == null ? void 0 : d[1]) == null ? void 0 : p.filters) || {};
+          delete l[o];
+          const c = mergeFilter([...Object.values(l), r.defaultFilter]);
+          return r.doFilter(
+            F(g({}, a), {
+              page: 1,
+              filter: c
+            }),
+            { filters: l }
+          );
+        }))
+      );
+    } catch (r) {
+      console.error(r);
+    }
+  });
+}
 function getAssociationPath(e) {
   const t = e.lastIndexOf(".");
   return t !== -1 ? e.substring(0, t) : e;
@@ -33550,7 +33579,7 @@ const useTableColumns$1 = (e) => {
       const { setVisible: y } = useActionContext(), { selectedRows: v, setSelectedRows: I } = useContext(RecordPickerContext);
       return {
         onClick() {
-          v.map((A) => o.value.push(markRecordAsNew(g({}, A)))), o.onInput(o.value), I([]), y(!1);
+          v.map((A) => o.value.push(A)), o.onInput(o.value), I([]), y(!1);
         }
       };
     }, b = () => {
@@ -56738,6 +56767,7 @@ export {
   SchemaSettingItemContext,
   SchemaSettingOpenModeSchemaItems,
   SchemaSettings,
+  SchemaSettingsActionLinkItem,
   SchemaSettingsActionModalItem,
   SchemaSettingsBlockHeightItem,
   SchemaSettingsBlockTitleItem,

package/es/schema-component/antd/filter/useFilterActionProps.d.ts

@@ -10,7 +10,7 @@ export declare const useGetFilterOptions: () => (collectionName: any, dataSource
 export declare const useFilterOptions: (collectionName: string) => any[];
 export declare const useGetFilterFieldOptions: () => (fields: any) => any[];
 export declare const useFilterFieldOptions: (fields: any) => any[];
-export declare const removeNullCondition: (filter: any) => any;
+export declare const removeNullCondition: (filter: any, customFlat?: any) => any;
 export declare const useFilterActionProps: () => {
     options: any;
     onSubmit(values: any): any;