From 2fa26828d2696ab883615cae02b7035f5ef6cecd Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Thu, 12 Jun 2025 23:50:30 +0800
Subject: [PATCH 1/6] feat: add quick copy plugin (#6954)

* Revert "Revert "feat: new plugin `plugin-input-copy-button` (#6894)""

This reverts commit 49511e2dd6656c72b79f9bd05f61ed7673b1d075.

* Revert "Revert "fix: improve visibility toggle for input copy button on mouse events""

This reverts commit 9137ad651506718626f22ee48bd8c839baf6bf91.

* fix: update version to 1.6.34 for input copy button plugin

* fix: adjust margin style for InputCopyButton based on field readPretty state

* fix: remove unused keywords from package.json for input copy button plugin

* fix: add input copy button plugin to dependencies in package.json

* fix: update version of input copy button plugin to 1.6.36

* chore: update version of @nocobase/plugin-input-copy-button to 1.7.10

* refactor: rename to plugin-text-copy

* fix: update translation key from 'Show copy button' to 'Display copy button'

* fix: add optional chaining to event listener for safety

* test(e2e): update visibility check for 'Data sources' menu item in plugin settings permissions test
---
 .../antd/input/ReadPretty.tsx                 |  16 ++-
 .../src/client/__e2e__/configure.test.ts      |   2 +-
 .../@nocobase/plugin-text-copy/.gitignore     |   1 +
 .../@nocobase/plugin-text-copy/.npmignore     |   2 +
 .../@nocobase/plugin-text-copy/README.md      |   0
 .../@nocobase/plugin-text-copy/client.d.ts    |   2 +
 .../@nocobase/plugin-text-copy/client.js      |   1 +
 .../@nocobase/plugin-text-copy/package.json   |  28 +++++
 .../@nocobase/plugin-text-copy/server.d.ts    |   2 +
 .../@nocobase/plugin-text-copy/server.js      |   1 +
 .../plugin-text-copy/src/client/index.tsx     | 112 ++++++++++++++++++
 .../@nocobase/plugin-text-copy/src/index.ts   |  11 ++
 .../plugin-text-copy/src/locale/en-US.json    |   3 +
 .../plugin-text-copy/src/locale/ja-JP.json    |   3 +
 .../plugin-text-copy/src/locale/zh-CN.json    |   3 +
 .../plugin-text-copy/src/server/index.ts      |  18 +++
 packages/presets/nocobase/package.json        |   2 +
 17 files changed, 201 insertions(+), 6 deletions(-)
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/.gitignore
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/.npmignore
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/README.md
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/client.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/client.js
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/package.json
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/server.d.ts
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/server.js
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/client/index.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/index.ts
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/locale/en-US.json
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/locale/ja-JP.json
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/locale/zh-CN.json
 create mode 100644 packages/plugins/@nocobase/plugin-text-copy/src/server/index.ts

diff --git a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
index 770c530b7b2..479d07a25d2 100644
--- a/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
+++ b/packages/core/client/src/schema-component/antd/input/ReadPretty.tsx
@@ -59,13 +59,19 @@ ReadPretty.Input = (props: InputReadPrettyProps) => {
   return (
     <div
       className={cls(prefixCls, props.className)}
-      style={{ overflowWrap: 'break-word', whiteSpace: 'normal', ...props.style }}
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        overflowWrap: 'break-word',
+        whiteSpace: 'normal',
+        ...props.style,
+      }}
     >
-      {props.addonBefore}
-      {props.prefix}
+      {compile(props.addonBefore)}
+      {compile(props.prefix)}
       {props.ellipsis ? <EllipsisWithTooltip ellipsis={props.ellipsis}>{content}</EllipsisWithTooltip> : content}
-      {props.suffix}
-      {props.addonAfter}
+      {compile(props.suffix)}
+      {compile(props.addonAfter)}
     </div>
   );
 };
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
index cb949854ca8..4782757b8f6 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
@@ -155,5 +155,5 @@ test('plugin settings permissions', async ({ page, mockPage, mockRole, updateRol
   await expect(page.getByRole('link', { name: 'Users & Permissions' })).toBeVisible();
   await expect(page.getByRole('link', { name: 'Authentication' })).toBeVisible();
   await page.getByRole('link', { name: 'Users & Permissions' }).click();
-  await expect(page.getByRole('menuitem', { name: 'Data sources' })).toBeVisible();
+  await expect(page.getByRole('menuitem', { name: 'Data sources' }).first()).toBeVisible();
 });
diff --git a/packages/plugins/@nocobase/plugin-text-copy/.gitignore b/packages/plugins/@nocobase/plugin-text-copy/.gitignore
new file mode 100644
index 00000000000..0f33a9bba1a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/.gitignore
@@ -0,0 +1 @@
+dist 
diff --git a/packages/plugins/@nocobase/plugin-text-copy/.npmignore b/packages/plugins/@nocobase/plugin-text-copy/.npmignore
new file mode 100644
index 00000000000..65f5e8779f4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-text-copy/README.md b/packages/plugins/@nocobase/plugin-text-copy/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/plugins/@nocobase/plugin-text-copy/client.d.ts b/packages/plugins/@nocobase/plugin-text-copy/client.d.ts
new file mode 100644
index 00000000000..6c459cbac4c
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-text-copy/client.js b/packages/plugins/@nocobase/plugin-text-copy/client.js
new file mode 100644
index 00000000000..b6e3be70e63
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-text-copy/package.json b/packages/plugins/@nocobase/plugin-text-copy/package.json
new file mode 100644
index 00000000000..5355429374f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@nocobase/plugin-text-copy",
+  "version": "1.7.10",
+  "main": "./dist/server/index.js",
+  "displayName": "Text copy",
+  "displayName.zh-CN": "文本复制",
+  "description": "Add copy button to text fields",
+  "description.zh-CN": "为文本字段添加复制按钮",
+  "license": "AGPL-3.0",
+  "homepage": "https://www.nocobase.com",
+  "devDependencies": {
+    "@ant-design/icons": "5.x",
+    "@formily/react": "2.x",
+    "antd": "5.x",
+    "react": "^18.2.0",
+    "react-i18next": "^11.15.1"
+  },
+  "peerDependencies": {
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
+  },
+  "keywords": [
+    "Clipboard",
+    "Copy"
+  ],
+  "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1"
+}
diff --git a/packages/plugins/@nocobase/plugin-text-copy/server.d.ts b/packages/plugins/@nocobase/plugin-text-copy/server.d.ts
new file mode 100644
index 00000000000..c41081ddc6d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-text-copy/server.js b/packages/plugins/@nocobase/plugin-text-copy/server.js
new file mode 100644
index 00000000000..972842039a6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/client/index.tsx b/packages/plugins/@nocobase/plugin-text-copy/src/client/index.tsx
new file mode 100644
index 00000000000..42addb8ffc3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/client/index.tsx
@@ -0,0 +1,112 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Field } from '@formily/core';
+import { observer, useField, useFieldSchema } from '@formily/react';
+import { Plugin, useColumnSchema, useDesignable, useToken } from '@nocobase/client';
+import { Typography } from 'antd';
+import _ from 'lodash';
+import React, { FC, useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+
+// Define namespace for i18n
+const NAMESPACE = 'text-copy';
+
+const TextCopyButton: FC = observer(
+  () => {
+    const field = useField<Field>();
+    const { token } = useToken();
+    const buttonRef = useRef<HTMLDivElement | null>(null);
+    const [show, setShow] = React.useState(false);
+
+    useEffect(() => {
+      if (field.value && field.readPretty && buttonRef.current) {
+        const currentRef = buttonRef.current;
+        const handleMouseOver = (e: MouseEvent) => {
+          setShow(true);
+        };
+        const handleMouseOut = (e: MouseEvent) => {
+          setShow(false);
+        };
+
+        currentRef?.parentElement?.addEventListener('mouseover', handleMouseOver);
+        currentRef?.parentElement?.addEventListener('mouseout', handleMouseOut);
+
+        return () => {
+          currentRef?.parentElement?.removeEventListener('mouseover', handleMouseOver);
+          currentRef?.parentElement?.removeEventListener('mouseout', handleMouseOut);
+        };
+      }
+    }, [field.readPretty, field.value]);
+
+    const hidden = field.readPretty && (!field.value || !show);
+
+    return (
+      <Typography.Text
+        ref={buttonRef}
+        copyable={{
+          text: field.value,
+        }}
+        style={{ marginLeft: field.readPretty ? token.marginXXS : 0, opacity: hidden ? 0 : 1 }}
+      />
+    );
+  },
+  {
+    displayName: 'TextCopyButton',
+  },
+);
+
+class PluginTextCopy extends Plugin {
+  async load() {
+    const copyButton = <TextCopyButton />;
+
+    this.app.addScopes({
+      TextCopyButton: copyButton,
+    });
+
+    // Add the schema settings to enable/disable the copy functionality
+    this.app.schemaSettingsManager.addItem('fieldSettings:component:Input', 'enableCopier', {
+      type: 'switch',
+      useComponentProps() {
+        const { t } = useTranslation(NAMESPACE);
+        const { fieldSchema: tableFieldSchema } = useColumnSchema();
+        const fieldSchema = useFieldSchema();
+        const field = useField();
+        const { dn } = useDesignable();
+
+        const schema = tableFieldSchema || fieldSchema;
+
+        return {
+          title: t('Display copy button'),
+          checked: !!schema['x-component-props']?.addonAfter,
+          onChange: async (checked) => {
+            if (checked) {
+              field.componentProps.addonAfter = copyButton;
+              _.set(schema, 'x-component-props.addonAfter', '{{TextCopyButton}}');
+            } else {
+              field.componentProps.addonAfter = null;
+              _.unset(schema, 'x-component-props.addonAfter');
+            }
+
+            await dn.emit('patch', {
+              schema: {
+                'x-uid': schema['x-uid'],
+                'x-component-props': {
+                  ...schema['x-component-props'],
+                },
+              },
+            });
+          },
+        };
+      },
+    });
+  }
+}
+
+export default PluginTextCopy;
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/index.ts b/packages/plugins/@nocobase/plugin-text-copy/src/index.ts
new file mode 100644
index 00000000000..be99a2ff1ae
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/index.ts
@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './server';
+export { default } from './server';
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-text-copy/src/locale/en-US.json
new file mode 100644
index 00000000000..5c8db245553
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/locale/en-US.json
@@ -0,0 +1,3 @@
+{
+  "Display copy button": "Display copy button"
+}
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/locale/ja-JP.json b/packages/plugins/@nocobase/plugin-text-copy/src/locale/ja-JP.json
new file mode 100644
index 00000000000..3936c0c289e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/locale/ja-JP.json
@@ -0,0 +1,3 @@
+{
+  "Display copy button": "コピーボタンを表示"
+}
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-text-copy/src/locale/zh-CN.json
new file mode 100644
index 00000000000..8db63e4a6b2
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/locale/zh-CN.json
@@ -0,0 +1,3 @@
+{
+  "Display copy button": "显示复制按钮"
+}
diff --git a/packages/plugins/@nocobase/plugin-text-copy/src/server/index.ts b/packages/plugins/@nocobase/plugin-text-copy/src/server/index.ts
new file mode 100644
index 00000000000..16161aaf026
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-text-copy/src/server/index.ts
@@ -0,0 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+
+export class PluginTextCopyServer extends Plugin {
+  async load() {
+    // Server-side initialization if needed
+  }
+}
+
+export default PluginTextCopyServer;
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 3f97a74d59e..18920b2c375 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -45,6 +45,7 @@
     "@nocobase/plugin-file-manager": "1.7.10",
     "@nocobase/plugin-gantt": "1.7.10",
     "@nocobase/plugin-graph-collection-manager": "1.7.10",
+    "@nocobase/plugin-text-copy": "1.7.10",
     "@nocobase/plugin-kanban": "1.7.10",
     "@nocobase/plugin-locale-tester": "1.7.10",
     "@nocobase/plugin-localization": "1.7.10",
@@ -117,6 +118,7 @@
     "@nocobase/plugin-field-sort",
     "@nocobase/plugin-file-manager",
     "@nocobase/plugin-gantt",
+    "@nocobase/plugin-text-copy",
     "@nocobase/plugin-kanban",
     "@nocobase/plugin-logger",
     "@nocobase/plugin-notification-manager",

From c790c2bfea1bb8ff3316c478c9420cf893a558dc Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Fri, 13 Jun 2025 17:43:27 +0800
Subject: [PATCH 2/6] fix: cannot read properties of undefined (reading
 'setMaaintainingMessage') (#7064)

---
 packages/core/server/src/commands/db-sync.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/server/src/commands/db-sync.ts b/packages/core/server/src/commands/db-sync.ts
index 2a46fa0b4cc..bfe09a69306 100644
--- a/packages/core/server/src/commands/db-sync.ts
+++ b/packages/core/server/src/commands/db-sync.ts
@@ -22,10 +22,14 @@ export default (app: Application) => {
 
       const Collection = app.db.getCollection('collections');
       if (Collection) {
+        // @ts-ignore
+        await Collection.repository.setApp(app);
         // @ts-ignore
         await Collection.repository.load();
       }
 
+      app.log.info('syncing database...');
+
       const force = false;
       await app.db.sync({
         force,

From 391bd26647fc385accf693f7f9f25dff2a0cf703 Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Fri, 13 Jun 2025 18:29:01 +0800
Subject: [PATCH 3/6] fix(plugin-workflow-loop): fix continue on false (#7063)

---
 .../src/server/LoopInstruction.ts             |  23 ++--
 .../src/server/__tests__/instruction.test.ts  | 128 +++++++++++-------
 2 files changed, 96 insertions(+), 55 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/src/server/LoopInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-loop/src/server/LoopInstruction.ts
index baf67154246..d9c9aa9b206 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/src/server/LoopInstruction.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/src/server/LoopInstruction.ts
@@ -62,7 +62,7 @@ export default class extends Instruction {
     }
 
     // NOTE: save job for condition calculation
-    const job = await processor.saveJob({
+    const job = processor.saveJob({
       status: JOB_STATUS.PENDING,
       result: { looped },
       nodeId: node.id,
@@ -74,12 +74,17 @@ export default class extends Instruction {
       const { checkpoint, calculation, expression, continueOnFalse } = node.config.condition ?? {};
       if ((calculation || expression) && !checkpoint) {
         const condition = calculateCondition(node, processor);
-        if (!condition && !continueOnFalse) {
-          job.set({
-            status: JOB_STATUS.RESOLVED,
-            result: { looped, broken: true },
-          });
-          return job;
+        if (!condition) {
+          if (continueOnFalse) {
+            job.set('result', { looped: 1 });
+            processor.saveJob(job);
+          } else {
+            job.set({
+              status: JOB_STATUS.RESOLVED,
+              result: { looped, broken: true },
+            });
+            return job;
+          }
         }
       }
     }
@@ -114,7 +119,7 @@ export default class extends Instruction {
       (branchJob.status < JOB_STATUS.PENDING && loop.config.exit === EXIT.CONTINUE)
     ) {
       job.set({ result: { looped: nextIndex } });
-      await processor.saveJob(job);
+      processor.saveJob(job);
 
       const length = getTargetLength(target);
       if (nextIndex < length) {
@@ -132,7 +137,7 @@ export default class extends Instruction {
           }
         }
         await processor.run(branch, job);
-        return processor.exit();
+        return null;
       } else {
         job.set({
           status: JOB_STATUS.RESOLVED,
diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/src/server/__tests__/instruction.test.ts b/packages/plugins/@nocobase/plugin-workflow-loop/src/server/__tests__/instruction.test.ts
index 660ec7e1871..576606c6e9a 100644
--- a/packages/plugins/@nocobase/plugin-workflow-loop/src/server/__tests__/instruction.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-loop/src/server/__tests__/instruction.test.ts
@@ -35,6 +35,7 @@ describe('workflow > instructions > loop', () => {
 
     workflow = await WorkflowModel.create({
       enabled: true,
+      sync: true,
       type: 'collection',
       config: {
         mode: 1,
@@ -60,8 +61,6 @@ describe('workflow > instructions > loop', () => {
 
       const post = await PostRepo.create({ values: { title: 't1' } });
 
-      await sleep(500);
-
       const [execution] = await workflow.getExecutions();
       expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
       const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -93,8 +92,6 @@ describe('workflow > instructions > loop', () => {
 
       const post = await PostRepo.create({ values: { title: 't1' } });
 
-      await sleep(500);
-
       const [execution] = await workflow.getExecutions();
       expect(execution.status).toBe(EXECUTION_STATUS.ERROR);
       const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -127,8 +124,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -160,8 +155,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -193,8 +186,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -226,8 +217,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -259,8 +248,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -293,8 +280,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -327,8 +312,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -370,8 +353,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -415,8 +396,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -451,8 +430,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -497,8 +474,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -544,8 +519,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -586,8 +559,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -629,8 +600,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -639,6 +608,84 @@ describe('workflow > instructions > loop', () => {
         expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
         expect(jobs[0].result).toEqual({ looped: 1, broken: true });
       });
+
+      it('continueOnFalse as true', async () => {
+        const n1 = await workflow.createNode({
+          type: 'loop',
+          config: {
+            target: 2,
+            condition: {
+              continueOnFalse: true,
+              calculation: {
+                group: {
+                  type: 'and',
+                  calculations: [
+                    {
+                      calculator: 'equal',
+                      operands: [1, 0],
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        });
+        const n2 = await workflow.createNode({
+          type: 'echo',
+          upstreamId: n1.id,
+          branchIndex: 0,
+        });
+
+        const post = await PostRepo.create({ values: { title: 't1' } });
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
+        const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
+
+        expect(jobs.length).toBe(2);
+        expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
+        expect(jobs[0].result).toEqual({ looped: 2 });
+      });
+
+      it('continueOnFalse as true, second false', async () => {
+        const n1 = await workflow.createNode({
+          type: 'loop',
+        });
+        await n1.update({
+          config: {
+            target: 2,
+            condition: {
+              continueOnFalse: true,
+              calculation: {
+                group: {
+                  type: 'and',
+                  calculations: [
+                    {
+                      calculator: 'equal',
+                      operands: [1, '{{$scopes.' + n1.key + '.item}}'],
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        });
+        const n2 = await workflow.createNode({
+          type: 'echo',
+          upstreamId: n1.id,
+          branchIndex: 0,
+        });
+
+        const post = await PostRepo.create({ values: { title: 't1' } });
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
+        const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
+
+        expect(jobs.length).toBe(2);
+        expect(jobs[0].status).toBe(JOB_STATUS.RESOLVED);
+        expect(jobs[0].result).toEqual({ looped: 2 });
+      });
     });
 
     describe('exit', () => {
@@ -665,8 +712,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.ERROR);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -700,8 +745,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.ERROR);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -735,8 +778,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -770,8 +811,6 @@ describe('workflow > instructions > loop', () => {
 
         const post = await PostRepo.create({ values: { title: 't1' } });
 
-        await sleep(500);
-
         const [execution] = await workflow.getExecutions();
         expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
         const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -782,6 +821,9 @@ describe('workflow > instructions > loop', () => {
       });
 
       it('exit as continue with async node inside', async () => {
+        await workflow.update({
+          sync: false,
+        });
         const n1 = await workflow.createNode({
           type: 'loop',
           config: {
@@ -863,8 +905,6 @@ describe('workflow > instructions > loop', () => {
         },
       });
 
-      await sleep(500);
-
       const [execution] = await workflow.getExecutions();
       expect(execution.status).toBe(EXECUTION_STATUS.RESOLVED);
       const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
@@ -967,8 +1007,6 @@ describe('workflow > instructions > loop', () => {
 
       const post = await PostRepo.create({ values: { title: 't1' } });
 
-      await sleep(500);
-
       const [e1] = await workflow.getExecutions();
       expect(e1.status).toEqual(EXECUTION_STATUS.RESOLVED);
       const jobs = await e1.getJobs({ order: [['id', 'ASC']] });
@@ -1005,8 +1043,6 @@ describe('workflow > instructions > loop', () => {
 
       const post = await PostRepo.create({ values: { title: 't1' } });
 
-      await sleep(500);
-
       const [e1] = await workflow.getExecutions();
       expect(e1.status).toEqual(EXECUTION_STATUS.RESOLVED);
       const jobs = await e1.getJobs({ order: [['id', 'ASC']] });

From 7b8a3f8c5244e8eebb0425624f740cda9d8913f8 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Fri, 13 Jun 2025 20:22:55 +0800
Subject: [PATCH 4/6] refactor: date field filter component style improve
 (#7066)

---
 .../DateFilterDynamicComponent.tsx                             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx b/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx
index aa3d2ba89cd..3babc507901 100644
--- a/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx
+++ b/packages/core/client/src/schema-component/common/date-filter-dynamic-component/DateFilterDynamicComponent.tsx
@@ -144,7 +144,7 @@ export const DateFilterDynamicComponent = (props) => {
         <Select
           key="unit"
           value={value?.unit}
-          style={{ maxWidth: 140, minWidth: 130 }}
+          style={{ maxWidth: 140 }}
           onChange={(val) => {
             const obj = {
               ...value,
@@ -158,6 +158,7 @@ export const DateFilterDynamicComponent = (props) => {
             { value: 'month', label: t('Calendar Month') },
             { value: 'year', label: t('Calendar Year') },
           ]}
+          popupMatchSelectWidth
         />,
       ]}
       {(value?.type === 'exact' || !value?.type) && <SmartDatePicker {...props} />}

From 04c04c53d6f5d65f9652636d43229d8340c6fb88 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Fri, 13 Jun 2025 22:37:00 +0800
Subject: [PATCH 5/6] fix:  data record picker retains selected data after
 submission (#7067)

---
 .../antd/association-field/InternalPicker.tsx              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx
index 80a29d853b5..74ce3bdc0bf 100644
--- a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx
@@ -11,7 +11,7 @@ import { observer, useField, useFieldSchema } from '@formily/react';
 import { transformMultiColumnToSingleColumn } from '@nocobase/utils/client';
 import { Select, Space } from 'antd';
 import { differenceBy, unionBy } from 'lodash';
-import React, { useContext, useMemo, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 import {
   FormProvider,
   PopupSettingsProvider,
@@ -135,6 +135,11 @@ export const InternalPicker = observer(
       const filter = list.length ? { $and: [{ [`${targetKey}.$ne`]: list }] } : {};
       return filter;
     };
+    useEffect(() => {
+      if (!value) {
+        setSelectedRows([]);
+      }
+    }, [value]);
     const usePickActionProps = () => {
       const { setVisible } = useActionContext();
       const { multiple, selectedRows, onChange, options, collectionField } = useContext(RecordPickerContext);

From 814a4768b6ba7c37e4438f21e148ef2b2baebc65 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Sat, 14 Jun 2025 19:32:54 +0800
Subject: [PATCH 6/6] fix: client test (#7031)

* fix: client test

* fix: test
---
 .../core/client/src/block-provider/TableBlockProvider.tsx | 8 ++++----
 .../data-blocks/table/__e2e__/schemaInitializer1.test.ts  | 1 +
 .../data-blocks/table/__e2e__/schemaSettings.test.ts      | 1 +
 .../blocks/data-blocks/table/tableBlockSettings.tsx       | 8 ++++----
 .../SubTable/subTablePopoverComponentFieldSettings.tsx    | 8 ++++----
 .../schema-component/antd/association-field/SubTable.tsx  | 4 ++--
 .../src/schema-component/antd/association-field/Table.tsx | 6 +++---
 .../client/src/schema-component/antd/table-v2/Table.tsx   | 6 +++---
 .../schema-component/antd/table-v2/TableBlockDesigner.tsx | 6 +++---
 9 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx
index 5285a99dc7a..f90421b0fe8 100644
--- a/packages/core/client/src/block-provider/TableBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx
@@ -63,7 +63,7 @@ interface Props {
   expandFlag?: boolean;
   dragSortBy?: string;
   association?: string;
-  enableIndexÏColumn?: boolean;
+  enableIndexColumn?: boolean;
 }
 
 const InternalTableBlockProvider = (props: Props) => {
@@ -77,7 +77,7 @@ const InternalTableBlockProvider = (props: Props) => {
     fieldNames,
     collection,
     association,
-    enableIndexÏColumn,
+    enableIndexColumn,
   } = props;
   const field: any = useField();
   const { resource, service } = useBlockRequestContext();
@@ -136,7 +136,7 @@ const InternalTableBlockProvider = (props: Props) => {
       setExpandFlag: setExpandFlagValue,
       heightProps,
       association,
-      enableIndexÏColumn,
+      enableIndexColumn,
     }),
     [
       allIncludesChildren,
@@ -153,7 +153,7 @@ const InternalTableBlockProvider = (props: Props) => {
       setExpandFlagValue,
       showIndex,
       association,
-      enableIndexÏColumn,
+      enableIndexColumn,
     ],
   );
 
diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts
index 69b79e9bc6c..90f2618a52a 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer1.test.ts
@@ -52,6 +52,7 @@ test.describe('where table block can be added', () => {
     await page.getByLabel('schema-initializer-Grid-popup').hover();
     await page.getByRole('menuitem', { name: 'Associated records right' }).waitFor({ state: 'detached' });
     await page.getByRole('menuitem', { name: 'Table right' }).hover();
+    await page.waitForTimeout(300);
     await page.getByRole('menuitem', { name: 'Associated records right' }).hover();
     await page.getByRole('menuitem', { name: 'parentAssociationField' }).click();
     await page.getByLabel('schema-initializer-TableV2-table:configureColumns-parentTargetCollection').hover();
diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts
index 853936e2cb8..26ef8e5f32e 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts
@@ -751,6 +751,7 @@ test.describe('actions schema settings', () => {
       await page
         .getByRole('button', { name: 'designer-schema-settings-Action.Link-actionSettings:popup-general' })
         .hover();
+      await page.waitForTimeout(300);
     };
 
     test('supported options', async ({ page, mockPage, mockRecord }) => {
diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
index e99f8a4a118..95c73b53662 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
@@ -39,11 +39,11 @@ const enabledIndexColumn: SchemaSettingsItemType = {
     const { dn } = useDesignable();
     return {
       title: t('Enable index column'),
-      checked: field.decoratorProps.enableIndexÏColumn !== false,
-      onChange: async (enableIndexÏColumn) => {
+      checked: field.decoratorProps.enableIndexColumn !== false,
+      onChange: async (enableIndexColumn) => {
         field.decoratorProps = field.decoratorProps || {};
-        field.decoratorProps.enableIndexÏColumn = enableIndexÏColumn;
-        fieldSchema['x-decorator-props'].enableIndexÏColumn = enableIndexÏColumn;
+        field.decoratorProps.enableIndexColumn = enableIndexColumn;
+        fieldSchema['x-decorator-props'].enableIndexColumn = enableIndexColumn;
         dn.emit('patch', {
           schema: {
             ['x-uid']: fieldSchema['x-uid'],
diff --git a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx
index 96da338b3fa..eff79d660f5 100644
--- a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx
+++ b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx
@@ -41,11 +41,11 @@ const enabledIndexColumn: SchemaSettingsItemType = {
     const { dn } = useDesignable();
     return {
       title: t('Enable index column'),
-      checked: field.componentProps.enableIndexÏColumn !== false,
-      onChange: async (enableIndexÏColumn) => {
+      checked: field.componentProps.enableIndexColumn !== false,
+      onChange: async (enableIndexColumn) => {
         field.componentProps = field.componentProps || {};
-        field.componentProps.enableIndexÏColumn = enableIndexÏColumn;
-        fieldSchema['x-component-props'].enableIndexÏColumn = enableIndexÏColumn;
+        field.componentProps.enableIndexColumn = enableIndexColumn;
+        fieldSchema['x-component-props'].enableIndexColumn = enableIndexColumn;
         dn.emit('patch', {
           schema: {
             ['x-uid']: fieldSchema['x-uid'],
diff --git a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
index 28b881c92b1..b1ea7350f40 100644
--- a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
@@ -107,7 +107,7 @@ export const SubTable: any = observer(
     const labelUiSchema = useLabelUiSchema(collectionField, fieldNames?.label || 'label');
     const recordV2 = useCollectionRecord();
     const collection = useCollection();
-    const { allowSelectExistingRecord, allowAddnew, allowDisassociation, enableIndexÏColumn } = field.componentProps;
+    const { allowSelectExistingRecord, allowAddnew, allowDisassociation, enableIndexColumn } = field.componentProps;
 
     useSubTableSpecialCase({ rootField: field, rootSchema: schema });
 
@@ -263,7 +263,7 @@ export const SubTable: any = observer(
                   locale={{
                     emptyText: <span> {field.editable ? t('Please add or select record') : t('No data')}</span>,
                   }}
-                  enableIndexÏColumn={enableIndexÏColumn !== false}
+                  enableIndexColumn={enableIndexColumn !== false}
                   footer={() => (
                     <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
                       {field.editable && (
diff --git a/packages/core/client/src/schema-component/antd/association-field/Table.tsx b/packages/core/client/src/schema-component/antd/association-field/Table.tsx
index 867ad6a9e4f..0ec30f919a1 100644
--- a/packages/core/client/src/schema-component/antd/association-field/Table.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/Table.tsx
@@ -673,7 +673,7 @@ export const Table: any = withDynamicSchemaProps(
       onExpand,
       loading,
       onClickRow,
-      enableIndexÏColumn,
+      enableIndexColumn,
       ...others
     } = { ...others1, ...others2 } as any;
     const field = useArrayField(others);
@@ -826,7 +826,7 @@ export const Table: any = withDynamicSchemaProps(
 
     const restProps = useMemo(
       () => ({
-        rowSelection: enableIndexÏColumn
+        rowSelection: enableIndexColumn
           ? memoizedRowSelection
             ? {
                 type: 'checkbox',
@@ -900,7 +900,7 @@ export const Table: any = withDynamicSchemaProps(
         isRowSelect,
         memoizedRowSelection,
         paginationProps,
-        enableIndexÏColumn,
+        enableIndexColumn,
       ],
     );
 
diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
index ac996f2d5cd..33722fa9a9d 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
+++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
@@ -854,7 +854,7 @@ export const Table: any = withDynamicSchemaProps(
       const collection = useCollection();
       const isTableSelector = schema?.parent?.['x-decorator'] === 'TableSelectorProvider';
       const ctx = isTableSelector ? useTableSelectorContext() : useTableBlockContext();
-      const { expandFlag, allIncludesChildren, enableIndexÏColumn } = ctx;
+      const { expandFlag, allIncludesChildren, enableIndexColumn } = ctx;
       const onRowDragEnd = useMemoizedFn(others.onRowDragEnd || (() => {}));
       const paginationProps = usePaginationProps(pagination1, pagination2, props);
       const columns = useTableColumns(others, paginationProps);
@@ -1020,7 +1020,7 @@ export const Table: any = withDynamicSchemaProps(
       const restProps = useMemo(
         () => ({
           rowSelection:
-            enableIndexÏColumn !== false
+            enableIndexColumn !== false
               ? memoizedRowSelection
                 ? {
                     type: 'checkbox',
@@ -1102,7 +1102,7 @@ export const Table: any = withDynamicSchemaProps(
           memoizedRowSelection,
           paginationProps,
           tableBlockContextBasicValue,
-          enableIndexÏColumn,
+          enableIndexColumn,
         ],
       );
 
diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx
index 9f35006f79c..3681f9ea06c 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx
+++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx
@@ -182,10 +182,10 @@ export const TableBlockDesigner = () => {
       <SchemaSettingsSwitchItem
         title={t('Enable index column')}
         checked={field.decoratorProps?.enableSelectColumn !== false}
-        onChange={async (enableIndexÏColumn) => {
+        onChange={async (enableIndexColumn) => {
           field.decoratorProps = field.decoratorProps || {};
-          field.decoratorProps.enableIndexÏColumn = enableIndexÏColumn;
-          fieldSchema['x-decorator-props'].enableIndexÏColumn = enableIndexÏColumn;
+          field.decoratorProps.enableIndexColumn = enableIndexColumn;
+          fieldSchema['x-decorator-props'].enableIndexColumn = enableIndexColumn;
           dn.emit('patch', {
             schema: {
               ['x-uid']: fieldSchema['x-uid'],