@nocobase/client 1.7.9 → 1.7.12

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

@@ -73,6 +73,12 @@ export declare class CheckboxFieldInterface extends CollectionFieldInterface {
                 };
             };
             selected?: undefined;
+        } | {
+            label: string;
+            value: string;
+            noValue: boolean;
+            selected?: undefined;
+            schema?: undefined;
         })[];
     };
     schemaInitialize(schema: ISchema, { block }: {

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

@@ -211,6 +211,12 @@ export declare const boolean: ({
         };
     };
     selected?: undefined;
+} | {
+    label: string;
+    value: string;
+    noValue: boolean;
+    selected?: undefined;
+    schema?: undefined;
 })[];
 export declare const tableoid: {
     label: string;

package/es/index.mjs

@@ -4251,13 +4251,14 @@ class APIClient extends APIClient$1 {
     A(this, "notification", notification);
   }
   cloneInstance() {
+    var r;
     const n = new APIClient(this.options);
     n.options = this.options, n.services = this.services, n.storage = this.storage, n.app = this.app, n.auth = this.auth, n.storagePrefix = this.storagePrefix, n.notification = this.notification;
     const o = [];
-    for (const r of this.axios.interceptors.response.handlers)
-      r.rejected._name === "handleNotificationError" ? o.push(P(x({}, r), {
+    for (const a of this.axios.interceptors.response.handlers)
+      ((r = a == null ? void 0 : a.rejected) == null ? void 0 : r._name) === "handleNotificationError" ? o.push(P(x({}, a), {
         rejected: n.handleNotificationError.bind(n)
-      })) : o.push(r);
+      })) : o.push(a);
     return n.axios.interceptors.response.handlers = o, n;
   }
   getHeaders() {
@@ -5240,7 +5241,9 @@ const date = dayjs(), spaceCSS = css`
         ]
       }
     }
-  }
+  },
+  { label: "{{ t('is empty') }}", value: "$empty", noValue: !0 },
+  { label: "{{ t('is not empty') }}", value: "$notEmpty", noValue: !0 }
 ], tableoid = [
   {
     label: '{{t("is any of")}}',
@@ -6882,7 +6885,10 @@ function bindLinkageRulesToFiled({
     // 1. 条件中的字段值；
     // 2. 条件中的变量值；
     // 3. value 表达式中的变量值；
-    () => (getFieldValuesInCondition({ linkageRules: t, formValues: n }), getVariableValuesInCondition({ linkageRules: t, localVariables: o }), getVariableValuesInExpression({ action: r, localVariables: o }), uid$1()),
+    () => {
+      const f = getFieldValuesInCondition({ linkageRules: t, formValues: n }), C = getVariableValuesInCondition({ linkageRules: t, localVariables: o }), b = getVariableValuesInExpression({ action: r, localVariables: o });
+      return [f, C, b].map((y) => JSON.stringify(y)).join(",");
+    },
     getSubscriber({ action: r, field: e, rule: a, variables: i, localVariables: o, variableNameOfLeftCondition: l }, c),
     { fireImmediately: !0, equals: _.isEqual }
   );
@@ -8705,7 +8711,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.7.9", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.7.12", 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",
@@ -8726,9 +8732,9 @@ const name = "@nocobase/client", version = "1.7.9", license = "AGPL-3.0", main =
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.7.9",
-  "@nocobase/sdk": "1.7.9",
-  "@nocobase/utils": "1.7.9",
+  "@nocobase/evaluators": "1.7.12",
+  "@nocobase/sdk": "1.7.12",
+  "@nocobase/utils": "1.7.12",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -10284,7 +10290,7 @@ const Table$2 = withDynamicSchemaProps(
         "loading",
         "onClickRow",
         "value"
-      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexÏColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
+      ]), y = useArrayField$1(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((be = v == null ? void 0 : v.parent) == null ? void 0 : be["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B, enableIndexColumn: N } = R, $ = useMemoizedFn(S.onRowDragEnd || (() => {
       })), L = usePaginationProps$3(n, a, e), w = useTableColumns$2(S, L), [O, j] = useState(() => D ? B : []), [k, M] = useState(((Se = y == null ? void 0 : y.data) == null ? void 0 : Se.selectedRowKeys) || []), [q, E] = useState([]), V = (p == null ? void 0 : p.type) !== "none", G = useRef(/* @__PURE__ */ new Map()), U = useMemo(() => css`
           & > td {
             background-color: ${t.controlItemBgActive} !important;
@@ -10505,7 +10511,7 @@ const InternalTableBlockProvider = (e) => {
     fieldNames: l,
     collection: c,
     association: u,
-    enableIndexÏColumn: d
+    enableIndexColumn: d
   } = e, p = useField(), { resource: m, service: h } = useBlockRequestContext(), g = useFieldSchema(), [f, C] = useState(!!(l || i)), { heightProps: b } = useBlockHeightProps(), S = useRef(null);
   useEffect(() => {
     C(l || i);
@@ -10546,7 +10552,7 @@ const InternalTableBlockProvider = (e) => {
       setExpandFlag: v,
       heightProps: b,
       association: u,
-      enableIndexÏColumn: d
+      enableIndexColumn: d
     }),
     [
       y,
@@ -22628,13 +22634,18 @@ ReadPretty$c.Input = (e) => {
     "div",
     {
       className: cls(t, e.className),
-      style: x({ overflowWrap: "break-word", whiteSpace: "normal" }, e.style),
+      style: x({
+        display: "flex",
+        alignItems: "center",
+        overflowWrap: "break-word",
+        whiteSpace: "normal"
+      }, e.style),
       children: [
-        e.addonBefore,
-        e.prefix,
+        n(e.addonBefore),
+        n(e.prefix),
         e.ellipsis ? /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: e.ellipsis, children: o }) : o,
-        e.suffix,
-        e.addonAfter
+        n(e.suffix),
+        n(e.addonAfter)
       ]
     }
   );
@@ -30247,7 +30258,7 @@ const DragHandler = (e) => {
         Select$1,
         {
           value: t == null ? void 0 : t.unit,
-          style: { maxWidth: 140, minWidth: 130 },
+          style: { maxWidth: 140 },
           onChange: (d) => {
             const p = P(x({}, t), {
               unit: d
@@ -30259,7 +30270,8 @@ const DragHandler = (e) => {
             { value: "week", label: r("Calendar week") },
             { value: "month", label: r("Calendar Month") },
             { value: "year", label: r("Calendar Year") }
-          ]
+          ],
+          popupMatchSelectWidth: !0
         },
         "unit"
       )
@@ -35342,9 +35354,9 @@ const enabledIndexColumn$1 = {
     const e = useField(), t = useFieldSchema(), { t: n } = useTranslation(), { dn: o } = useDesignable();
     return {
       title: n("Enable index column"),
-      checked: e.decoratorProps.enableIndexÏColumn !== !1,
+      checked: e.decoratorProps.enableIndexColumn !== !1,
       onChange: (r) => z(void 0, null, function* () {
-        e.decoratorProps = e.decoratorProps || {}, e.decoratorProps.enableIndexÏColumn = r, t["x-decorator-props"].enableIndexÏColumn = r, o.emit("patch", {
+        e.decoratorProps = e.decoratorProps || {}, e.decoratorProps.enableIndexColumn = r, t["x-decorator-props"].enableIndexColumn = r, o.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
             "x-decorator-props": t["x-decorator-props"]
@@ -37689,9 +37701,9 @@ const dividerSettings = new SchemaSettings({
     const e = useField(), t = useFieldSchema(), { t: n } = useTranslation(), { dn: o } = useDesignable();
     return {
       title: n("Enable index column"),
-      checked: e.componentProps.enableIndexÏColumn !== !1,
+      checked: e.componentProps.enableIndexColumn !== !1,
       onChange: (r) => z(void 0, null, function* () {
-        e.componentProps = e.componentProps || {}, e.componentProps.enableIndexÏColumn = r, t["x-component-props"].enableIndexÏColumn = r, o.emit("patch", {
+        e.componentProps = e.componentProps || {}, e.componentProps.enableIndexColumn = r, t["x-component-props"].enableIndexColumn = r, o.emit("patch", {
           schema: {
             "x-uid": t["x-uid"],
             "x-component-props": t["x-component-props"]
@@ -39351,8 +39363,8 @@ const RenderButton = ({
 RenderButton.displayName = "RenderButton";
 const RenderButtonInner = observer$1(
   (e) => {
-    var O, k;
-    const w = e, {
+    var j, M;
+    const O = e, {
       designable: t,
       field: n,
       aclCtx: o,
@@ -39373,7 +39385,7 @@ const RenderButtonInner = observer$1(
       title: S,
       isLink: y,
       onlyIcon: v
-    } = w, F = W(w, [
+    } = O, F = W(O, [
       "designable",
       "field",
       "aclCtx",
@@ -39396,27 +39408,32 @@ const RenderButtonInner = observer$1(
       "onlyIcon"
     ]), { t: I } = useTranslation(), T = useCallback(
       debounce$1(
-        (M, q = !0) => {
-          d(M, q);
+        (q, E = !0) => {
+          d(q, E);
         },
         300,
         { leading: !0, trailing: !1 }
       ),
       [d]
     );
-    if (useEffect(() => () => {
+    useEffect(() => () => {
       T.cancel();
-    }, []), !t && ((O = n == null ? void 0 : n.data) != null && O.hidden || !o))
-      return null;
-    const R = S != null ? S : n == null ? void 0 : n.title, D = typeof R == "string" ? I(R, { ns: NAMESPACE_UI_SCHEMA }) : R, j = l, { opacity: B } = j, N = W(j, ["opacity"]), $ = y && B ? { opacity: B } : void 0, L = React.forwardRef(
-      (H, U) => {
-        var Y = H, { component: M = p || Button, icon: q, onlyIcon: E, children: V } = Y, G = W(Y, ["component", "icon", "onlyIcon", "children"]);
-        return /* @__PURE__ */ jsxs(M, P(x({ ref: U }, G), { children: [
-          E ? /* @__PURE__ */ jsx(Tooltip, { title: G.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: q && typeof q == "string" ? /* @__PURE__ */ jsx(Icon, { type: q }) : q }),
-          E ? V[1] : V
-        ] }));
-      }
+    }, []);
+    const R = useMemo(
+      () => React.forwardRef(
+        (Y, H) => {
+          var J = Y, { component: q = p || Button, icon: E, onlyIcon: V, children: G } = J, U = W(J, ["component", "icon", "onlyIcon", "children"]);
+          return /* @__PURE__ */ jsxs(q, P(x({ ref: H }, U), { children: [
+            V ? /* @__PURE__ */ jsx(Tooltip, { title: U.title, children: /* @__PURE__ */ jsx("span", { style: { padding: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }) }) : /* @__PURE__ */ jsx("span", { style: { paddingRight: 3 }, children: E && typeof E == "string" ? /* @__PURE__ */ jsx(Icon, { type: E }) : E }),
+            V ? G[1] : G
+          ] }));
+        }
+      ),
+      [v]
     );
+    if (!t && ((j = n == null ? void 0 : n.data) != null && j.hidden || !o))
+      return null;
+    const D = S != null ? S : n == null ? void 0 : n.title, B = typeof D == "string" ? I(D, { ns: NAMESPACE_UI_SCHEMA }) : D, k = l, { opacity: N } = k, $ = W(k, ["opacity"]), L = y && N ? { opacity: N } : void 0, w = v || p ? R : p || Button;
     return /* @__PURE__ */ jsxs(
       SortableItem,
       P(x({
@@ -39424,18 +39441,18 @@ const RenderButtonInner = observer$1(
         "aria-label": u()
       }, F), {
         onMouseEnter: c,
-        loading: ((k = n == null ? void 0 : n.data) == null ? void 0 : k.loading) || a,
-        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: $ }) : r,
+        loading: ((M = n == null ? void 0 : n.data) == null ? void 0 : M.loading) || a,
+        icon: typeof r == "string" ? /* @__PURE__ */ jsx(Icon, { type: r, style: L }) : r,
         disabled: i,
-        style: y ? N : l,
+        style: y ? $ : l,
         onClick: T,
-        component: v || p ? L : p || Button,
+        component: w,
         className: cls(m, h, g, "nb-action"),
         type: f === "danger" ? void 0 : f,
-        title: D,
+        title: B,
         onlyIcon: v,
         children: [
-          !v && D && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: $, children: D }),
+          !v && B && /* @__PURE__ */ jsx("span", { className: r ? "nb-action-title" : null, style: L, children: B }),
           /* @__PURE__ */ jsx(C, x({}, b))
         ]
       })
@@ -43119,8 +43136,8 @@ const Upload = connect(
 );
 Upload.ReadPretty = ReadPretty$9;
 function useSizeHint(e) {
-  const t = e != null ? e : FILE_SIZE_LIMIT_DEFAULT, { t: n, i18n: o } = useTranslation();
-  return filesize(t, { base: 2, standard: "jedec", locale: o.language }), t !== 0 ? n("File size should not exceed {{size}}.", { size: 1e7 }) : "";
+  const t = e != null ? e : FILE_SIZE_LIMIT_DEFAULT, { t: n, i18n: o } = useTranslation(), r = filesize(t, { base: 2, standard: "jedec", locale: o.language });
+  return t !== 0 ? n("File size should not exceed {{size}}.", { size: r }) : "";
 }
 function DefaultThumbnailPreviewer({ file: e }) {
   var r;
@@ -44025,7 +44042,11 @@ const InternalNesterCardCss = css`
     }, N = () => {
       const k = (f == null ? void 0 : f.targetKey) || "id", M = T.map((E) => E[k]).filter(Boolean);
       return M.length ? { $and: [{ [`${k}.$ne`]: M }] } : {};
-    }, $ = () => {
+    };
+    useEffect(() => {
+      t || F([]);
+    }, [t]);
+    const $ = () => {
       const { setVisible: k } = useActionContext(), { multiple: M, selectedRows: q, onChange: E, options: V, collectionField: G } = useContext(RecordPickerContext);
       return {
         onClick() {
@@ -45465,7 +45486,7 @@ const Table$1 = withDynamicSchemaProps(
       onExpand: g,
       loading: f,
       onClickRow: C,
-      enableIndexÏColumn: b
+      enableIndexColumn: b
     } = ce, S = W(ce, [
       "dragSort",
       "showIndex",
@@ -45477,7 +45498,7 @@ const Table$1 = withDynamicSchemaProps(
       "onExpand",
       "loading",
       "onClickRow",
-      "enableIndexÏColumn"
+      "enableIndexColumn"
     ]), y = useArrayField(S), v = useFieldSchema(), { size: F = "small" } = (v == null ? void 0 : v["x-component-props"]) || {}, I = useCollection(), R = ((Ce = v == null ? void 0 : v.parent) == null ? void 0 : Ce["x-decorator"]) === "TableSelectorProvider" ? useTableSelectorContext() : useTableBlockContext(), { expandFlag: D, allIncludesChildren: B } = R, N = useMemoizedFn(S.onRowDragEnd || (() => {
     })), $ = usePaginationProps$2(n, a), L = useTableColumns$1(S, $), [w, O] = useState(() => D ? B : []), [j, k] = useState(((be = y == null ? void 0 : y.data) == null ? void 0 : be.selectedRowKeys) || []), [M, q] = useState([]), E = (p == null ? void 0 : p.type) !== "none", V = useRef(/* @__PURE__ */ new Map()), G = useMemo(() => css`
         & > td {
@@ -45705,7 +45726,7 @@ const Table$1 = withDynamicSchemaProps(
 `, SubTable = observer$1(
   (e) => {
     var k, M, q;
-    const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexÏColumn: y } = n.componentProps;
+    const { openSize: t } = e, { field: n, options: o, fieldSchema: r } = useAssociationFieldContext(), { t: a } = useTranslation(), [i, l] = useState(!1), [c, u] = useState([]), d = useFieldNames$1(e), p = useFieldSchema(), m = useCompile(), h = useLabelUiSchema$1(o, (d == null ? void 0 : d.label) || "label"), g = useCollectionRecord(), f = useCollection(), { allowSelectExistingRecord: C, allowAddnew: b, allowDisassociation: S, enableIndexColumn: y } = n.componentProps;
     useSubTableSpecialCase({ rootField: n, rootSchema: r });
     const v = (E, V) => {
       if (V !== void 0 && isArr(n.value) && E !== V)
@@ -45801,7 +45822,7 @@ const Table$1 = withDynamicSchemaProps(
               n.editable ? a("Please add or select record") : a("No data")
             ] })
           },
-          enableIndexÏColumn: y !== !1,
+          enableIndexColumn: y !== !1,
           footer: () => /* @__PURE__ */ jsx("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center" }, children: n.editable && /* @__PURE__ */ jsxs(
             Space$1,
             {
@@ -50234,7 +50255,7 @@ const TableActionColumnDesigner = (e) => {
         title: u("Enable index column"),
         checked: ((N = r.decoratorProps) == null ? void 0 : N.enableSelectColumn) !== !1,
         onChange: (k) => z(void 0, null, function* () {
-          r.decoratorProps = r.decoratorProps || {}, r.decoratorProps.enableIndexÏColumn = k, a["x-decorator-props"].enableIndexÏColumn = k, d.emit("patch", {
+          r.decoratorProps = r.decoratorProps || {}, r.decoratorProps.enableIndexColumn = k, a["x-decorator-props"].enableIndexColumn = k, d.emit("patch", {
             schema: {
               "x-uid": a["x-uid"],
               "x-decorator-props": a["x-decorator-props"]
@@ -52787,7 +52808,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
           });
           S(T == null ? void 0 : T.data);
           const R = l(o.interface), D = cloneDeep(T == null ? void 0 : T.data) || {};
-          D != null && D.reverseField || (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", ($ = o.__parent) == null ? void 0 : $.title));
+          D != null && D.reverseField ? D.autoCreateReverseField = !0 : (D.autoCreateReverseField = !1, D.reverseField = (N = R == null ? void 0 : R.default) == null ? void 0 : N.reverseField, set$1(D.reverseField, "name", `f_${uid()}`), set$1(D.reverseField, "uiSchema.title", ($ = o.__parent) == null ? void 0 : $.title));
           const B = getSchema$7(R, D, o, C);
           h(B), p(!0);
         }),