Merge branch 'main' into next

packages/core/client/package.json

@@ -32,8 +32,8 @@
     "@nocobase/utils": "1.4.0-alpha",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
-    "antd-style": "3.4.5",
     "axios": "^1.7.0",
+    "antd-style": "3.7.1",
     "bignumber.js": "^9.1.2",
     "classnames": "^2.3.1",
     "cronstrue": "^2.11.0",

packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts

@@ -7,11 +7,18 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { useForm } from '@formily/react';
 import { useCollectionRecordData } from '../../../../../data-source/collection-record/CollectionRecordProvider';
 import { useSatisfiedActionValues } from '../../../../../schema-settings/LinkageRules/useActionValues';
+import { useFormBlockContext } from '../../../../../block-provider';
+import { useSubFormValue } from '../../../../../schema-component/antd/association-field/hooks';
 export function useDataFormItemProps() {
-  const data = useCollectionRecordData();
+  const record = useCollectionRecordData();
-  const { valueMap: style } = useSatisfiedActionValues({ category: 'style', formValues: data });
+  const { form } = useFormBlockContext();
+  const subForm = useSubFormValue();
+  const { valueMap: style } = useSatisfiedActionValues({
+    category: 'style',
+    formValues: subForm?.formValue || form?.values || record,
+    form,
+  });
   return { wrapperStyle: style };
 }

packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts

@@ -936,7 +936,7 @@ test.describe('actions schema settings', () => {
       ).toBeVisible();
     });
 
-    test('open mode', async ({ page, mockPage }) => {
+    test.skip('open mode', async ({ page, mockPage }) => {
       const nocoPage = await mockPage(testingOfOpenModeForAddChild).waitForInit();
       await nocoPage.goto();
 

packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx

@@ -45,7 +45,7 @@ describe('CollectionSelect', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div
@@ -54,7 +54,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-wwtqkl"
+              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
@@ -84,7 +84,7 @@ describe('CollectionSelect', () => {
                     class="ant-formily-item-control-content-component"
                   >
                     <div
-                      class="ant-select css-dev-only-do-not-override-wwtqkl ant-select-focused ant-select-single ant-select-show-arrow ant-select-show-search"
+                      class="ant-select css-dev-only-do-not-override-11aiz3o ant-select-focused ant-select-single ant-select-show-arrow ant-select-show-search"
                       data-testid="select-collection"
                       role="button"
                     >
@@ -182,7 +182,7 @@ describe('CollectionSelect', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div
@@ -191,7 +191,7 @@ describe('CollectionSelect', () => {
             role="button"
           >
             <div
-              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-wwtqkl"
+              class="css-1yh5po ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-formily-item-label"
@@ -222,7 +222,7 @@ describe('CollectionSelect', () => {
                   >
                     <div>
                       <span
-                        class="ant-tag css-dev-only-do-not-override-wwtqkl"
+                        class="ant-tag css-dev-only-do-not-override-11aiz3o"
                       >
                         Users
                       </span>

packages/core/client/src/schema-component/antd/color-picker/__tests__/ColorPicker.test.tsx

@@ -26,7 +26,7 @@ describe('ColorPicker', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div
@@ -35,7 +35,7 @@ describe('ColorPicker', () => {
             style="display: inline-block;"
           >
             <div
-              class="ant-color-picker-trigger css-dev-only-do-not-override-wwtqkl"
+              class="ant-color-picker-trigger css-dev-only-do-not-override-11aiz3o"
             >
               <div
                 class="ant-color-picker-color-block"
@@ -90,7 +90,7 @@ describe('ColorPicker', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div
@@ -99,7 +99,7 @@ describe('ColorPicker', () => {
             role="button"
           >
             <div
-              class="ant-color-picker-trigger ant-color-picker-sm css-dev-only-do-not-override-wwtqkl ant-color-picker-trigger-disabled"
+              class="ant-color-picker-trigger ant-color-picker-sm css-dev-only-do-not-override-11aiz3o ant-color-picker-trigger-disabled"
             >
               <div
                 class="ant-color-picker-color-block"

packages/core/client/src/schema-component/antd/pagination/__tests__/pagination.test.tsx

@@ -21,12 +21,12 @@ describe('Pagination', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div>
             <ul
-              class="ant-pagination css-dev-only-do-not-override-wwtqkl"
+              class="ant-pagination css-dev-only-do-not-override-11aiz3o"
             >
               <li
                 aria-disabled="true"
@@ -131,7 +131,7 @@ describe('Pagination', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         />
       </div>

packages/core/client/src/schema-component/antd/unix-timestamp/__tests__/UnixTimestamp.test.tsx

@@ -20,11 +20,11 @@ describe('UnixTimestamp', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div
-            class="ant-picker css-dev-only-do-not-override-wwtqkl"
+            class="ant-picker css-dev-only-do-not-override-11aiz3o"
           >
             <div
               class="ant-picker-input"
@@ -77,7 +77,7 @@ describe('UnixTimestamp', () => {
     expect(container).toMatchInlineSnapshot(`
       <div>
         <div
-          class="css-dev-only-do-not-override-wwtqkl ant-app"
+          class="css-dev-only-do-not-override-11aiz3o ant-app"
           style="height: 100%;"
         >
           <div

packages/core/client/src/schema-settings/LinkageRules/useActionValues.ts

@@ -7,7 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
+import { uid } from '@formily/shared';
+import { Form, onFormValuesChange } from '@formily/core';
 import { useVariables, useLocalVariables } from '../../variables';
 import { useFieldSchema } from '@formily/react';
 import { LinkageRuleCategory, LinkageRuleDataKeyMap } from './type';
@@ -18,11 +20,13 @@ export function useSatisfiedActionValues({
   category = 'default',
   rules,
   schema,
+  form,
 }: {
   category: `${LinkageRuleCategory}`;
   formValues: Record<string, any>;
   rules?: any;
   schema?: any;
+  form?: Form;
 }) {
   const [valueMap, setValueMap] = useState({});
   const fieldSchema = useFieldSchema();
@@ -30,8 +34,7 @@ export function useSatisfiedActionValues({
   const localVariables = useLocalVariables({ currentForm: { values: formValues } as any });
   const localSchema = schema ?? fieldSchema;
   const linkageRules = rules ?? localSchema[LinkageRuleDataKeyMap[category]];
-
+  const compute = useCallback(() => {
-  useEffect(() => {
     if (linkageRules && formValues) {
       getSatisfiedValueMap({ rules: linkageRules, variables, localVariables })
         .then((valueMap) => {
@@ -43,6 +46,22 @@ export function useSatisfiedActionValues({
           throw new Error(err.message);
         });
     }
-  }, [variables, localVariables, formValues, linkageRules]);
+  }, [variables, localVariables, linkageRules, formValues]);
+  useEffect(() => {
+    compute();
+  }, [compute]);
+  useEffect(() => {
+    if (form) {
+      const id = uid();
+      form.addEffects(id, () => {
+        onFormValuesChange(() => {
+          compute();
+        });
+      });
+      return () => {
+        form.removeEffects(id);
+      };
+    }
+  }, [form, compute]);
   return { valueMap };
 }

packages/plugins/@nocobase/plugin-calendar/package.json

@@ -17,7 +17,7 @@
     "@formily/react": "2.x",
     "@formily/shared": "2.x",
     "antd": "5.x",
-    "antd-style": "3.4.5",
+    "antd-style": "3.7.1",
     "cron-parser": "4.4.0",
     "dayjs": "^1.11.8",
     "lodash": "^4.17.21",

packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts

@@ -31,7 +31,6 @@ class PluginCollectionTreeServer extends Plugin {
           if (!condition(collection.options)) {
             return;
           }
-          const tk = collection.filterTargetKey as string;
           const name = `${dataSource.name}_${collection.name}_path`;
           const parentForeignKey = collection.treeParentField?.foreignKey || 'parentId';
 
@@ -51,8 +50,9 @@ class PluginCollectionTreeServer extends Plugin {
           //afterCreate
           this.db.on(`${collection.name}.afterCreate`, async (model: Model, options) => {
             const { transaction } = options;
+            const tk = collection.filterTargetKey as string;
             let path = `/${model.get(tk)}`;
-            path = await this.getTreePath(model, path, collection, tk, name, transaction);
+            path = await this.getTreePath(model, path, collection, name, transaction);
             const rootPk = path.split('/')[1];
             await this.app.db.getRepository(name).create({
               values: {
@@ -66,16 +66,18 @@ class PluginCollectionTreeServer extends Plugin {
 
           //afterUpdate
           this.db.on(`${collection.name}.afterUpdate`, async (model: Model, options) => {
+            const tk = collection.filterTargetKey;
             // only update parentId and filterTargetKey
             if (!(model._changed.has(tk) || model._changed.has(parentForeignKey))) {
               return;
             }
             const { transaction } = options;
-            await this.updateTreePath(model, collection, tk, name, transaction);
+            await this.updateTreePath(model, collection, name, transaction);
           });
 
           // after remove
           this.db.on(`${collection.name}.afterBulkUpdate`, async (options) => {
+            const tk = collection.filterTargetKey as string;
             if (!(options.where && options.where[tk])) {
               return;
             }
@@ -86,12 +88,13 @@ class PluginCollectionTreeServer extends Plugin {
               transaction: options.transaction,
             });
             for (const model of instances) {
-              await this.updateTreePath(model, collection, tk, name, options.transaction);
+              await this.updateTreePath(model, collection, name, options.transaction);
             }
           });
 
           //afterDestroy
           this.db.on(`${collection.name}.afterDestroy`, async (model: Model, options: DestroyOptions) => {
+            const tk = collection.filterTargetKey as string;
             await this.app.db.getRepository(name).destroy({
               filter: {
                 nodePk: model.get(tk),
@@ -139,10 +142,10 @@ class PluginCollectionTreeServer extends Plugin {
     model: Model,
     path: string,
     collection: Collection,
-    tk: string,
     pathCollectionName: string,
     transaction?: Transaction,
   ) {
+    const tk = collection.filterTargetKey as string;
     const parentForeignKey = collection.treeParentField?.foreignKey || 'parentId';
     if (model.get(parentForeignKey) && model.get(parentForeignKey) !== null) {
       const parent = await this.app.db.getRepository(collection.name).findOne({
@@ -164,7 +167,7 @@ class PluginCollectionTreeServer extends Plugin {
           });
           const parentPath = lodash.get(parentPathData, 'path', null);
           if (parentPath == null) {
-            path = await this.getTreePath(parent, path, collection, tk, pathCollectionName, transaction);
+            path = await this.getTreePath(parent, path, collection, pathCollectionName, transaction);
           } else {
             path = `${parentPath}/${model.get(tk)}`;
           }
@@ -177,12 +180,12 @@ class PluginCollectionTreeServer extends Plugin {
   private async updateTreePath(
     model: Model,
     collection: Collection,
-    tk: string,
     pathCollectionName: string,
     transaction: Transaction,
   ) {
+    const tk = collection.filterTargetKey as string;
     let path = `/${model.get(tk)}`;
-    path = await this.getTreePath(model, path, collection, tk, pathCollectionName, transaction);
+    path = await this.getTreePath(model, path, collection, pathCollectionName, transaction);
     const collectionTreePath = this.db.getCollection(pathCollectionName);
     const nodePkColumnName = collectionTreePath.getField('nodePk').columnName();
     const pathData = await this.app.db.getRepository(pathCollectionName).findOne({

packages/plugins/@nocobase/plugin-gantt/package.json

@@ -10,7 +10,7 @@
   "homepage": "https://docs.nocobase.com/handbook/block-gantt",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-gantt",
   "devDependencies": {
-    "antd-style": "3.4.5"
+    "antd-style": "3.7.1"
   },
   "peerDependencies": {
     "@nocobase/client": "1.x",