@nocobase/client 1.6.0-alpha.11 → 1.6.0-alpha.12

package/es/index.mjs

@@ -10283,10 +10283,10 @@ const BodyRowComponent$1 = React.memo((e) => {
 });
 BodyRowComponent$1.displayName = "BodyRowComponent";
 const InternalBodyCellComponent$1 = React.memo((e) => {
-  const d = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = d, i = K(d, ["record", "schema", "rowIndex", "isSubTable"]), a = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = useMemo(() => x(x({}, e.style), l), [e.style, l]);
+  const p = e, { record: t, schema: n, rowIndex: o, isSubTable: r } = p, i = K(p, ["record", "schema", "rowIndex", "isSubTable"]), a = n == null ? void 0 : n[LinkageRuleDataKeyMap.style], [l, c] = useState({}), u = !!(n != null && n.properties) && Object.values(n.properties).some((m) => m["x-read-pretty"] === !0), d = useMemo(() => x(x({}, e.style), l), [e.style, l]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    !_.isEmpty(a) && /* @__PURE__ */ jsx(GetStyleRules, { record: t, schema: n, onStyleChange: c }),
-    /* @__PURE__ */ jsx("td", P(x({}, i), { className: cls(e.className, cellClass$1), style: u, children: e.children }))
+    !_.isEmpty(a) && /* @__PURE__ */ jsx(GetStyleRules, { record: t, schema: n, onStyleChange: u ? c : _.noop }),
+    /* @__PURE__ */ jsx("td", P(x({}, i), { className: cls(e.className, cellClass$1), style: d, children: e.children }))
   ] });
 });
 InternalBodyCellComponent$1.displayName = "InternalBodyCellComponent";
@@ -11761,24 +11761,272 @@ function useDetailsWithPaginationDecoratorProps(e) {
     parseVariableLoading: o
   };
 }
-const DetailsBlockContext = createContext({});
+const useSpecialCase = () => {
+  const e = useForm(), t = useFieldSchema(), { getField: n } = useCollection_deprecated(), { getCollectionField: o } = useCollectionManager_deprecated(), r = useMemo(() => n(t.name), [t.name, n]), i = useCallback(() => isSpecialCaseField({ collectionField: r, fieldSchema: t, getCollectionField: o }), [r, t, o]), a = useCallback(
+    (l) => {
+      const c = getParentFieldSchema(t);
+      if (c) {
+        const u = e.query(c.name).take();
+        if (u) {
+          const d = _.isEmpty(l) ? [] : _.map(
+            transformValue(l, { field: u, subFieldSchema: t }),
+            (p) => markRecordAsNew(p)
+          );
+          isSubset(d, u.initialValue) || u.setInitialValue(d);
+        }
+      }
+    },
+    [t, e]
+  );
+  return {
+    /**
+     * 特殊情况指的是：当前字段是 `对一` 字段且存在于 `对多` 字段的 `子表格` 或 `子表单` 中
+     * 详细说明见：https://nocobase.feishu.cn/docx/EmNEdEBOnoQohUx2UmBcqIQ5nyh#CUdLdy6OpoPKjyx9DLPc3lqknVc
+     */
+    isSpecialCase: i,
+    setDefaultValue: a
+  };
+};
+function getParentFieldSchema(e) {
+  for (; e != null && e.parent; )
+    if (e = e.parent, isSubMode(e))
+      return e;
+  return e;
+}
+function isSpecialCaseField({
+  collectionField: e,
+  fieldSchema: t,
+  getCollectionField: n
+}) {
+  if (!t.default || !t.default.includes("$context"))
+    return !1;
+  if (e && ["hasOne", "belongsTo"].includes(e.type) && t) {
+    const o = getParentFieldSchema(t);
+    if (o && o["x-collection-field"]) {
+      const r = n(o["x-collection-field"]);
+      if (["hasMany", "belongsToMany"].includes(r == null ? void 0 : r.type))
+        return !0;
+    }
+  }
+  return !1;
+}
+function transformValue(e, t) {
+  const { field: n, subFieldSchema: o } = t, r = n.value;
+  let i = null;
+  return Array.isArray(e) ? i = e.map((l) => ({
+    [o.name]: l
+  })) : i = [
+    {
+      [o.name]: e
+    }
+  ], _.assignWith([...r], i, (l, c) => (!l && c && (c.__notFromDatabase = !0), _.assign(x({}, r[0]), c)));
+}
+const useSubTableSpecialCase = ({ rootField: e, rootSchema: t }) => {
+  const { hasUsedVariable: n } = useHasUsedVariable();
+  useEffect(() => {
+    if (_.isEmpty(e.value) && n("$context", t)) {
+      const o = e.value, r = [markRecordAsNew({})];
+      e.value = r, setTimeout(() => {
+        JSON.stringify(e.value) === JSON.stringify(r) && (e.value = o);
+      });
+    }
+  }, [e, t, n]);
+};
+function isSubset(e, t) {
+  if (e.length !== t.length)
+    return !1;
+  for (let n = 0; n < e.length; n++) {
+    const o = e[n], r = t[n];
+    if (!_.isMatch(_.omitBy(r, _.isNil), _.omitBy(o, _.isNil)))
+      return !1;
+  }
+  return !0;
+}
+const checkSchema = (e, t) => {
+  if (e["x-decorator"] === "FormItem") {
+    const o = e.default;
+    if (o && typeof o == "string" && isVariable$1(o) && o.includes(t))
+      return !0;
+  }
+  let n = !1;
+  return e.mapProperties((o) => {
+    checkSchema(o, t) && (n = !0);
+  }), n;
+};
+function useHasUsedVariable() {
+  return { hasUsedVariable: useCallback((t, n) => checkSchema(n, t), []) };
+}
+const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e) => /* @__PURE__ */ jsx(BaseVariableContext.Provider, { value: e, children: e.children }), getChildren$2 = (e, {
+  collectionField: t,
+  uiSchema: n,
+  depth: o,
+  maxDepth: r,
+  noDisabled: i,
+  loadChildren: a,
+  compile: l,
+  isDisabled: c,
+  targetFieldSchema: u,
+  getCollectionField: d,
+  deprecated: p
+}) => e.map((h) => !h.target || h.target === "chinaRegions" ? {
+  key: h.name,
+  value: h.name,
+  label: l(h.title),
+  disabled: p || (i ? !1 : c({ option: h, collectionField: t, uiSchema: n, targetFieldSchema: u, getCollectionField: d })),
+  isLeaf: !0,
+  depth: o
+} : o >= r ? null : {
+  key: h.name,
+  value: h.name,
+  label: l(h.title),
+  isLeaf: !1,
+  field: h,
+  depth: o,
+  disabled: p || (i ? !1 : c({ option: h, collectionField: t, uiSchema: n, targetFieldSchema: u, getCollectionField: d })),
+  loadChildren: a
+}).filter(Boolean), getLabelWithTooltip = (e, t) => t ? /* @__PURE__ */ jsx(Tooltip, { placement: "left", title: t, zIndex: 9999, children: /* @__PURE__ */ jsx(
+  "span",
+  {
+    style: {
+      position: "relative",
+      display: "inline-block",
+      marginLeft: -14,
+      paddingLeft: 14,
+      marginRight: -80,
+      paddingRight: 80,
+      zIndex: 1
+    },
+    children: e
+  }
+) }) : e, useBaseVariable = ({
+  collectionField: e,
+  uiSchema: t,
+  targetFieldSchema: n,
+  maxDepth: o = 3,
+  name: r,
+  title: i,
+  collectionName: a,
+  noChildren: l = !1,
+  // TODO: 等整理完完整测试用例后，再开启该功能
+  noDisabled: c = !0,
+  dataSource: u,
+  returnFields: d = (h) => h,
+  deprecated: p,
+  tooltip: m
+}) => {
+  const h = useCompile(), g = useGetFilterOptions(), { isDisabled: f } = useContext(BaseVariableContext) || {}, C = useCollectionManager(), b = (y) => {
+    var F;
+    if (!((F = y.field) != null && F.target))
+      return Promise.resolve(void 0);
+    const v = y.field.target;
+    return new Promise((I) => {
+      setTimeout(() => {
+        const k = (getChildren$2(d(g(v, u, !0), y), {
+          collectionField: e,
+          uiSchema: t,
+          targetFieldSchema: n,
+          depth: y.depth + 1,
+          maxDepth: o,
+          noDisabled: c,
+          loadChildren: b,
+          compile: h,
+          isDisabled: f || isDisabledDefault,
+          getCollectionField: C.getCollectionField,
+          deprecated: p
+        }) || []).sort((D, j) => D.isLeaf && !j.isLeaf ? -1 : !D.isLeaf && j.isLeaf ? 1 : 0).sort((D, j) => D.disabled && !j.disabled ? 1 : !D.disabled && j.disabled ? -1 : 0);
+        if (k.length === 0) {
+          y.disabled = !0, y.isLeaf = !0, I();
+          return;
+        }
+        y.children = k, I();
+      }, 5);
+    });
+  };
+  return useMemo(() => ({
+    label: getLabelWithTooltip(i, m),
+    value: r,
+    key: r,
+    isLeaf: l,
+    field: {
+      target: a
+    },
+    depth: 0,
+    loadChildren: b,
+    children: [],
+    disabled: !!p,
+    deprecated: p
+  }), [t == null ? void 0 : t["x-component"]]);
+};
+function isDisabledDefault(e) {
+  var a, l;
+  const { option: t, collectionField: n, uiSchema: o, targetFieldSchema: r, getCollectionField: i } = e;
+  return !o || !n ? !0 : n.interface === "json" ? !1 : !n.target && ["hasMany", "belongsToMany"].includes(t.type) ? !0 : !n.target && ["hasOne", "belongsTo"].includes(t.type) || t.target && isSpecialCaseField({ collectionField: n, fieldSchema: r, getCollectionField: i }) ? !1 : ["hasOne", "belongsTo"].includes(n.type) && ["hasMany", "belongsToMany"].includes(t.type) ? !0 : ["hasOne", "belongsTo"].includes(n.type) && ["hasOne", "belongsTo"].includes(t.type) || ["hasMany", "belongsToMany"].includes(n.type) && t.target ? !1 : ["input", "markdown", "richText", "textarea", "username"].includes(n.interface) ? !["string", "number"].includes((a = t.schema) == null ? void 0 : a.type) : n.interface && t.interface ? n.interface !== t.interface : (o == null ? void 0 : o["x-component"]) !== ((l = t.schema) == null ? void 0 : l["x-component"]);
+}
+const CurrentRecordContext = createContext(null), CurrentRecordContextProvider = (e) => {
+  const t = useMemo(() => ({
+    recordData: e.recordData,
+    collectionName: e.collectionName
+  }), [e.recordData, e.collectionName]);
+  return /* @__PURE__ */ jsxs(CurrentRecordContext.Provider, { value: t, children: [
+    " ",
+    e.children,
+    " "
+  ] });
+}, useCurrentRecord = () => useContext(CurrentRecordContext), useCurrentRecordContext = () => {
+  const e = useCurrentRecord(), { name: t } = useBlockContext() || {}, n = useCollection(), o = useCollectionRecordData(), { formRecord: r, collectionName: i } = useFormBlockContext();
+  let a = r != null && r.data ? i : n == null ? void 0 : n.name;
+  return a = (e == null ? void 0 : e.collectionName) || a, {
+    /** 变量值 */
+    currentRecordCtx: (e == null ? void 0 : e.recordData) || (r == null ? void 0 : r.data) || o,
+    /** 用于判断是否需要显示配置项 */
+    shouldDisplayCurrentRecord: !_.isEmpty(_.omit(o, ["__collectionName", "__parent"])) || !!(r != null && r.data),
+    /** 当前记录对应的 collection name */
+    collectionName: a,
+    /** 块类型 */
+    blockType: t,
+    dataSource: n == null ? void 0 : n.dataSource
+  };
+}, useCurrentRecordVariable = (e = {}) => {
+  const { t } = useTranslation(), { currentRecordCtx: n, shouldDisplayCurrentRecord: o, collectionName: r, blockType: i, dataSource: a } = useCurrentRecordContext();
+  return {
+    /** 变量配置 */
+    currentRecordSettings: useBaseVariable({
+      collectionField: e.collectionField,
+      uiSchema: e.schema,
+      name: "$nRecord",
+      title: t("Current record"),
+      collectionName: r,
+      noDisabled: e.noDisabled,
+      targetFieldSchema: e.targetFieldSchema,
+      deprecated: i === "form",
+      tooltip: i === "form" ? t('This variable has been deprecated and can be replaced with "Current form"') : "",
+      dataSource: a
+    }),
+    /** 变量值 */
+    currentRecordCtx: n,
+    /** 用于判断是否需要显示配置项 */
+    shouldDisplayCurrentRecord: o,
+    /** 当前记录对应的 collection name */
+    collectionName: r
+  };
+}, DetailsBlockContext = createContext({});
 DetailsBlockContext.displayName = "DetailsBlockContext";
 const InternalDetailsBlockProvider = (e) => {
-  var p, m, h;
+  var m, h, g;
   const { action: t, readPretty: n } = e, o = useField(), r = useMemo(
     () => createForm({
       readPretty: n
     }),
     [n]
-  ), { resource: i, service: a } = useBlockRequestContext(), l = useCollectionParentRecord(), c = (t === "list" ? (m = (p = a == null ? void 0 : a.data) == null ? void 0 : p.data) == null ? void 0 : m[0] : (h = a == null ? void 0 : a.data) == null ? void 0 : h.data) || {}, u = useRef(), d = useMemo(() => ({
+  ), i = useCollection(), { resource: a, service: l } = useBlockRequestContext(), c = useCollectionParentRecord(), u = (t === "list" ? (h = (m = l == null ? void 0 : l.data) == null ? void 0 : m.data) == null ? void 0 : h[0] : (g = l == null ? void 0 : l.data) == null ? void 0 : g.data) || {}, d = useRef(), p = useMemo(() => ({
     action: t,
     form: r,
     field: o,
-    service: a,
-    resource: i,
-    formBlockRef: u
-  }), [t, o, r, i, a]);
-  return a.loading && !o.loaded ? /* @__PURE__ */ jsx(Spin, {}) : (o.loaded = !0, /* @__PURE__ */ jsx(DetailsBlockContext.Provider, { value: d, children: /* @__PURE__ */ jsx("div", { ref: u, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !1, record: c, parent: l == null ? void 0 : l.data, children: e.children }) }) }));
+    service: l,
+    resource: a,
+    formBlockRef: d
+  }), [t, o, r, a, l]);
+  return l.loading && !o.loaded ? /* @__PURE__ */ jsx(Spin, {}) : (o.loaded = !0, /* @__PURE__ */ jsx(CurrentRecordContextProvider, { recordData: u, collectionName: i == null ? void 0 : i.name, children: /* @__PURE__ */ jsx(DetailsBlockContext.Provider, { value: p, children: /* @__PURE__ */ jsx("div", { ref: d, children: /* @__PURE__ */ jsx(RecordProvider, { isNew: !1, record: u, parent: c == null ? void 0 : c.data, children: e.children }) }) }) }));
 }, useCompatDetailsBlockParams = (e) => {
   const t = useFieldSchema();
   let n, o = !1;
@@ -13869,7 +14117,7 @@ const useFormItemInitializerFields = (e) => {
     label: R,
     type: "subMenu",
     children: [
-      ...getChildren$2({
+      ...getChildren$1({
         name: e,
         association: S,
         collections: k,
@@ -14287,7 +14535,7 @@ const useFormItemInitializerFields = (e) => {
       }
     }
   };
-}, getChildren$2 = ({
+}, getChildren$1 = ({
   name: e,
   association: t,
   collections: n,
@@ -18955,207 +19203,6 @@ const DialogFooter = (e) => {
 };
 FormDialog.Footer = DialogFooter;
 FormDialog.Portal = createPortalProvider("form-dialog");
-const useSpecialCase = () => {
-  const e = useForm(), t = useFieldSchema(), { getField: n } = useCollection_deprecated(), { getCollectionField: o } = useCollectionManager_deprecated(), r = useMemo(() => n(t.name), [t.name, n]), i = useCallback(() => isSpecialCaseField({ collectionField: r, fieldSchema: t, getCollectionField: o }), [r, t, o]), a = useCallback(
-    (l) => {
-      const c = getParentFieldSchema(t);
-      if (c) {
-        const u = e.query(c.name).take();
-        if (u) {
-          const d = _.isEmpty(l) ? [] : _.map(
-            transformValue(l, { field: u, subFieldSchema: t }),
-            (p) => markRecordAsNew(p)
-          );
-          isSubset(d, u.initialValue) || u.setInitialValue(d);
-        }
-      }
-    },
-    [t, e]
-  );
-  return {
-    /**
-     * 特殊情况指的是：当前字段是 `对一` 字段且存在于 `对多` 字段的 `子表格` 或 `子表单` 中
-     * 详细说明见：https://nocobase.feishu.cn/docx/EmNEdEBOnoQohUx2UmBcqIQ5nyh#CUdLdy6OpoPKjyx9DLPc3lqknVc
-     */
-    isSpecialCase: i,
-    setDefaultValue: a
-  };
-};
-function getParentFieldSchema(e) {
-  for (; e != null && e.parent; )
-    if (e = e.parent, isSubMode(e))
-      return e;
-  return e;
-}
-function isSpecialCaseField({
-  collectionField: e,
-  fieldSchema: t,
-  getCollectionField: n
-}) {
-  if (!t.default || !t.default.includes("$context"))
-    return !1;
-  if (e && ["hasOne", "belongsTo"].includes(e.type) && t) {
-    const o = getParentFieldSchema(t);
-    if (o && o["x-collection-field"]) {
-      const r = n(o["x-collection-field"]);
-      if (["hasMany", "belongsToMany"].includes(r == null ? void 0 : r.type))
-        return !0;
-    }
-  }
-  return !1;
-}
-function transformValue(e, t) {
-  const { field: n, subFieldSchema: o } = t, r = n.value;
-  let i = null;
-  return Array.isArray(e) ? i = e.map((l) => ({
-    [o.name]: l
-  })) : i = [
-    {
-      [o.name]: e
-    }
-  ], _.assignWith([...r], i, (l, c) => (!l && c && (c.__notFromDatabase = !0), _.assign(x({}, r[0]), c)));
-}
-const useSubTableSpecialCase = ({ rootField: e, rootSchema: t }) => {
-  const { hasUsedVariable: n } = useHasUsedVariable();
-  useEffect(() => {
-    if (_.isEmpty(e.value) && n("$context", t)) {
-      const o = e.value, r = [markRecordAsNew({})];
-      e.value = r, setTimeout(() => {
-        JSON.stringify(e.value) === JSON.stringify(r) && (e.value = o);
-      });
-    }
-  }, [e, t, n]);
-};
-function isSubset(e, t) {
-  if (e.length !== t.length)
-    return !1;
-  for (let n = 0; n < e.length; n++) {
-    const o = e[n], r = t[n];
-    if (!_.isMatch(_.omitBy(r, _.isNil), _.omitBy(o, _.isNil)))
-      return !1;
-  }
-  return !0;
-}
-const checkSchema = (e, t) => {
-  if (e["x-decorator"] === "FormItem") {
-    const o = e.default;
-    if (o && typeof o == "string" && isVariable$1(o) && o.includes(t))
-      return !0;
-  }
-  let n = !1;
-  return e.mapProperties((o) => {
-    checkSchema(o, t) && (n = !0);
-  }), n;
-};
-function useHasUsedVariable() {
-  return { hasUsedVariable: useCallback((t, n) => checkSchema(n, t), []) };
-}
-const BaseVariableContext = React.createContext(null), BaseVariableProvider = (e) => /* @__PURE__ */ jsx(BaseVariableContext.Provider, { value: e, children: e.children }), getChildren$1 = (e, {
-  collectionField: t,
-  uiSchema: n,
-  depth: o,
-  maxDepth: r,
-  noDisabled: i,
-  loadChildren: a,
-  compile: l,
-  isDisabled: c,
-  targetFieldSchema: u,
-  getCollectionField: d,
-  deprecated: p
-}) => e.map((h) => !h.target || h.target === "chinaRegions" ? {
-  key: h.name,
-  value: h.name,
-  label: l(h.title),
-  disabled: p || (i ? !1 : c({ option: h, collectionField: t, uiSchema: n, targetFieldSchema: u, getCollectionField: d })),
-  isLeaf: !0,
-  depth: o
-} : o >= r ? null : {
-  key: h.name,
-  value: h.name,
-  label: l(h.title),
-  isLeaf: !1,
-  field: h,
-  depth: o,
-  disabled: p || (i ? !1 : c({ option: h, collectionField: t, uiSchema: n, targetFieldSchema: u, getCollectionField: d })),
-  loadChildren: a
-}).filter(Boolean), getLabelWithTooltip = (e, t) => t ? /* @__PURE__ */ jsx(Tooltip, { placement: "left", title: t, zIndex: 9999, children: /* @__PURE__ */ jsx(
-  "span",
-  {
-    style: {
-      position: "relative",
-      display: "inline-block",
-      marginLeft: -14,
-      paddingLeft: 14,
-      marginRight: -80,
-      paddingRight: 80,
-      zIndex: 1
-    },
-    children: e
-  }
-) }) : e, useBaseVariable = ({
-  collectionField: e,
-  uiSchema: t,
-  targetFieldSchema: n,
-  maxDepth: o = 3,
-  name: r,
-  title: i,
-  collectionName: a,
-  noChildren: l = !1,
-  // TODO: 等整理完完整测试用例后，再开启该功能
-  noDisabled: c = !0,
-  dataSource: u,
-  returnFields: d = (h) => h,
-  deprecated: p,
-  tooltip: m
-}) => {
-  const h = useCompile(), g = useGetFilterOptions(), { isDisabled: f } = useContext(BaseVariableContext) || {}, C = useCollectionManager(), b = (y) => {
-    var F;
-    if (!((F = y.field) != null && F.target))
-      return Promise.resolve(void 0);
-    const v = y.field.target;
-    return new Promise((I) => {
-      setTimeout(() => {
-        const k = (getChildren$1(d(g(v, u, !0), y), {
-          collectionField: e,
-          uiSchema: t,
-          targetFieldSchema: n,
-          depth: y.depth + 1,
-          maxDepth: o,
-          noDisabled: c,
-          loadChildren: b,
-          compile: h,
-          isDisabled: f || isDisabledDefault,
-          getCollectionField: C.getCollectionField,
-          deprecated: p
-        }) || []).sort((D, j) => D.isLeaf && !j.isLeaf ? -1 : !D.isLeaf && j.isLeaf ? 1 : 0).sort((D, j) => D.disabled && !j.disabled ? 1 : !D.disabled && j.disabled ? -1 : 0);
-        if (k.length === 0) {
-          y.disabled = !0, y.isLeaf = !0, I();
-          return;
-        }
-        y.children = k, I();
-      }, 5);
-    });
-  };
-  return useMemo(() => ({
-    label: getLabelWithTooltip(i, m),
-    value: r,
-    key: r,
-    isLeaf: l,
-    field: {
-      target: a
-    },
-    depth: 0,
-    loadChildren: b,
-    children: [],
-    disabled: !!p,
-    deprecated: p
-  }), [t == null ? void 0 : t["x-component"]]);
-};
-function isDisabledDefault(e) {
-  var a, l;
-  const { option: t, collectionField: n, uiSchema: o, targetFieldSchema: r, getCollectionField: i } = e;
-  return !o || !n ? !0 : n.interface === "json" ? !1 : !n.target && ["hasMany", "belongsToMany"].includes(t.type) ? !0 : !n.target && ["hasOne", "belongsTo"].includes(t.type) || t.target && isSpecialCaseField({ collectionField: n, fieldSchema: r, getCollectionField: i }) ? !1 : ["hasOne", "belongsTo"].includes(n.type) && ["hasMany", "belongsToMany"].includes(t.type) ? !0 : ["hasOne", "belongsTo"].includes(n.type) && ["hasOne", "belongsTo"].includes(t.type) || ["hasMany", "belongsToMany"].includes(n.type) && t.target ? !1 : ["input", "markdown", "richText", "textarea", "username"].includes(n.interface) ? !["string", "number"].includes((a = t.schema) == null ? void 0 : a.type) : n.interface && t.interface ? n.interface !== t.interface : (o == null ? void 0 : o["x-component"]) !== ((l = t.schema) == null ? void 0 : l["x-component"]);
-}
 const useAPITokenVariable = ({
   noDisabled: e
 } = {}) => {
@@ -20102,42 +20149,6 @@ const ParentCollectionProvider = (e) => {
     dataSource: r,
     defaultValue: i
   };
-}, useCurrentRecordContext = () => {
-  const { name: e } = useBlockContext() || {}, t = useCollection(), n = useCollectionRecordData(), { formRecord: o, collectionName: r } = useFormBlockContext(), i = o != null && o.data ? r : t == null ? void 0 : t.name;
-  return {
-    /** 变量值 */
-    currentRecordCtx: (o == null ? void 0 : o.data) || n,
-    /** 用于判断是否需要显示配置项 */
-    shouldDisplayCurrentRecord: !_.isEmpty(_.omit(n, ["__collectionName", "__parent"])) || !!(o != null && o.data),
-    /** 当前记录对应的 collection name */
-    collectionName: i,
-    /** 块类型 */
-    blockType: e,
-    dataSource: t == null ? void 0 : t.dataSource
-  };
-}, useCurrentRecordVariable = (e = {}) => {
-  const { t } = useTranslation(), { currentRecordCtx: n, shouldDisplayCurrentRecord: o, collectionName: r, blockType: i, dataSource: a } = useCurrentRecordContext();
-  return {
-    /** 变量配置 */
-    currentRecordSettings: useBaseVariable({
-      collectionField: e.collectionField,
-      uiSchema: e.schema,
-      name: "$nRecord",
-      title: t("Current record"),
-      collectionName: r,
-      noDisabled: e.noDisabled,
-      targetFieldSchema: e.targetFieldSchema,
-      deprecated: i === "form",
-      tooltip: i === "form" ? t('This variable has been deprecated and can be replaced with "Current form"') : "",
-      dataSource: a
-    }),
-    /** 变量值 */
-    currentRecordCtx: n,
-    /** 用于判断是否需要显示配置项 */
-    shouldDisplayCurrentRecord: o,
-    /** 当前记录对应的 collection name */
-    collectionName: r
-  };
 }, useVariableOptions = ({
   collectionField: e,
   form: t,
@@ -21956,7 +21967,7 @@ const FormLinkageRules = withDynamicSchemaProps(
     { label: i("Required"), value: ActionType.Required, selected: !1, schema: {} },
     { label: i("Not required"), value: ActionType.InRequired, selected: !1, schema: {} },
     { label: i("Value"), value: ActionType.Value, selected: !1, schema: {} }
-  ].filter((u) => t ? [ActionType.Visible, ActionType.None].includes(u.value) : u), l = (u, d) => {
+  ].filter((u) => t ? [ActionType.Visible, ActionType.None, ActionType.Hidden].includes(u.value) : u), l = (u, d) => {
     var f, C;
     const p = o(u.interface);
     if (!p)
@@ -22358,7 +22369,7 @@ const SchemaSettingsSwitchItem = (e) => {
 });
 SchemaSettingsActionModalItem.displayName = "SchemaSettingsActionModalItem";
 const SchemaSettingsModalItem = (e) => {
-  const N = e, {
+  const E = e, {
     hidden: t,
     title: n,
     components: o,
@@ -22369,8 +22380,8 @@ const SchemaSettingsModalItem = (e) => {
     initialValues: c,
     width: u = "fit-content",
     noRecord: d = !1,
-    ModalContextProvider: p = (E) => /* @__PURE__ */ jsx(Fragment, { children: E.children })
-  } = N, m = K(N, [
+    ModalContextProvider: p = (V) => /* @__PURE__ */ jsx(Fragment, { children: V.children })
+  } = E, m = K(E, [
     "hidden",
     "title",
     "components",
@@ -22382,31 +22393,31 @@ const SchemaSettingsModalItem = (e) => {
     "width",
     "noRecord",
     "ModalContextProvider"
-  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), R = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, D = useFormBlockContext(), j = useBlockContext(), { getOperators: O } = useOperators(), L = useLocationSearch(), M = useVariables$1(), { formValue: w, collection: $, parent: B } = useSubFormValue(), T = useCurrentPopupRecord(), z = useParentPopupRecord();
+  ]), h = useContext(SchemaOptionsContext), g = useCollection(), f = useAPIClient(), C = useApp(), { theme: b } = useGlobalTheme(), S = useBlockRequestContext(), y = useFormActiveFields(), { locale: v } = useContext(ConfigProvider.ConfigContext), F = useDataSourceManager(), I = useDataSourceKey(), R = useCollectionRecord(), { association: k } = useDataBlockProps() || {}, D = useCurrentRecord(), j = useFormBlockContext(), O = useBlockContext(), { getOperators: L } = useOperators(), M = useLocationSearch(), w = useVariables$1(), { formValue: $, collection: B, parent: T } = useSubFormValue(), z = useCurrentPopupRecord(), N = useParentPopupRecord();
   return t ? null : /* @__PURE__ */ jsx(
     SchemaSettingsItem,
     P(x({
       title: n
     }, m), {
       onClick: () => q(void 0, null, function* () {
-        const E = l ? yield l() : c, V = _.isFunction(e.schema) ? e.schema() : e.schema;
+        const V = l ? yield l() : c, G = _.isFunction(e.schema) ? e.schema() : e.schema;
         FormDialog(
-          { title: V.title || n, width: u },
-          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: O(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: M, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: j, children: /* @__PURE__ */ jsx(
+          { title: G.title || n, width: u },
+          () => /* @__PURE__ */ jsx(p, { children: /* @__PURE__ */ jsx(CollectOperators, { defaultOperators: L(), children: /* @__PURE__ */ jsx(VariablesContext.Provider, { value: w, children: /* @__PURE__ */ jsx(BlockContext.Provider, { value: O, children: /* @__PURE__ */ jsx(
             VariablePopupRecordProvider,
             {
-              recordData: T == null ? void 0 : T.value,
-              collection: T == null ? void 0 : T.collection,
+              recordData: z == null ? void 0 : z.value,
+              collection: z == null ? void 0 : z.collection,
               parent: {
-                recordData: z == null ? void 0 : z.value,
-                collection: z == null ? void 0 : z.collection
+                recordData: N == null ? void 0 : N.value,
+                collection: N == null ? void 0 : N.collection
               },
-              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: D, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: w, collection: $, parent: B }, children: /* @__PURE__ */ jsx(
+              children: /* @__PURE__ */ jsx(CollectionRecordProvider, { record: d ? null : R, children: /* @__PURE__ */ jsx(CurrentRecordContextProvider, P(x({}, D), { children: /* @__PURE__ */ jsx(FormBlockContext$1.Provider, { value: j, children: /* @__PURE__ */ jsx(SubFormProvider, { value: { value: $, collection: B, parent: T }, children: /* @__PURE__ */ jsx(
                 FormActiveFieldsProvider,
                 {
                   name: "form",
                   getActiveFieldsName: y == null ? void 0 : y.getActiveFieldsName,
-                  children: /* @__PURE__ */ jsx(LocationSearchContext.Provider, { value: L, children: /* @__PURE__ */ jsx(BlockRequestContext_deprecated.Provider, { value: S, children: /* @__PURE__ */ jsx(DataSourceApplicationProvider, { dataSourceManager: F, dataSource: I, children: /* @__PURE__ */ jsx(
+                  children: /* @__PURE__ */ jsx(LocationSearchContext.Provider, { value: M, children: /* @__PURE__ */ jsx(BlockRequestContext_deprecated.Provider, { value: S, children: /* @__PURE__ */ jsx(DataSourceApplicationProvider, { dataSourceManager: F, dataSource: I, children: /* @__PURE__ */ jsx(
                     AssociationOrCollectionProvider,
                     {
                       allowNull: !0,
@@ -22417,22 +22428,22 @@ const SchemaSettingsModalItem = (e) => {
                         {
                           layout: "vertical",
                           className: css`
-                                              // screen > 576px
-                                              @media (min-width: 576px) {
-                                                min-width: 520px;
-                                              }
+                                                // screen > 576px
+                                                @media (min-width: 576px) {
+                                                  min-width: 520px;
+                                                }
 
-                                              // screen <= 576px
-                                              @media (max-width: 576px) {
-                                                min-width: 320px;
-                                              }
-                                            `,
+                                                // screen <= 576px
+                                                @media (max-width: 576px) {
+                                                  min-width: 320px;
+                                                }
+                                              `,
                           children: /* @__PURE__ */ jsx(ApplicationContext.Provider, { value: C, children: /* @__PURE__ */ jsx(APIClientProvider, { apiClient: f, children: /* @__PURE__ */ jsx(ConfigProvider, { locale: v, children: /* @__PURE__ */ jsx(
                             SchemaComponent,
                             {
                               components: o,
                               scope: r,
-                              schema: V
+                              schema: G
                             }
                           ) }) }) })
                         }
@@ -22440,15 +22451,15 @@ const SchemaSettingsModalItem = (e) => {
                     }
                   ) }) }) })
                 }
-              ) }) }) })
+              ) }) }) })) })
             }
           ) }) }) }) }),
           b
         ).open({
-          initialValues: E,
+          initialValues: V,
           effects: i
-        }).then((G) => (a(G), G)).catch((G) => {
-          console.error(G);
+        }).then((U) => (a(U), U)).catch((U) => {
+          console.error(U);
         });
       }),
       children: e.children || e.title
@@ -27514,7 +27525,15 @@ const formItemWrapCss = css`
               }
             `
         ),
-        children: /* @__PURE__ */ jsx(ACLCollectionFieldProvider, { children: /* @__PURE__ */ jsx(FormItem$1, P(x({ className: l }, e), { extra: a, wrapperStyle: r })) })
+        children: /* @__PURE__ */ jsx(ACLCollectionFieldProvider, { children: /* @__PURE__ */ jsx(
+          FormItem$1,
+          P(x({
+            className: l
+          }, e), {
+            extra: a,
+            wrapperStyle: x(x({}, r.backgroundColor ? { paddingLeft: "5px", paddingRight: "5px" } : {}), r)
+          })
+        ) })
       }
     ) });
   }),
@@ -30051,6 +30070,10 @@ const getVariableComponentWithScope = (e) => (t) => {
         return P(x({}, t), {
           collectionName: e
         });
+      },
+      useVisible() {
+        const { collection: e } = useCurrentPopupRecord() || {}, t = useCollection();
+        return !e || (e == null ? void 0 : e.name) === (t == null ? void 0 : t.name);
       }
     },
     {
@@ -35114,7 +35137,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.0-alpha.11", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.0-alpha.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.1.4",
@@ -35136,9 +35159,9 @@ const name = "@nocobase/client", version = "1.6.0-alpha.11", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.0-alpha.11",
-  "@nocobase/sdk": "1.6.0-alpha.11",
-  "@nocobase/utils": "1.6.0-alpha.11",
+  "@nocobase/evaluators": "1.6.0-alpha.12",
+  "@nocobase/sdk": "1.6.0-alpha.12",
+  "@nocobase/utils": "1.6.0-alpha.12",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -36316,7 +36339,8 @@ const ReadPrettyInternal = observer$1(
             children: m.label
           })
         )
-      )
+      ),
+      maxTagCount: "responsive"
     }, u)
   );
 }, filterOption = (e, t) => {
@@ -36371,7 +36395,8 @@ const ReadPrettyInternal = observer$1(
           var p;
           (p = e.onChange) == null || p.call(e, d === void 0 ? null : d);
         },
-        mode: l
+        mode: l,
+        maxTagCount: "responsive"
       })
     );
   },
@@ -38142,7 +38167,7 @@ connect(
     })
   )
 );
-const UPLOAD_PLACEHOLDER = [
+const publicPath = window.__nocobase_dev_public_path__ || window.__nocobase_public_path__ || "/", UPLOAD_PLACEHOLDER = [
   {
     ext: /\.docx?$/i,
     icon: "/file-placeholder/docx-200-200.png"
@@ -38199,7 +38224,10 @@ const UPLOAD_PLACEHOLDER = [
     ext: /\.(zip|rar|arj|z|gz|iso|jar|ace|tar|uue|dmg|pkg|lzh|cab)$/i,
     icon: "/file-placeholder/zip-200-200.png"
   }
-], UNKNOWN_FILE_ICON = "/file-placeholder/unknown-200-200.png", FILE_SIZE_LIMIT_DEFAULT = 1024 * 1024 * 20;
+].map((e) => ({
+  ext: e.ext,
+  icon: publicPath + e.icon.slice(1)
+})), UNKNOWN_FILE_ICON = publicPath + "file-placeholder/unknown-200-200.png", FILE_SIZE_LIMIT_DEFAULT = 1024 * 1024 * 20;
 class AttachmentFileTypes {
   constructor() {
     A(this, "types", []);