@nocobase/client 1.4.7 → 1.4.9

package/es/index.mjs

@@ -4295,7 +4295,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.4.7", 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.4.9", 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",
@@ -4317,9 +4317,9 @@ const name = "@nocobase/client", version$1 = "1.4.7", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.4.7",
-  "@nocobase/sdk": "1.4.7",
-  "@nocobase/utils": "1.4.7",
+  "@nocobase/evaluators": "1.4.9",
+  "@nocobase/sdk": "1.4.9",
+  "@nocobase/utils": "1.4.9",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -5213,6 +5213,8 @@ const InternalFormBlockProvider = (e) => {
   for (; e; ) {
     if (e["x-decorator"] === "FormBlockProvider")
       return e;
+    if (e["x-component"] === "AssociationField.Selector")
+      return null;
     e = e.parent;
   }
   return null;
@@ -7602,7 +7604,7 @@ function getRenderContent(e, t, o, n, r) {
         const l = yield replaceVariableValue(t, o, n);
         return yield r(l);
       } catch (l) {
-        return t;
+        return console.log(l), t;
       }
   });
 }
@@ -10465,7 +10467,7 @@ const variablesStore = {}, getFieldPath = (e, t) => {
             dataSource: A,
             collectionName: O
           };
-        const T = y[M], { fieldPath: N } = getFieldPath(y.slice(0, M + 1).join("."), I), z = r(N, A), q = (B = i($)) == null ? void 0 : B.getPrimaryKey();
+        const T = y[M], { fieldPath: N } = getFieldPath(y.slice(0, M + 1).join("."), I), z = r(N, A), q = (B = i($, A)) == null ? void 0 : B.getPrimaryKey();
         if (Array.isArray(w)) {
           const E = w.map((U) => {
             if (!(b != null && b.doNotRequest) && shouldToRequest(U == null ? void 0 : U[T]) && (U == null ? void 0 : U[q]) != null && z != null && z.target) {
@@ -11543,7 +11545,8 @@ const ParentCollectionProvider = (e) => {
     {
       name: "$nRecord",
       ctx: a,
-      collectionName: l
+      collectionName: l,
+      dataSource: d
     },
     {
       name: "$nParentRecord",
@@ -11638,12 +11641,17 @@ function useParsedFilter({ filterOption: e }) {
           if (!isVariable(d))
             return d;
           const p = getVariableName(d), m = o(p);
-          return getValuesByPath(
-            {
-              [p]: (m == null ? void 0 : m.ctx) || {}
-            },
-            getPath(d)
-          );
+          let h = null;
+          const f = getPath(d).split(".");
+          return f.forEach((C, S) => {
+            const b = f.slice(0, S + 1).join("."), y = getValuesByPath(
+              {
+                [p]: (m == null ? void 0 : m.ctx) || {}
+              },
+              b
+            );
+            _.isEmpty(y) || (h = y);
+          }), h;
         }
       }),
       c,
@@ -23050,10 +23058,8 @@ const DynamicComponent = (e) => {
             placeholder: t("Comparision")
           }
         ),
-        /* @__PURE__ */ jsxs(Space$1, { children: [
-          c != null && c.noValue ? null : /* @__PURE__ */ jsx(DynamicComponent, { value: p, schema: r, collectionField: h, onChange: m }),
-          !e.disabled && /* @__PURE__ */ jsx("a", { role: "button", "aria-label": "icon-close", children: /* @__PURE__ */ jsx(CloseCircleOutlined, { onClick: n, style: b }) })
-        ] })
+        c != null && c.noValue ? null : /* @__PURE__ */ jsx(DynamicComponent, { value: p, schema: r, collectionField: h, onChange: m }),
+        !e.disabled && /* @__PURE__ */ jsx("a", { role: "button", "aria-label": "icon-close", children: /* @__PURE__ */ jsx(CloseCircleOutlined, { onClick: n, style: b }) })
       ] }) })
     );
   },
@@ -27281,6 +27287,7 @@ const Layout = {
         }))
       ), unflatten$1(a);
     }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [e, t, o == null ? void 0 : o.parseVariable]
   ), findVariable: n };
 }, addChildActionSettings = new SchemaSettings({
@@ -36362,7 +36369,7 @@ function AttachmentList(e) {
 function Uploader(o) {
   var n = o, { rules: e } = n, t = K(n, ["rules"]);
   const { disabled: r, multiple: i, value: a, onChange: l, toValueItem: c = toValueItem } = t, [u, d] = useState([]), { t: p } = useTranslation(), { componentCls: m } = useStyles$8(), h = useField(), g = useUploadProps(t), f = useBeforeUpload(e);
-  console.log("----------", u), useEffect(() => {
+  useEffect(() => {
     u.length ? h.setFeedback({
       type: "error",
       code: "ValidateError",
@@ -38331,6 +38338,9 @@ const useColumnsDeepMemoized = (e) => {
                   .ant-table-small .ant-table-cell {
                     padding: 8px ${C.paddingXS}px;
                   }
+                  .ant-table-cell-fix-right {
+                    padding: 8px 16px !important;
+                  }
                 }
               }
             }
@@ -41457,22 +41467,16 @@ const MarkdownEditor = (e) => {
     return t - 2 * e.paddingLG;
 }, MarkdownVoid = withDynamicSchemaProps(
   observer$1((e) => {
-    const { isDarkTheme: t } = useGlobalTheme(), { componentCls: o, hashId: n } = useStyles$4({ isDarkTheme: t }), { content: r, className: i } = e, a = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, g] = useState(""), f = useVariables(), C = useLocalVariables(), { engine: S } = (l == null ? void 0 : l["x-decorator-props"]) || {}, [b, y] = useState(!1), v = useCompile();
-    useEffect(() => {
+    const { isDarkTheme: t } = useGlobalTheme(), { componentCls: o, hashId: n } = useStyles$4({ isDarkTheme: t }), { content: r, className: i } = e, a = useField(), l = useFieldSchema(), { dn: c } = useDesignable(), { onSave: u, onCancel: d, form: p } = e, m = useCollectionRecord(), [h, g] = useState(""), f = useVariables(), C = useLocalVariables(), { engine: S } = (l == null ? void 0 : l["x-decorator-props"]) || {}, [b, y] = useState(!1);
+    useCompile(), useEffect(() => {
       y(!0), V(void 0, null, function* () {
         setTimeout(() => V(void 0, null, function* () {
-          const A = yield getRenderContent(
-            S,
-            r,
-            v(f),
-            v(C),
-            parseMarkdown
-          );
-          g(A);
+          const k = yield getRenderContent(S, r, f, C, parseMarkdown);
+          g(k);
         })), y(!1);
       });
     }, [r, f, C, S]);
-    const I = useMarkdownHeight(), w = useVariableOptions({
+    const v = useMarkdownHeight(), I = useVariableOptions({
       collectionField: { uiSchema: l },
       form: p,
       record: m,
@@ -41484,20 +41488,20 @@ const MarkdownEditor = (e) => {
     }, []), b ? /* @__PURE__ */ jsx(Spin, {}) : a != null && a.editable ? /* @__PURE__ */ jsx(
       MarkdownEditor,
       F(x({
-        scope: w
+        scope: I
       }, e), {
         className: !0,
         defaultValue: r,
         onCancel: () => {
           a.editable = !1, d == null || d();
         },
-        onSubmit: (k) => V(void 0, null, function* () {
-          var A;
-          a.editable = !1, (A = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = k, a.componentProps.content = k, u == null || u(l), c.emit("patch", {
+        onSubmit: (w) => V(void 0, null, function* () {
+          var k;
+          a.editable = !1, (k = l["x-component-props"]) != null || (l["x-component-props"] = {}), l["x-component-props"].content = w, a.componentProps.content = w, u == null || u(l), c.emit("patch", {
             schema: {
               "x-uid": l["x-uid"],
               "x-component-props": {
-                content: k
+                content: w
               }
             }
           });
@@ -41507,7 +41511,7 @@ const MarkdownEditor = (e) => {
       "div",
       {
         className: cls([o, n, "nb-markdown nb-markdown-default nb-markdown-table", i]),
-        style: F(x({}, e.style), { height: I || "100%", overflowY: I ? "auto" : "null" }),
+        style: F(x({}, e.style), { height: v || "100%", overflowY: v ? "auto" : "null" }),
         dangerouslySetInnerHTML: { __html: h }
       }
     );