@nocobase/client 1.7.13 → 1.7.15

package/es/index.mjs

@@ -58,7 +58,7 @@ import * as ahooks from "ahooks";
 import { useSetState, useRequest as useRequest$1, useBoolean, useUpdate, useMemoizedFn, useDeepCompareEffect, useEventListener, useLocalStorageState, useCreation, useDebounce } from "ahooks";
 import * as antd from "antd";
 import { notification, ConfigProvider, theme, message, Result, Button, Space as Space$1, Radio as Radio$1, Input as Input$3, Tag, Spin, App, Popover, Menu as Menu$1, Modal, Typography, Tooltip, Skeleton, Table as Table$3, Select as Select$1, DatePicker as DatePicker$1, Cascader as Cascader$1, Slider, Switch, Card, Empty, Collapse, Badge, Tree as Tree$2, Dropdown, Alert, Image, InputNumber as InputNumber$1, Drawer as Drawer$1, Divider as Divider$1, QRCode, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, AutoComplete as AutoComplete$1, Checkbox as Checkbox$1, ColorPicker as ColorPicker$1, List as List$1, Col, Flex, Pagination as Pagination$1, TimePicker as TimePicker$1, Row, Popconfirm, Layout as Layout$1 } from "antd";
-import _, { filter, capitalize, cloneDeep as cloneDeep$1, set, every, some, findIndex, isArray, isFunction, get, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, last, first, isEqual, concat, clone, debounce, castArray, uniqBy, differenceBy, unionBy, isBoolean, groupBy, toString, uniq as uniq$2, pick as pick$1 } from "lodash";
+import _, { filter, capitalize, cloneDeep as cloneDeep$1, set, every, some, findIndex, isArray, isFunction, get, isObject as isObject$1, isEmpty as isEmpty$1, isString, omit, last, first, isEqual, concat, clone, debounce, castArray, uniqBy, differenceBy, unionBy, cloneDeepWith, isBoolean, groupBy, toString, uniq as uniq$2, pick as pick$1 } from "lodash";
 import template from "lodash/template";
 import React, { createContext, useContext, useMemo, Fragment, useCallback, useEffect, memo, useState, useRef, Suspense, createElement, isValidElement, lazy as lazy$1, useDeferredValue, useLayoutEffect, startTransition, forwardRef, useImperativeHandle, createRef } from "react";
 import * as ReactRouterDom from "react-router-dom";
@@ -8711,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.13", 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.15", 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",
@@ -8732,9 +8732,9 @@ const name = "@nocobase/client", version = "1.7.13", 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.13",
-  "@nocobase/sdk": "1.7.13",
-  "@nocobase/utils": "1.7.13",
+  "@nocobase/evaluators": "1.7.15",
+  "@nocobase/sdk": "1.7.15",
+  "@nocobase/utils": "1.7.15",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-style": "3.7.1",
@@ -9500,7 +9500,7 @@ function useSatisfiedActionValues({
   schema: o,
   form: r
 }) {
-  const [a, i] = useState({}), l = useFieldSchema(), c = useVariables$1(), u = useLocalVariables$1({ currentForm: { values: e } }), d = o != null ? o : l, p = n != null ? n : d[LinkageRuleDataKeyMap[t]], m = useApp(), h = useCallback(() => {
+  const [a, i] = useState({}), l = useFieldSchema(), c = useVariables$1(), u = useLocalVariables$1({ currentForm: { values: e } }), d = o != null ? o : l, p = n != null ? n : d[LinkageRuleDataKeyMap[t]] || (d == null ? void 0 : d.parent[LinkageRuleDataKeyMap[t]]), m = useApp(), h = useCallback(() => {
     p && e && getSatisfiedValueMap({ rules: p, variables: c, localVariables: u }, m.jsonLogic).then((g) => {
       isEmpty$1(g) ? i({}) : i(g);
     }).catch((g) => {
@@ -9518,7 +9518,7 @@ function useSatisfiedActionValues({
         r.removeEffects(g);
       };
     }
-  }, [r, h]), { valueMap: a };
+  }, [r, h, e]), { valueMap: a };
 }
 const GetStyleRules = React.memo(({ record: e, schema: t, onStyleChange: n }) => {
   const { valueMap: o } = useSatisfiedActionValues({ formValues: e, category: "style", schema: t });
@@ -9582,9 +9582,13 @@ const mergeFilter = (e, t = "$and") => {
       "$dateBetween",
       "$in",
       "$notIn"
-    ].includes(t[i]) || a != null && a.type)
+    ].includes(t[i]))
       return !0;
     const l = n(`${o}.${i}`);
+    if (["datetime", "datetimeNoTz", "date", "unixTimestamp", "createdAt", "updatedAt"].includes(
+      l == null ? void 0 : l.interface
+    ))
+      return !0;
     if (l != null && l.target) {
       if (Array.isArray(a))
         return !0;
@@ -18132,6 +18136,14 @@ function useCreateFormBlockDecoratorProps(e) {
 function useCreateFormBlockProps() {
   return useFormBlockProps$1();
 }
+function useDataFormItemProps() {
+  const e = useCollectionRecordData(), { form: t } = useFormBlockContext(), n = useSubFormValue(), { valueMap: o } = useSatisfiedActionValues({
+    category: "style",
+    formValues: (n == null ? void 0 : n.formValue) || (t == null ? void 0 : t.values) || e,
+    form: t
+  });
+  return { wrapperStyle: o };
+}
 function useEditFormBlockDecoratorProps(e) {
   const t = useFormBlockParams(e);
   let n;
@@ -18148,14 +18160,16 @@ function useFormBlockParams(e) {
 function useEditFormBlockProps() {
   return useFormBlockProps$1();
 }
-function useDataFormItemProps() {
-  const e = useCollectionRecordData(), { form: t } = useFormBlockContext(), n = useSubFormValue(), { valueMap: o } = useSatisfiedActionValues({
-    category: "style",
-    formValues: (n == null ? void 0 : n.formValue) || (t == null ? void 0 : t.values) || e,
-    form: t
-  });
-  return { wrapperStyle: o };
-}
+const useGridCardActionBarProps$1 = () => {
+  const e = useFieldSchema(), { designable: t } = useDesignable();
+  return {
+    style: {
+      marginBottom: "var(--nb-spacing)"
+    },
+    // In non-configuration mode, when there are no buttons, ActionBar doesn't need to be displayed
+    hidden: !t && _.isEmpty(e.properties)
+  };
+};
 function useGridCardBlockParams(e) {
   const { params: t } = e, { filter: n, parseVariableLoading: o } = useParsedFilter({
     filterOption: t == null ? void 0 : t.filter
@@ -19159,7 +19173,8 @@ const useTableSelectorParams = () => useContext(TableSelectorParamsContext), Tab
       useGridCardBlockItemProps,
       useGridCardBlockProps,
       useFormItemProps,
-      useDataFormItemProps
+      useDataFormItemProps,
+      useGridCardActionBarProps: useGridCardActionBarProps$1
     }),
     children: e.children
   }
@@ -19218,7 +19233,8 @@ class BlockSchemaComponentPlugin extends Plugin {
       useGridCardBlockProps,
       useGridCardBlockItemProps,
       useFormItemProps,
-      useDataFormItemProps
+      useDataFormItemProps,
+      useGridCardActionBarProps: useGridCardActionBarProps$1
     }));
   }
 }
@@ -22630,17 +22646,15 @@ function HTMLEncode(e) {
 }
 const ReadPretty$c = () => null;
 ReadPretty$c.Input = (e) => {
-  const t = usePrefixCls$1("description-input", e), n = useCompile(), o = useMemo(() => Array.isArray(e.value) ? e.value.join(",") : e.value && typeof e.value == "object" ? JSON.stringify(e.value) : n(e.value), [e.value]);
+  const t = usePrefixCls$1("description-input", e), n = useCompile(), o = useMemo(() => Array.isArray(e.value) ? e.value.join(",") : e.value && typeof e.value == "object" ? JSON.stringify(e.value) : n(e.value), [e.value]), r = e.ellipsis ? { display: "flex", alignItems: "center" } : {};
   return /* @__PURE__ */ jsxs(
     "div",
     {
       className: cls(t, e.className),
-      style: x({
-        display: "flex",
-        alignItems: "center",
+      style: x(P(x({}, r), {
         overflowWrap: "break-word",
         whiteSpace: "normal"
-      }, e.style),
+      }), e.style),
       children: [
         n(e.addonBefore),
         n(e.prefix),
@@ -28725,7 +28739,7 @@ function useCollectValuesToSubmit() {
       const B = f[D], N = a(D);
       if (isVariable$1(B)) {
         const { value: $ } = (yield p == null ? void 0 : p.parseVariable(B, m)) || {};
-        $ != null && (S[D] = transformVariableValue($, { targetCollectionField: N }));
+        S[D] = transformVariableValue($, { targetCollectionField: N });
       } else
         B !== "" && (S[D] = B);
     }));
@@ -28814,7 +28828,7 @@ const useCreateActionProps = () => {
           const Y = R[H], J = d(H);
           if (isVariable$1(Y)) {
             const { value: K } = (yield C == null ? void 0 : C.parseVariable(Y, b)) || {};
-            K && (O[H] = transformVariableValue(K, { targetCollectionField: J }));
+            O[H] = transformVariableValue(K, { targetCollectionField: J });
           } else
             Y !== "" && (O[H] = Y);
         }));
@@ -28963,7 +28977,7 @@ const useCreateActionProps = () => {
           const q = b[M], E = m(M);
           if (isVariable$1(q)) {
             const { value: V } = (yield u == null ? void 0 : u.parseVariable(q, d)) || {};
-            V && (B[M] = transformVariableValue(V, { targetCollectionField: E }));
+            B[M] = transformVariableValue(V, { targetCollectionField: E });
           } else
             q !== "" && (B[M] = q);
         }));
@@ -29006,7 +29020,7 @@ const useCreateActionProps = () => {
           const V = R[E], G = C(E);
           if (isVariable$1(V)) {
             const { value: U } = (yield g == null ? void 0 : g.parseVariable(V, b)) || {};
-            U && (j[E] = transformVariableValue(U, { targetCollectionField: G }));
+            j[E] = transformVariableValue(U, { targetCollectionField: G });
           } else
             V !== "" && (j[E] = V);
         }));
@@ -29119,7 +29133,7 @@ const useCreateActionProps = () => {
           const H = T[U], Y = d(U);
           if (isVariable$1(H)) {
             const { value: J } = (yield b == null ? void 0 : b.parseVariable(H, S)) || {};
-            J && (k[U] = transformVariableValue(J, { targetCollectionField: Y }));
+            k[U] = transformVariableValue(J, { targetCollectionField: Y });
           } else
             H !== "" && (k[U] = H);
         }));
@@ -30841,9 +30855,9 @@ const DragHandler = (e) => {
     collectionName: C,
     dataSource: b,
     defaultValue: S
-  } = useParentPopupVariableContext(), { datetimeCtx: y } = useDatetimeVariableContext(), { currentFormCtx: v } = useCurrentFormContext({ form: e == null ? void 0 : e.currentForm }), { name: F } = useCollection_deprecated(), I = useContextVariable();
-  let { name: T } = useBlockCollection();
-  return e != null && e.collectionName && (T = e.collectionName), useMemo(() => [
+  } = useParentPopupVariableContext(), { urlSearchParamsCtx: y, shouldDisplay: v } = useURLSearchParamsVariable(), { datetimeCtx: F } = useDatetimeVariableContext(), { currentFormCtx: I } = useCurrentFormContext({ form: e == null ? void 0 : e.currentForm }), { name: T } = useCollection_deprecated(), R = useContextVariable();
+  let { name: D } = useBlockCollection();
+  return e != null && e.collectionName && (D = e.collectionName), useMemo(() => [
     /**
      * @deprecated
      * 兼容老版本
@@ -30858,9 +30872,9 @@ const DragHandler = (e) => {
      * 兼容旧版本的以数据表名称命名的变量，新版本已更名为 `$nForm`
      */
     {
-      name: T,
-      ctx: v || i,
-      collectionName: T
+      name: D,
+      ctx: I || i,
+      collectionName: D
     },
     /**
      * @deprecated
@@ -30868,8 +30882,8 @@ const DragHandler = (e) => {
      */
     {
       name: "$form",
-      ctx: v,
-      collectionName: T
+      ctx: I,
+      collectionName: D
     },
     {
       name: "$nRecord",
@@ -30899,12 +30913,12 @@ const DragHandler = (e) => {
     },
     {
       name: "$nForm",
-      ctx: v,
-      collectionName: T
+      ctx: I,
+      collectionName: D
     },
     {
       name: "$nDate",
-      ctx: y
+      ctx: F
     },
     /**
      * @deprecated
@@ -30912,24 +30926,28 @@ const DragHandler = (e) => {
      */
     {
       name: "$date",
-      ctx: y
+      ctx: F
     },
-    I,
+    R,
     a && {
       name: "$iteration",
       ctx: r,
-      collectionName: F
+      collectionName: T
     },
     n && {
       name: "$nParentIteration",
       ctx: t,
       collectionName: o
+    },
+    v && {
+      name: "$nURLSearchParams",
+      ctx: y
     }
   ].filter(Boolean), [
     i,
     l,
-    T,
-    v,
+    D,
+    I,
     c,
     u,
     d,
@@ -30937,16 +30955,17 @@ const DragHandler = (e) => {
     f,
     m,
     h,
-    y,
+    F,
     a,
     r,
-    F,
+    T,
     g,
     S,
     n,
     t,
     o,
-    I
+    R,
+    y
   ]);
 }, useLocalVariables$1 = useLocalVariables, useVariables = () => useContext(VariablesContext), useVariables$1 = useVariables, isSubFormOrSubTableField = (e) => {
   for (; e; ) {
@@ -39529,7 +39548,7 @@ const ActionBarContext = React.createContext({
     })
   );
 }, ActionBar = withDynamicSchemaProps(
-  (e) => /* @__PURE__ */ jsx(InternalActionBar, x({}, e)),
+  (e) => e.hidden ? null : /* @__PURE__ */ jsx(InternalActionBar, x({}, e)),
   { displayName: "ActionBar" }
 ), useGetAriaLabelOfPopover = () => {
   const e = useFieldSchema(), t = e["x-component"], n = typeof t == "string" ? t : (t == null ? void 0 : t.displayName) || (t == null ? void 0 : t.name), o = useCompile();
@@ -44595,7 +44614,10 @@ const AssignedFieldInner = (e) => {
   ), S = useCallback(
     (v) => {
       const F = v.find((T) => T.value === "$nForm"), I = o(h);
-      return !(I != null && I.length) && F && (F.children = formatVariableScop(m)), cloneDeep$1(v);
+      return !(I != null && I.length) && F && (F.children = formatVariableScop(m)), cloneDeepWith(v, (T) => {
+        if (isValidElement(T))
+          return T;
+      });
     },
     [m, h]
   ), y = useCallback(
@@ -45403,8 +45425,11 @@ const useColumnsDeepMemoized = (e) => {
   return /* @__PURE__ */ jsx("td", P(x({}, c), { className: cls(e.className, cellClass), style: d, children: l || n || o ? e.children : /* @__PURE__ */ jsx("div", { style: p }) }));
 }, displayNone = { display: "none" }, BodyCellComponent = (n) => {
   var o = n, { columnHidden: e } = o, t = W(o, ["columnHidden"]);
-  const { designable: r } = useDesignable();
-  return e ? /* @__PURE__ */ jsx("td", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : /* @__PURE__ */ jsx("span", { style: displayNone, children: t.children }) }) : /* @__PURE__ */ jsx(InternalBodyCellComponent, x({}, t));
+  const { designable: r } = useDesignable(), a = useCollection();
+  return e ? /* @__PURE__ */ jsx("td", { style: r ? columnOpacityStyle : columnHiddenStyle, children: r ? t.children : /* @__PURE__ */ jsx("span", { style: displayNone, children: t.children }) }) : /* @__PURE__ */ jsxs(SubFormProvider, { value: { value: t == null ? void 0 : t.record, collection: a, fieldSchema: t.schema }, children: [
+    /* @__PURE__ */ jsx(InternalBodyCellComponent, x({}, t)),
+    " "
+  ] });
 }, InternalNocoBaseTable = React.memo(
   (e) => {
     const b = e, {
@@ -63442,11 +63467,7 @@ const createGridCardBlockUISchema = (e) => {
         type: "void",
         "x-initializer": "gridCard:configureActions",
         "x-component": "ActionBar",
-        "x-component-props": {
-          style: {
-            marginBottom: "var(--nb-spacing)"
-          }
-        }
+        "x-use-component-props": "useGridCardActionBarProps"
       },
       list: {
         type: "array",

package/es/modules/blocks/data-blocks/grid-card/hooks/useGridCardActionBarProps.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const useGridCardActionBarProps: () => {
+    style: {
+        marginBottom: string;
+    };
+    hidden: boolean;
+};