@nocobase/client 1.9.30 → 1.9.32

package/es/index.mjs

@@ -113,7 +113,7 @@ import { loadableResource } from "react-imported-component";
 import ProLayout, { RouteContext, PageHeader } from "@ant-design/pro-layout";
 import * as antdStyle from "antd-style";
 import { createStyles, createGlobalStyle, useAntdToken } from "antd-style";
-import { createStyles as Dn } from "antd-style";
+import { createStyles as wn } from "antd-style";
 import * as dndKitCore from "@dnd-kit/core";
 import { DndContext as DndContext$1, rectIntersection, DragOverlay, useDroppable, useDndContext, useDndMonitor, useDraggable } from "@dnd-kit/core";
 import * as dndKitSortable from "@dnd-kit/sortable";
@@ -152,7 +152,6 @@ import useUploadStyle from "antd/es/upload/style";
 import filesize from "filesize";
 import LightBox from "react-image-lightbox";
 import "react-image-lightbox/style.css";
-import { renderToString } from "react-dom/server";
 import sanitizeHTML from "sanitize-html";
 import { Popup } from "antd-mobile";
 import { CloseOutline } from "antd-mobile-icons";
@@ -6694,7 +6693,7 @@ const InternalFormBlockProvider = (e) => {
     e = e.parent;
   }
   return null;
-}, REGEX_OF_VARIABLE = /^\s*\{\{\s*([\p{L}0-9_$-.]+?)\s*\}\}\s*$/u, REGEX_OF_VARIABLE_IN_EXPRESSION = /\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}/g, isVariable$1 = (e) => !(typeof e != "string" || !e.match(REGEX_OF_VARIABLE)), getVariablesFromExpression = (e) => {
+}, NAMESPACE_UI_SCHEMA = "ui-schema-storage", REGEX_OF_VARIABLE = /^\s*\{\{\s*([\p{L}0-9_$-.]+?)\s*\}\}\s*$/u, REGEX_OF_VARIABLE_IN_EXPRESSION = /\{\{\s*([a-zA-Z0-9_$-.]+?)\s*\}\}/g, isVariable$1 = (e) => !(typeof e != "string" || !e.match(REGEX_OF_VARIABLE)), getVariablesFromExpression = (e) => {
   const t = e.match(REGEX_OF_VARIABLE_IN_EXPRESSION);
   return t || [];
 }, transformVariableValue = (e, t) => {
@@ -6857,7 +6856,7 @@ function withParams(e, t) {
 function inferPickerType(e, t) {
   return /^\d{4}$/.test(e) ? "year" : /^\d{4}-\d{2}$/.test(e) ? "month" : /^\d{4}Q[1-4]$/.test(e) ? "quarter" : /^\d{4}-\d{2}-\d{2}$/.test(e) ? "date" : t || "date";
 }
-const NAMESPACE_UI_SCHEMA = "ui-schema-storage", parseVariables = (e, t) => {
+const parseVariables = (e, t) => {
   var r;
   const n = /{{(.*?)}}/, o = (r = e == null ? void 0 : e.match) == null ? void 0 : r.call(e, n);
   if (o) {
@@ -6905,8 +6904,8 @@ const parseVariableValue = (e, t, n) => q(void 0, null, function* () {
   variableNameOfLeftCondition: o,
   conditionType: r
 }, a) {
-  const c = Object.keys(e)[0] || "$and", u = e[c], d = yield Promise.all(
-    u.map(
+  const c = Object.keys(e)[0] || "$and", u = e[c] || [], d = yield Promise.all(
+    u.filter(Boolean).map(
       (p) => processCondition(p, t, n, o, r, a)
     )
   );
@@ -7016,7 +7015,7 @@ function getFieldValuesInCondition({ linkageRules: e, formValues: t }) {
   return e.map((n) => {
     const o = (r) => {
       const a = Object.keys(r)[0] || "$and";
-      return r[a].map((l) => {
+      return (r[a] || []).filter(Boolean).map((l) => {
         if ("$and" in l || "$or" in l)
           return o(l);
         const c = getTargetField$1(l).join(".");
@@ -8857,7 +8856,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.30", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.32", 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",
@@ -8878,9 +8877,9 @@ const name = "@nocobase/client", version = "1.9.30", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.30",
-  "@nocobase/sdk": "1.9.30",
-  "@nocobase/utils": "1.9.30",
+  "@nocobase/evaluators": "1.9.32",
+  "@nocobase/sdk": "1.9.32",
+  "@nocobase/utils": "1.9.32",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -23975,9 +23974,12 @@ function createOptionsValueLabelMap(e, t = defaultFieldNames$2) {
         n.set(`${o[t.value]}.${r}`, [o[t.label], ...a]);
   return n;
 }
+function reactNodeToPlainText(e) {
+  return e == null || typeof e == "boolean" ? "" : typeof e == "string" || typeof e == "number" ? `${e}` : Array.isArray(e) ? e.map(reactNodeToPlainText).join("") : isValidElement(e) ? reactNodeToPlainText(e.props.children) : "";
+}
 function createVariableTagHTML(e, t) {
   let n = t.get(e);
-  return n && (n = n.map((o) => isReactElement(o) || isValidElement(o) ? renderToString(o) : o)), `<span class="ant-tag ant-tag-blue" contentEditable="false" data-variable="${e}">${n ? n.join(" / ") : "..."}</span>`;
+  return n && (n = n.map((o) => isReactElement(o) || isValidElement(o) ? reactNodeToPlainText(o) : o)), `<span class="ant-tag ant-tag-blue" contentEditable="false" data-variable="${e}">${n ? n.join(" / ") : "..."}</span>`;
 }
 function getSingleEndRange(e, t, n) {
   var o, r, a, i, l, c, u;
@@ -30392,7 +30394,7 @@ const getAppends = ({
     if (c["x-linkage-rules"] && !isSubMode(c)) {
       const b = (y) => {
         const v = Object.keys(y)[0] || "$and";
-        y[v].forEach((F) => {
+        (y[v] || []).filter(Boolean).forEach((F) => {
           if ("$and" in F || "$or" in F)
             return b(F);
           const w = getTargetField(F);
@@ -31671,34 +31673,42 @@ const DragHandler = (e) => {
     "title-field"
   ) : null;
 }, isDisplayField = (e) => e.includes("."), useLazyLoadDisplayAssociationFieldsOfForm = () => {
-  var b;
+  var y;
   const { name: e } = useCollection_deprecated(), { getCollectionJoinField: t, getCollection: n } = useCollectionManager_deprecated(), o = useForm(), r = useFieldSchema(), a = useVariables$1(), i = useField(), { formValue: l } = useSubFormValue(), { isInSubForm: c, isInSubTable: u } = useFlag() || {}, { getAssociationAppends: d } = useAssociationNames(), p = r.name.toString(), m = useRef(null), h = useRef(null);
   m.current == null && isDisplayField(p) && (m.current = t(`${e}.${p}`)), h.current == null && isDisplayField(p) && (h.current = t(`${e}.${p.split(".")[0]}`));
-  const g = useMemo(() => !isDisplayField(p) || !a || e === "fields" || !m.current, [p, a, e, m.current]), f = g ? {} : untracked(() => _.cloneDeep(c || u ? l : o.values)), C = isDisplayField(p) && h.current ? _.get(f, `${p.split(".")[0]}.${((b = h.current) == null ? void 0 : b.targetKey) || "id"}`) : void 0;
+  const g = useMemo(() => !isDisplayField(p) || !a || e === "fields" || !m.current, [p, a, e, m.current]), f = g ? {} : untracked(() => _.cloneDeep(c || u ? l : o.values)), C = isDisplayField(p) && h.current ? _.get(f, `${p.split(".")[0]}.${((y = h.current) == null ? void 0 : y.targetKey) || "id"}`) : void 0, b = useRef(C);
+  _.isEqual(b.current, C) || (b.current = C);
+  const S = b.current;
   useEffect(() => {
-    var F;
+    var T;
     if (g || _.isEmpty(f))
       return;
-    const S = {
+    const v = {
       name: "$nForm",
       ctx: f,
       collectionName: e
-    }, y = `{{ $nForm.${p} }}`;
-    if (C == null)
+    }, I = `{{ $nForm.${p} }}`;
+    if (S == null)
       return;
-    const { appends: v } = d(), I = n((F = m.current) == null ? void 0 : F.collectionName);
-    a.parseVariable(y, S, { appends: v }).then(({ value: w }) => {
+    const { appends: F } = d(), w = n((T = m.current) == null ? void 0 : T.collectionName);
+    a.parseVariable(I, v, { appends: F }).then(({ value: D }) => {
       nextTick(() => {
-        const T = transformVariableValue(w, { targetCollectionField: m.current });
-        T == null ? i.value = null : (i.value = T, i.componentProps = P(x({}, i.componentProps), {
-          readOnlySubmit: !0,
-          filterTargetKey: (I == null ? void 0 : I.filterTargetKey) || "id"
-        }));
+        const B = transformVariableValue(D, { targetCollectionField: m.current });
+        if (B == null)
+          i.value != null && (i.value = null);
+        else {
+          if (_.isEqual(i.value, B))
+            return;
+          i.setValue(B), i.componentProps = P(x({}, i.componentProps), {
+            readOnlySubmit: !0,
+            filterTargetKey: (w == null ? void 0 : w.filterTargetKey) || "id"
+          });
+        }
       });
-    }).catch((w) => {
-      console.error(w);
+    }).catch((D) => {
+      console.error(D);
     });
-  }, [C, g]);
+  }, [S, g]);
 }, useContextVariable = () => {
   var p, m;
   let e;
@@ -70468,7 +70478,7 @@ export {
   createReadPrettyFormBlockSchema,
   createRouterManager,
   createSelectSchemaSettingsItem,
-  Dn as createStyles,
+  wn as createStyles,
   createSwitchSettingsItem,
   createTableBlockSchema,
   createTableBlockUISchema,