@nocobase/client 1.2.19-alpha → 1.2.21-alpha

package/es/collection-manager/interfaces/properties/operators.d.ts

@@ -228,3 +228,28 @@ export declare const collection: ({
     selected?: undefined;
     schema?: undefined;
 })[];
+export declare const richText: ({
+    label: string;
+    value: string;
+    selected: boolean;
+    schema: {
+        type: string;
+        'x-component': string;
+    };
+    noValue?: undefined;
+} | {
+    label: string;
+    value: string;
+    schema: {
+        type: string;
+        'x-component': string;
+    };
+    selected?: undefined;
+    noValue?: undefined;
+} | {
+    label: string;
+    value: string;
+    noValue: boolean;
+    selected?: undefined;
+    schema?: undefined;
+})[];

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

@@ -82,10 +82,18 @@ export declare class RichTextFieldInterface extends CollectionFieldInterface {
             label: string;
             value: string;
             selected: boolean;
+            schema: {
+                type: string;
+                'x-component': string;
+            };
             noValue?: undefined;
         } | {
             label: string;
             value: string;
+            schema: {
+                type: string;
+                'x-component': string;
+            };
             selected?: undefined;
             noValue?: undefined;
         } | {
@@ -93,6 +101,7 @@ export declare class RichTextFieldInterface extends CollectionFieldInterface {
             value: string;
             noValue: boolean;
             selected?: undefined;
+            schema?: undefined;
         })[];
     };
 }

package/es/index.mjs

@@ -3941,7 +3941,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.19-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.21-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",
@@ -3962,9 +3962,9 @@ const name = "@nocobase/client", version$1 = "1.2.19-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.19-alpha",
-  "@nocobase/sdk": "1.2.19-alpha",
-  "@nocobase/utils": "1.2.19-alpha",
+  "@nocobase/evaluators": "1.2.21-alpha",
+  "@nocobase/sdk": "1.2.21-alpha",
+  "@nocobase/utils": "1.2.21-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -16146,7 +16146,7 @@ const useFormItemInitializerFields = (e) => {
     var h;
     return (m == null ? void 0 : m.interface) && ((h = n(m.interface)) == null ? void 0 : h.filterable);
   })) == null ? void 0 : p.map((m) => {
-    var S, b, y;
+    var S, b, y, v, I, k, A;
     const h = n(m.interface), f = r(m.target);
     let x = {
       type: "string",
@@ -16159,7 +16159,9 @@ const useFormItemInitializerFields = (e) => {
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
       "x-collection-field": `${t}.${m.name}`,
-      "x-component-props": {}
+      "x-component-props": {
+        component: (v = (y = (b = (S = h == null ? void 0 : h.filterable) == null ? void 0 : S.operators) == null ? void 0 : b[0]) == null ? void 0 : y.schema) == null ? void 0 : v["x-component"]
+      }
     };
     return isAssocField(m) && (x = {
       type: "string",
@@ -16172,16 +16174,16 @@ const useFormItemInitializerFields = (e) => {
       "x-decorator": "FormItem",
       "x-use-decorator-props": "useFormItemProps",
       "x-collection-field": `${t}.${m.name}`,
-      "x-component-props": (S = m.uiSchema) == null ? void 0 : S["x-component-props"]
+      "x-component-props": (I = m.uiSchema) == null ? void 0 : I["x-component-props"]
     }), {
-      name: ((b = m == null ? void 0 : m.uiSchema) == null ? void 0 : b.title) || m.name,
+      name: ((k = m == null ? void 0 : m.uiSchema) == null ? void 0 : k.title) || m.name,
       type: "item",
-      title: ((y = m == null ? void 0 : m.uiSchema) == null ? void 0 : y.title) || m.name,
+      title: ((A = m == null ? void 0 : m.uiSchema) == null ? void 0 : A.title) || m.name,
       Component: "CollectionFieldInitializer",
       remove: removeGridFormItem,
-      schemaInitialize: (v) => {
-        var I;
-        (I = h == null ? void 0 : h.schemaInitialize) == null || I.call(h, v, {
+      schemaInitialize: (w) => {
+        var M;
+        (M = h == null ? void 0 : h.schemaInitialize) == null || M.call(h, w, {
           field: m,
           block: l,
           readPretty: a,
@@ -21378,6 +21380,29 @@ const actionSettingsItems = [
           return isValid((t = e == null ? void 0 : e["x-action-settings"]) == null ? void 0 : t.triggerWorkflows);
         }
       },
+      {
+        type: "switch",
+        name: "clearDefaultValue",
+        useComponentProps() {
+          var n;
+          const { t: e } = useTranslation(), t = useFieldSchema(), { dn: o } = useDesignable();
+          return {
+            title: e("Clear default value"),
+            checked: (n = t == null ? void 0 : t["x-component-props"]) == null ? void 0 : n.clearDefaultValue,
+            onChange: (r) => {
+              o.deepMerge({
+                "x-uid": t["x-uid"],
+                "x-component-props": {
+                  clearDefaultValue: r
+                }
+              });
+            }
+          };
+        },
+        useVisible() {
+          return useFieldSchema()["x-use-component-props"] === "useResetBlockActionProps";
+        }
+      },
       {
         name: "remove",
         sort: 100,
@@ -23728,7 +23753,10 @@ const useCreateActionProps = () => {
   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()))
+      var l;
+      if (yield e.reset(void 0, {
+        forceClear: !!((l = t == null ? void 0 : t["x-component-props"]) != null && l.clearDefaultValue)
+      }), _.isEmpty(a()))
         return doReset({ getDataBlocks: o, targets: n, uid: r });
       yield i();
     })
@@ -44236,6 +44264,42 @@ const string = [
   },
   { label: '{{t("is empty")}}', value: "$empty", noValue: !0 },
   { label: '{{t("is not empty")}}', value: "$notEmpty", noValue: !0 }
+], richText = [
+  {
+    label: '{{t("contains")}}',
+    value: "$includes",
+    selected: !0,
+    schema: {
+      type: "string",
+      "x-component": "Input"
+    }
+  },
+  {
+    label: '{{t("does not contain")}}',
+    value: "$notIncludes",
+    schema: {
+      type: "string",
+      "x-component": "Input"
+    }
+  },
+  {
+    label: '{{t("is")}}',
+    value: "$eq",
+    schema: {
+      type: "string",
+      "x-component": "Input"
+    }
+  },
+  {
+    label: '{{t("is not")}}',
+    value: "$ne",
+    schema: {
+      type: "string",
+      "x-component": "Input"
+    }
+  },
+  { label: '{{t("is empty")}}', value: "$empty", noValue: !0 },
+  { label: '{{t("is not empty")}}', value: "$notEmpty", noValue: !0 }
 ], operators = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   array,
@@ -44246,6 +44310,7 @@ const string = [
   id,
   number,
   object,
+  richText,
   string,
   tableoid,
   time
@@ -47383,7 +47448,7 @@ class RichTextFieldInterface extends CollectionFieldInterface {
       }
     }));
     P(this, "filterable", {
-      operators: string
+      operators: richText
     });
   }
   schemaInitialize(o, { block: n }) {