@nocobase/client 0.19.0-alpha.6 → 0.19.0-alpha.8

package/es/block-provider/hooks/index.d.ts

@@ -70,6 +70,7 @@ export declare const useDetailsPaginationProps: () => {
     current: any;
     total: any;
     pageSize: number;
+    showSizeChanger: boolean;
     onChange(page: any): Promise<void>;
     style: {
         marginTop: number;

package/es/index.mjs

@@ -100,7 +100,7 @@ import * as dndKitCore from "@dnd-kit/core";
 import { DndContext as DndContext$1, rectIntersection, DragOverlay, useDraggable, useDroppable, useDndContext, useDndMonitor, useSensor, MouseSensor, useSensors } from "@dnd-kit/core";
 import cronstrue from "cronstrue";
 import * as formilyJsonReactive from "@formily/reactive";
-import { untracked, define, observable, action, reaction, autorun, toJS } from "@formily/reactive";
+import { raw, untracked, define, observable, action, reaction, autorun, toJS } from "@formily/reactive";
 import get from "lodash/get";
 import merge$1 from "lodash/merge";
 import set$1 from "lodash/set";
@@ -312,6 +312,9 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces({
   get ApplicationContext() {
     return ApplicationContext;
   },
+  get AssignedFieldValues() {
+    return AssignedFieldValues;
+  },
   get AssociationField() {
     return AssociationField;
   },
@@ -3482,7 +3485,9 @@ const VariablesProvider = ({ children }) => {
             data = yield waitForData;
             clearRequested(url2);
           }
-          current[key] = data.data.data;
+          if (!raw(current)[key]) {
+            raw(current)[key] = data.data.data;
+          }
           current = getValuesByPath(current, key);
         } else {
           current = getValuesByPath(current, key);
@@ -17377,7 +17382,7 @@ const useParseDefaultValue = () => {
   const variables = useVariables$1();
   const localVariables = useLocalVariables$1();
   const record = useRecord();
-  const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable } = useFlag() || {};
+  const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable, isInSubForm } = useFlag() || {};
   const { getField } = useCollection();
   const { isSpecialCase, setDefaultValue } = useSpecialCase();
   const index2 = useRecordIndex();
@@ -17443,6 +17448,8 @@ const useParseDefaultValue = () => {
         () => run({ forceUpdate: true })
       );
       return dispose;
+    } else if (field.value == null && (isInSubTable || isInSubForm)) {
+      field.setValue(fieldSchema.default);
     }
   }, [fieldSchema.default]);
 };
@@ -18762,14 +18769,14 @@ const useCreateActionProps = () => {
           (_c = (_b2 = __parent == null ? void 0 : __parent.service) == null ? void 0 : _b2.refresh) == null ? void 0 : _c.call(_b2);
           if (!(onSuccess == null ? void 0 : onSuccess.successMessage)) {
             message.success(t("Saved successfully"));
-            yield form.reset();
+            yield form.reset(void 0, { forceClear: true });
             return;
           }
           if (onSuccess == null ? void 0 : onSuccess.manualClose) {
             modal.success({
               title: compile2(onSuccess == null ? void 0 : onSuccess.successMessage),
               onOk: () => __async(this, null, function* () {
-                yield form.reset();
+                yield form.reset(void 0, { forceClear: true });
                 if ((onSuccess == null ? void 0 : onSuccess.redirecting) && (onSuccess == null ? void 0 : onSuccess.redirectTo)) {
                   if (isURL(onSuccess.redirectTo)) {
                     window.location.href = onSuccess.redirectTo;
@@ -18781,7 +18788,7 @@ const useCreateActionProps = () => {
             });
           } else {
             message.success(compile2(onSuccess == null ? void 0 : onSuccess.successMessage));
-            yield form.reset();
+            yield form.reset(void 0, { forceClear: true });
             if ((onSuccess == null ? void 0 : onSuccess.redirecting) && (onSuccess == null ? void 0 : onSuccess.redirectTo)) {
               if (isURL(onSuccess.redirectTo)) {
                 window.location.href = onSuccess.redirectTo;
@@ -19474,6 +19481,7 @@ const useDetailsPaginationProps = () => {
     current: ((_f = (_e = (_d = ctx.service) == null ? void 0 : _d.data) == null ? void 0 : _e.meta) == null ? void 0 : _f.page) || 1,
     total: count,
     pageSize: 1,
+    showSizeChanger: false,
     onChange(page) {
       return __async(this, null, function* () {
         var _a2, _b2;
@@ -19683,16 +19691,22 @@ const useAssociationNames$1 = () => {
       const isAssociationSubfield = s2.name.includes(".");
       const isAssociationField = collectionField && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(collectionField.type);
       if (s2["x-linkage-rules"]) {
-        const rules = s2["x-linkage-rules"];
-        rules.forEach(({ condition }) => {
-          const type2 = Object.keys(condition)[0] || "$and";
-          const list = condition[type2];
+        const collectAppends = (obj) => {
+          const type2 = Object.keys(obj)[0] || "$and";
+          const list = obj[type2];
           list.forEach((item) => {
+            if ("$and" in item || "$or" in item) {
+              return collectAppends(item);
+            }
             const fieldNames = getTargetField$1(item);
             if (fieldNames.length > 1) {
               appends.add(fieldNames.join("."));
             }
           });
+        };
+        const rules = s2["x-linkage-rules"];
+        rules.forEach(({ condition }) => {
+          collectAppends(condition);
         });
       }
       const isTreeCollection = isAssociationField && ((_a = getCollection(collectionField.target)) == null ? void 0 : _a.template) === "tree";
@@ -21518,13 +21532,16 @@ function getAllKeys(obj) {
   return keys;
 }
 const conditionAnalyses = (_0) => __async(void 0, [_0], function* ({
-  rules,
+  ruleGroup,
   variables,
   localVariables
 }) {
-  const type2 = Object.keys(rules)[0] || "$and";
-  const conditions = rules[type2];
+  const type2 = Object.keys(ruleGroup)[0] || "$and";
+  const conditions = ruleGroup[type2];
   let results2 = conditions.map((condition) => __async(void 0, null, function* () {
+    if ("$and" in condition || "$or" in condition) {
+      return yield conditionAnalyses({ ruleGroup: condition, variables, localVariables });
+    }
     const jsonlogic = getInnermostKeyAndValue(condition);
     const operator = jsonlogic == null ? void 0 : jsonlogic.key;
     if (!operator) {
@@ -21571,7 +21588,6 @@ const collectFieldStateOfLinkageRules = ({
   value,
   field,
   condition,
-  values,
   variables,
   localVariables
 }) => {
@@ -21583,13 +21599,17 @@ const collectFieldStateOfLinkageRules = ({
   const { evaluate } = evaluators.get("formula.js");
   switch (operator) {
     case ActionType.Required:
-      requiredResult.push(getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), true));
+      requiredResult.push(
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), true)
+      );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         required: requiredResult
       });
       break;
     case ActionType.InRequired:
-      requiredResult.push(getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), false));
+      requiredResult.push(
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), false)
+      );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         required: requiredResult
       });
@@ -21598,7 +21618,7 @@ const collectFieldStateOfLinkageRules = ({
     case ActionType.None:
     case ActionType.Hidden:
       displayResult.push(
-        getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), operator)
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), operator)
       );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         display: displayResult
@@ -21608,7 +21628,7 @@ const collectFieldStateOfLinkageRules = ({
     case ActionType.ReadOnly:
     case ActionType.ReadPretty:
       patternResult.push(
-        getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), operator)
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), operator)
       );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         pattern: patternResult
@@ -21641,7 +21661,7 @@ const collectFieldStateOfLinkageRules = ({
           valueResult.push(getTempFieldState(true, getValue2()));
         } else {
           valueResult.push(
-            getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), getValue2())
+            getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), getValue2())
           );
         }
         field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -21676,7 +21696,7 @@ function replaceVariables(_0, _1) {
     }
     return {
       exp: value.replace(REGEX_OF_VARIABLE, (match) => {
-        return store[match] || match;
+        return `{{${store[match] || match}}}`;
       }),
       scope
     };
@@ -21918,7 +21938,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
   const displayResult = ((_b = field == null ? void 0 : field.stateOfLinkageRules) == null ? void 0 : _b.display) || ["visible"];
   switch (operator) {
     case ActionType.Visible:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         displayResult.push(operator);
         field.data = field.data || {};
         field.data.hidden = false;
@@ -21929,7 +21949,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       field.display = last(displayResult);
       break;
     case ActionType.Hidden:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         field.data = field.data || {};
         field.data.hidden = true;
       } else {
@@ -21938,7 +21958,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       }
       break;
     case ActionType.Disabled:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         disableResult.push(true);
       }
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -21948,7 +21968,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       field.componentProps["disabled"] = last(disableResult);
       break;
     case ActionType.Active:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         disableResult.push(false);
       }
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -22148,18 +22168,12 @@ function AssignedFieldValues() {
   const { dn } = useDesignable();
   const { t } = useTranslation();
   const fieldSchema = useFieldSchema();
-  const field = useField();
-  const [initialSchema, setInitialSchema] = useState();
-  useEffect(() => {
-    const schemaUid = uid();
-    const schema3 = {
-      type: "void",
-      "x-uid": schemaUid,
-      "x-component": "Grid",
-      "x-initializer": "CustomFormItemInitializers"
-    };
-    setInitialSchema(schema3);
-  }, [field.address]);
+  const initialSchema = {
+    type: "void",
+    "x-uid": uid(),
+    "x-component": "Grid",
+    "x-initializer": "CustomFormItemInitializers"
+  };
   const tips = {
     "customize:update": t(
       "After clicking the custom button, the following fields of the current record will be saved according to the following form."
@@ -29839,7 +29853,7 @@ const WithForm = (props) => {
                     const result = [fieldValuesInCondition, variableValuesInCondition, variableValuesInExpression].map((item) => JSON.stringify(item)).join(",");
                     return result;
                   },
-                  getSubscriber(action2, field, rule, form2, variables, localVariables),
+                  getSubscriber(action2, field, rule, variables, localVariables),
                   { fireImmediately: true }
                 )
               );
@@ -29892,20 +29906,20 @@ const Form$1 = observer$1(
   },
   { displayName: "Form" }
 );
-function getSubscriber(action2, field, rule, form, variables, localVariables) {
+function getSubscriber(action2, field, rule, variables, localVariables) {
   return () => {
     collectFieldStateOfLinkageRules({
       operator: action2.operator,
       value: action2.value,
       field,
       condition: rule.condition,
-      values: form.values,
       variables,
       localVariables
     });
     setTimeout(() => __async(this, null, function* () {
+      var _a;
       const fieldName = getFieldNameByOperator(action2.operator);
-      if (!field.stateOfLinkageRules[fieldName]) {
+      if (!((_a = field.stateOfLinkageRules) == null ? void 0 : _a[fieldName])) {
         return;
       }
       let stateList = field.stateOfLinkageRules[fieldName];
@@ -41035,6 +41049,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   ActionContextProvider,
   ActionDesigner,
   AppendsTreeSelect,
+  AssignedFieldValues,
   AssociationField,
   AssociationSelect,
   AutoComplete,
@@ -51449,7 +51464,7 @@ const DeleteCollectionAction = (props) => {
   const Title = () => {
     return /* @__PURE__ */ jsxs("span", { children: [
       /* @__PURE__ */ jsx(ExclamationCircleFilled, { style: { color: "#faad14", marginRight: "12px", fontSize: "22px" } }),
-      /* @__PURE__ */ jsx("span", { style: { fontSize: "19px" }, children: t("Delete record") })
+      /* @__PURE__ */ jsx("span", { style: { fontSize: "19px" }, children: t("Delete collection") })
     ] });
   };
   return /* @__PURE__ */ jsx(RecordProvider, { record, children: /* @__PURE__ */ jsxs(ActionContextProvider, { value: { visible, setVisible }, children: [
@@ -51466,7 +51481,7 @@ const DeleteCollectionAction = (props) => {
               "x-component": "Action.Modal",
               title: /* @__PURE__ */ jsx(Title, {}),
               "x-component-props": {
-                width: 500,
+                width: 520,
                 getContainer: "{{ getContainer }}",
                 className: css`
                     .ant-modal-body {
@@ -51509,7 +51524,10 @@ const DeleteCollectionAction = (props) => {
                       "x-component": "Action",
                       "x-component-props": {
                         type: "primary",
-                        useAction: "{{ useDestroyCollectionAction }}"
+                        useAction: "{{ useDestroyCollectionAction }}",
+                        style: {
+                          marginLeft: "8px"
+                        }
                       }
                     }
                   }
@@ -56051,7 +56069,7 @@ const PinnedPluginList = () => {
           background: none;
           color: rgba(255, 255, 255, 0.65);
           &:hover {
-            background: rgba(255, 255, 255, 0.1);
+            background: rgba(255, 255, 255, 0.1) !important;
           }
         }
       `,
@@ -61411,6 +61429,7 @@ export {
   AppendsTreeSelect,
   Application,
   ApplicationContext,
+  AssignedFieldValues,
   AssociationField,
   AssociationFilter,
   AssociationFilterDesignerDelete,

package/es/schema-component/antd/action/Action.Designer.d.ts

@@ -2,6 +2,7 @@ import { ModalProps } from 'antd';
 import React from 'react';
 import { SchemaSettingOptions, SchemaSettings } from '../../../application/schema-settings';
 declare function ButtonEditor(props: any): React.JSX.Element;
+export declare function AssignedFieldValues(): React.JSX.Element;
 declare function RemoveButton(props?: {
     onConfirmOk?: ModalProps['onOk'];
 }): React.JSX.Element;

package/es/schema-component/antd/form-v2/utils.d.ts

@@ -7,7 +7,6 @@ interface Props {
         [key: string]: any;
     };
     condition: any;
-    values: any;
     variables: VariablesContextType;
     localVariables: VariableOption[];
 }
@@ -18,5 +17,5 @@ export declare function getTempFieldState(condition: boolean | Promise<boolean>,
     condition: boolean;
     value: any;
 }>;
-export declare const collectFieldStateOfLinkageRules: ({ operator, value, field, condition, values, variables, localVariables, }: Props) => any;
+export declare const collectFieldStateOfLinkageRules: ({ operator, value, field, condition, variables, localVariables, }: Props) => any;
 export {};

package/es/schema-component/common/utils/uitls.d.ts

@@ -11,8 +11,8 @@ export declare function getInnermostKeyAndValue(obj: any): {
     value: any;
 };
 export declare const getTargetField: (obj: any) => any[];
-export declare const conditionAnalyses: ({ rules, variables, localVariables, }: {
-    rules: any;
+export declare const conditionAnalyses: ({ ruleGroup, variables, localVariables, }: {
+    ruleGroup: any;
     variables: VariablesContextType;
     localVariables: VariableOption[];
 }) => Promise<boolean>;

package/lib/index.js

@@ -72,6 +72,7 @@ __export(es_exports, {
   AppendsTreeSelect: () => AppendsTreeSelect,
   Application: () => Application,
   ApplicationContext: () => ApplicationContext,
+  AssignedFieldValues: () => AssignedFieldValues,
   AssociationField: () => AssociationField,
   AssociationFilter: () => AssociationFilter,
   AssociationFilterDesignerDelete: () => AssociationFilterDesignerDelete,
@@ -1044,6 +1045,9 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces$1({
   get ApplicationContext() {
     return ApplicationContext;
   },
+  get AssignedFieldValues() {
+    return AssignedFieldValues;
+  },
   get AssociationField() {
     return AssociationField;
   },
@@ -4213,7 +4217,9 @@ const VariablesProvider = ({ children }) => {
             data = yield waitForData;
             clearRequested(url2);
           }
-          current[key] = data.data.data;
+          if (!(0, import_reactive.raw)(current)[key]) {
+            (0, import_reactive.raw)(current)[key] = data.data.data;
+          }
           current = (0, import_client.getValuesByPath)(current, key);
         } else {
           current = (0, import_client.getValuesByPath)(current, key);
@@ -18108,7 +18114,7 @@ const useParseDefaultValue = () => {
   const variables = useVariables$1();
   const localVariables = useLocalVariables$1();
   const record = useRecord();
-  const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable } = useFlag() || {};
+  const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable, isInSubForm } = useFlag() || {};
   const { getField } = useCollection();
   const { isSpecialCase, setDefaultValue } = useSpecialCase();
   const index2 = useRecordIndex();
@@ -18174,6 +18180,8 @@ const useParseDefaultValue = () => {
         () => run({ forceUpdate: true })
       );
       return dispose;
+    } else if (field.value == null && (isInSubTable || isInSubForm)) {
+      field.setValue(fieldSchema.default);
     }
   }, [fieldSchema.default]);
 };
@@ -19493,14 +19501,14 @@ const useCreateActionProps = () => {
           (_c = (_b2 = __parent == null ? void 0 : __parent.service) == null ? void 0 : _b2.refresh) == null ? void 0 : _c.call(_b2);
           if (!(onSuccess == null ? void 0 : onSuccess.successMessage)) {
             import_antd.message.success(t("Saved successfully"));
-            yield form.reset();
+            yield form.reset(void 0, { forceClear: true });
             return;
           }
           if (onSuccess == null ? void 0 : onSuccess.manualClose) {
             modal.success({
               title: compile2(onSuccess == null ? void 0 : onSuccess.successMessage),
               onOk: () => __async(this, null, function* () {
-                yield form.reset();
+                yield form.reset(void 0, { forceClear: true });
                 if ((onSuccess == null ? void 0 : onSuccess.redirecting) && (onSuccess == null ? void 0 : onSuccess.redirectTo)) {
                   if ((0, import_client.isURL)(onSuccess.redirectTo)) {
                     window.location.href = onSuccess.redirectTo;
@@ -19512,7 +19520,7 @@ const useCreateActionProps = () => {
             });
           } else {
             import_antd.message.success(compile2(onSuccess == null ? void 0 : onSuccess.successMessage));
-            yield form.reset();
+            yield form.reset(void 0, { forceClear: true });
             if ((onSuccess == null ? void 0 : onSuccess.redirecting) && (onSuccess == null ? void 0 : onSuccess.redirectTo)) {
               if ((0, import_client.isURL)(onSuccess.redirectTo)) {
                 window.location.href = onSuccess.redirectTo;
@@ -20205,6 +20213,7 @@ const useDetailsPaginationProps = () => {
     current: ((_f = (_e = (_d = ctx.service) == null ? void 0 : _d.data) == null ? void 0 : _e.meta) == null ? void 0 : _f.page) || 1,
     total: count,
     pageSize: 1,
+    showSizeChanger: false,
     onChange(page) {
       return __async(this, null, function* () {
         var _a2, _b2;
@@ -20414,16 +20423,22 @@ const useAssociationNames$1 = () => {
       const isAssociationSubfield = s2.name.includes(".");
       const isAssociationField = collectionField && ["hasOne", "hasMany", "belongsTo", "belongsToMany"].includes(collectionField.type);
       if (s2["x-linkage-rules"]) {
-        const rules = s2["x-linkage-rules"];
-        rules.forEach(({ condition }) => {
-          const type2 = Object.keys(condition)[0] || "$and";
-          const list = condition[type2];
+        const collectAppends = (obj) => {
+          const type2 = Object.keys(obj)[0] || "$and";
+          const list = obj[type2];
           list.forEach((item) => {
+            if ("$and" in item || "$or" in item) {
+              return collectAppends(item);
+            }
             const fieldNames = getTargetField$1(item);
             if (fieldNames.length > 1) {
               appends.add(fieldNames.join("."));
             }
           });
+        };
+        const rules = s2["x-linkage-rules"];
+        rules.forEach(({ condition }) => {
+          collectAppends(condition);
         });
       }
       const isTreeCollection = isAssociationField && ((_a = getCollection(collectionField.target)) == null ? void 0 : _a.template) === "tree";
@@ -22249,13 +22264,16 @@ function getAllKeys(obj) {
   return keys;
 }
 const conditionAnalyses = (_0) => __async(void 0, [_0], function* ({
-  rules,
+  ruleGroup,
   variables,
   localVariables
 }) {
-  const type2 = Object.keys(rules)[0] || "$and";
-  const conditions = rules[type2];
+  const type2 = Object.keys(ruleGroup)[0] || "$and";
+  const conditions = ruleGroup[type2];
   let results2 = conditions.map((condition) => __async(void 0, null, function* () {
+    if ("$and" in condition || "$or" in condition) {
+      return yield conditionAnalyses({ ruleGroup: condition, variables, localVariables });
+    }
     const jsonlogic = getInnermostKeyAndValue(condition);
     const operator = jsonlogic == null ? void 0 : jsonlogic.key;
     if (!operator) {
@@ -22302,7 +22320,6 @@ const collectFieldStateOfLinkageRules = ({
   value,
   field,
   condition,
-  values,
   variables,
   localVariables
 }) => {
@@ -22314,13 +22331,17 @@ const collectFieldStateOfLinkageRules = ({
   const { evaluate } = import_client3.evaluators.get("formula.js");
   switch (operator) {
     case ActionType.Required:
-      requiredResult.push(getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), true));
+      requiredResult.push(
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), true)
+      );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         required: requiredResult
       });
       break;
     case ActionType.InRequired:
-      requiredResult.push(getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), false));
+      requiredResult.push(
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), false)
+      );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         required: requiredResult
       });
@@ -22329,7 +22350,7 @@ const collectFieldStateOfLinkageRules = ({
     case ActionType.None:
     case ActionType.Hidden:
       displayResult.push(
-        getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), operator)
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), operator)
       );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         display: displayResult
@@ -22339,7 +22360,7 @@ const collectFieldStateOfLinkageRules = ({
     case ActionType.ReadOnly:
     case ActionType.ReadPretty:
       patternResult.push(
-        getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), operator)
+        getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), operator)
       );
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
         pattern: patternResult
@@ -22372,7 +22393,7 @@ const collectFieldStateOfLinkageRules = ({
           valueResult.push(getTempFieldState(true, getValue2()));
         } else {
           valueResult.push(
-            getTempFieldState(conditionAnalyses({ rules: condition, variables, localVariables }), getValue2())
+            getTempFieldState(conditionAnalyses({ ruleGroup: condition, variables, localVariables }), getValue2())
           );
         }
         field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -22407,7 +22428,7 @@ function replaceVariables(_0, _1) {
     }
     return {
       exp: value.replace(REGEX_OF_VARIABLE, (match) => {
-        return store[match] || match;
+        return `{{${store[match] || match}}}`;
       }),
       scope
     };
@@ -22649,7 +22670,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
   const displayResult = ((_b = field == null ? void 0 : field.stateOfLinkageRules) == null ? void 0 : _b.display) || ["visible"];
   switch (operator) {
     case ActionType.Visible:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         displayResult.push(operator);
         field.data = field.data || {};
         field.data.hidden = false;
@@ -22660,7 +22681,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       field.display = (0, import_lodash.last)(displayResult);
       break;
     case ActionType.Hidden:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         field.data = field.data || {};
         field.data.hidden = true;
       } else {
@@ -22669,7 +22690,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       }
       break;
     case ActionType.Disabled:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         disableResult.push(true);
       }
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -22679,7 +22700,7 @@ const linkageAction = (_0) => __async(void 0, [_0], function* ({
       field.componentProps["disabled"] = (0, import_lodash.last)(disableResult);
       break;
     case ActionType.Active:
-      if (yield conditionAnalyses({ rules: condition, variables, localVariables })) {
+      if (yield conditionAnalyses({ ruleGroup: condition, variables, localVariables })) {
         disableResult.push(false);
       }
       field.stateOfLinkageRules = __spreadProps(__spreadValues({}, field.stateOfLinkageRules), {
@@ -22879,18 +22900,12 @@ function AssignedFieldValues() {
   const { dn } = useDesignable();
   const { t } = (0, import_react_i18next.useTranslation)();
   const fieldSchema = (0, import_react.useFieldSchema)();
-  const field = (0, import_react.useField)();
-  const [initialSchema, setInitialSchema] = (0, import_react2.useState)();
-  (0, import_react2.useEffect)(() => {
-    const schemaUid = (0, import_shared.uid)();
-    const schema3 = {
-      type: "void",
-      "x-uid": schemaUid,
-      "x-component": "Grid",
-      "x-initializer": "CustomFormItemInitializers"
-    };
-    setInitialSchema(schema3);
-  }, [field.address]);
+  const initialSchema = {
+    type: "void",
+    "x-uid": (0, import_shared.uid)(),
+    "x-component": "Grid",
+    "x-initializer": "CustomFormItemInitializers"
+  };
   const tips = {
     "customize:update": t(
       "After clicking the custom button, the following fields of the current record will be saved according to the following form."
@@ -30570,7 +30585,7 @@ const WithForm = (props) => {
                     const result = [fieldValuesInCondition, variableValuesInCondition, variableValuesInExpression].map((item) => JSON.stringify(item)).join(",");
                     return result;
                   },
-                  getSubscriber(action2, field, rule, form2, variables, localVariables),
+                  getSubscriber(action2, field, rule, variables, localVariables),
                   { fireImmediately: true }
                 )
               );
@@ -30623,20 +30638,20 @@ const Form$1 = (0, import_react.observer)(
   },
   { displayName: "Form" }
 );
-function getSubscriber(action2, field, rule, form, variables, localVariables) {
+function getSubscriber(action2, field, rule, variables, localVariables) {
   return () => {
     collectFieldStateOfLinkageRules({
       operator: action2.operator,
       value: action2.value,
       field,
       condition: rule.condition,
-      values: form.values,
       variables,
       localVariables
     });
     setTimeout(() => __async(this, null, function* () {
+      var _a;
       const fieldName = getFieldNameByOperator(action2.operator);
-      if (!field.stateOfLinkageRules[fieldName]) {
+      if (!((_a = field.stateOfLinkageRules) == null ? void 0 : _a[fieldName])) {
         return;
       }
       let stateList = field.stateOfLinkageRules[fieldName];
@@ -41766,6 +41781,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   ActionContextProvider,
   ActionDesigner,
   AppendsTreeSelect,
+  AssignedFieldValues,
   AssociationField,
   AssociationSelect,
   AutoComplete,
@@ -52180,7 +52196,7 @@ const DeleteCollectionAction = (props) => {
   const Title = () => {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_icons.ExclamationCircleFilled, { style: { color: "#faad14", marginRight: "12px", fontSize: "22px" } }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { fontSize: "19px" }, children: t("Delete record") })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { style: { fontSize: "19px" }, children: t("Delete collection") })
     ] });
   };
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RecordProvider, { record, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(ActionContextProvider, { value: { visible, setVisible }, children: [
@@ -52197,7 +52213,7 @@ const DeleteCollectionAction = (props) => {
               "x-component": "Action.Modal",
               title: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Title, {}),
               "x-component-props": {
-                width: 500,
+                width: 520,
                 getContainer: "{{ getContainer }}",
                 className: import_css.css`
                     .ant-modal-body {
@@ -52240,7 +52256,10 @@ const DeleteCollectionAction = (props) => {
                       "x-component": "Action",
                       "x-component-props": {
                         type: "primary",
-                        useAction: "{{ useDestroyCollectionAction }}"
+                        useAction: "{{ useDestroyCollectionAction }}",
+                        style: {
+                          marginLeft: "8px"
+                        }
                       }
                     }
                   }
@@ -56782,7 +56801,7 @@ const PinnedPluginList = () => {
           background: none;
           color: rgba(255, 255, 255, 0.65);
           &:hover {
-            background: rgba(255, 255, 255, 0.1);
+            background: rgba(255, 255, 255, 0.1) !important;
           }
         }
       `,

package/lib/locale/en_US.js

@@ -200,6 +200,7 @@ module.exports = {
   "Before change": "Before change",
   "After change": "After change",
   "Delete record": "Delete record",
+  "Delete collection": "Delete collection",
   "Create collection": "Create collection",
   "Collection display name": "Collection display name",
   "Collection name": "Collection name",

package/lib/locale/ja_JP.js

@@ -171,6 +171,7 @@ module.exports = {
   "Before change": "\u5909\u66F4\u524D",
   "After change": "\u5909\u66F4\u5F8C",
   "Delete record": "\u30EC\u30B3\u30FC\u30C9\u524A\u9664",
+  "Delete collection": "\u30C7\u30FC\u30BF\u30C6\u30FC\u30D6\u30EB\u306E\u524A\u9664",
   "Create collection": "\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u4F5C\u6210",
   "Collection display name": "\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u540D",
   "Collection name": "\u30B3\u30EC\u30AF\u30B7\u30E7\u30F3\u8B58\u5225\u5B50",

package/lib/locale/zh-CN.js

@@ -210,6 +210,7 @@ module.exports = {
   "Before change": "\u53D8\u66F4\u524D",
   "After change": "\u53D8\u66F4\u540E",
   "Delete record": "\u5220\u9664\u6570\u636E",
+  "Delete collection": "\u5220\u9664\u6570\u636E\u8868",
   "Create collection": "\u521B\u5EFA\u6570\u636E\u8868",
   "Collection display name": "\u6570\u636E\u8868\u540D\u79F0",
   "Collection name": "\u6570\u636E\u8868\u6807\u8BC6",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.19.0-alpha.6",
+  "version": "0.19.0-alpha.8",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.19.0-alpha.6",
-    "@nocobase/sdk": "0.19.0-alpha.6",
-    "@nocobase/utils": "0.19.0-alpha.6",
+    "@nocobase/evaluators": "0.19.0-alpha.8",
+    "@nocobase/sdk": "0.19.0-alpha.8",
+    "@nocobase/utils": "0.19.0-alpha.8",
     "ahooks": "^3.7.2",
     "antd": "^5.12.8",
     "antd-style": "3.4.5",
@@ -72,5 +72,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.19"
   },
-  "gitHead": "2eb524db98c7f4136fe1a9a1b1259cd72cf6635f"
+  "gitHead": "b8fbe613e320e40ebf2da1bf64907eab0197b589"
 }