From 1e9b1596df6770f52a8b0dd5d56a86895f46f11f Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Tue, 29 Oct 2024 22:31:14 +0800
Subject: [PATCH 1/8] fix(Table): fix skeleton component not disappearing
 (#5548)

---
 .../core/client/src/schema-component/antd/table-v2/Table.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 497e85d2bb..cebde23d27 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
@@ -232,8 +232,8 @@ const SortableRow = (props: {
   const { ref, inView } = useInView({
     threshold: 0,
     triggerOnce: true,
-    initialInView: !!process.env.__E2E__ || isInSubTable || props.rowIndex < INITIAL_ROWS_NUMBER,
-    skip: !!process.env.__E2E__ || isInSubTable || props.rowIndex < INITIAL_ROWS_NUMBER,
+    initialInView: !!process.env.__E2E__ || isInSubTable || (props.rowIndex || 0) < INITIAL_ROWS_NUMBER,
+    skip: !!process.env.__E2E__ || isInSubTable,
   });
 
   const classObj = useMemo(() => {

From 7323cefcdda875c9109ebd78c3ed55d9b1148c1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 08:34:08 +0800
Subject: [PATCH 2/8] chore(deps): bump antd-style from 3.4.5 to 3.7.1 (#5536)

* chore(deps): bump antd-style from 3.4.5 to 3.7.1

Bumps [antd-style](https://github.com/ant-design/antd-style) from 3.4.5 to 3.7.1.
- [Release notes](https://github.com/ant-design/antd-style/releases)
- [Changelog](https://github.com/ant-design/antd-style/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ant-design/antd-style/compare/v3.4.5...v3.7.1)

---
updated-dependencies:
- dependency-name: antd-style
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update snapshot

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
---
 packages/core/client/package.json             |   2 +-
 .../__tests__/collection-select.test.tsx      |  12 +-
 .../__tests__/ColorPicker.test.tsx            |   8 +-
 .../pagination/__tests__/pagination.test.tsx  |   6 +-
 .../__tests__/UnixTimestamp.test.tsx          |   6 +-
 .../@nocobase/plugin-calendar/package.json    |   2 +-
 .../@nocobase/plugin-gantt/package.json       |   2 +-
 yarn.lock                                     | 215 +++++-------------
 8 files changed, 74 insertions(+), 179 deletions(-)

diff --git a/packages/core/client/package.json b/packages/core/client/package.json
index 0c6620a189..f4913e558b 100644
--- a/packages/core/client/package.json
+++ b/packages/core/client/package.json
@@ -31,7 +31,7 @@
     "@nocobase/utils": "1.3.42-beta",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
-    "antd-style": "3.4.5",
+    "antd-style": "3.7.1",
     "axios": "^0.26.1",
     "bignumber.js": "^9.1.2",
     "classnames": "^2.3.1",
diff --git a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
index 8c625c2dc0..f83305e4bd 100644
--- a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
+++ b/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>
diff --git a/packages/core/client/src/schema-component/antd/color-picker/__tests__/ColorPicker.test.tsx b/packages/core/client/src/schema-component/antd/color-picker/__tests__/ColorPicker.test.tsx
index 7adc68efdc..c6e11108c2 100644
--- a/packages/core/client/src/schema-component/antd/color-picker/__tests__/ColorPicker.test.tsx
+++ b/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"
diff --git a/packages/core/client/src/schema-component/antd/pagination/__tests__/pagination.test.tsx b/packages/core/client/src/schema-component/antd/pagination/__tests__/pagination.test.tsx
index 6f711c2395..5250a1b63d 100644
--- a/packages/core/client/src/schema-component/antd/pagination/__tests__/pagination.test.tsx
+++ b/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>
diff --git a/packages/core/client/src/schema-component/antd/unix-timestamp/__tests__/UnixTimestamp.test.tsx b/packages/core/client/src/schema-component/antd/unix-timestamp/__tests__/UnixTimestamp.test.tsx
index e312b61d38..bcf2f86c96 100644
--- a/packages/core/client/src/schema-component/antd/unix-timestamp/__tests__/UnixTimestamp.test.tsx
+++ b/packages/core/client/src/schema-component/antd/unix-timestamp/__tests__/UnixTimestamp.test.tsx
@@ -22,11 +22,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"
@@ -147,7 +147,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
diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index 23aee6d40f..6465c7d5fb 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/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",
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index 5a4bbe9c0e..b2d7a9632f 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/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",
diff --git a/yarn.lock b/yarn.lock
index a33caa4b21..3910ac4e51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -186,23 +186,10 @@
   dependencies:
     "@ctrl/tinycolor" "^3.6.1"
 
-"@ant-design/cssinjs@^1", "@ant-design/cssinjs@^1.11.1", "@ant-design/cssinjs@^1.3.1":
-  version "1.18.1"
-  resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.18.1.tgz#ebb0aa28c751ce2203f149554d4a09b2c09174c0"
-  integrity sha512-1JURAPrsjK1GwpqByTq3bJ7nF7lbMKDZpehqeR2n8/IR5O58/W1U4VcOeaw5ZyTHri3tEMcom7dyP2tvxpW54g==
-  dependencies:
-    "@babel/runtime" "^7.11.1"
-    "@emotion/hash" "^0.8.0"
-    "@emotion/unitless" "^0.7.5"
-    classnames "^2.3.1"
-    csstype "3.1.2"
-    rc-util "^5.35.0"
-    stylis "^4.0.13"
-
-"@ant-design/cssinjs@^1.18.2":
-  version "1.18.2"
-  resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.18.2.tgz#d993a64c1d0bf51f4a9d662ddc8ed8426977b5c3"
-  integrity sha512-514V9rjLaFYb3v4s55/8bg2E6fb81b99s3crDZf4nSwtiDLLXs8axnIph+q2TVkY2hbJPZOn/cVsVcnLkzFy7w==
+"@ant-design/cssinjs@^1", "@ant-design/cssinjs@^1.11.1", "@ant-design/cssinjs@^1.18.2", "@ant-design/cssinjs@^1.21.1", "@ant-design/cssinjs@^1.3.1":
+  version "1.21.1"
+  resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.21.1.tgz#7320813c5f747e0cde52c388eff5198d78d57230"
+  integrity sha512-tyWnlK+XH7Bumd0byfbCiZNK43HEubMoCcu9VxwsAwiHdHTgWa+tMN0/yvxa+e8EzuFP1WdUNNPclRpVtD33lg==
   dependencies:
     "@babel/runtime" "^7.11.1"
     "@emotion/hash" "^0.8.0"
@@ -210,7 +197,7 @@
     classnames "^2.3.1"
     csstype "^3.1.3"
     rc-util "^5.35.0"
-    stylis "^4.0.13"
+    stylis "^4.3.3"
 
 "@ant-design/icons-svg@^4.2.1", "@ant-design/icons-svg@^4.3.0":
   version "4.3.1"
@@ -2596,10 +2583,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/runtime@^7", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.3", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.23.7"
-  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.23.7.tgz#dd7c88deeb218a0f8bd34d5db1aa242e0f203193"
-  integrity sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA==
+"@babel/runtime@^7", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.3", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.24.1", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.6", "@babel/runtime@^7.7.7", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.26.0"
+  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -3076,7 +3063,7 @@
   dependencies:
     tslib "^2.0.0"
 
-"@emotion/babel-plugin@^11.11.0", "@emotion/babel-plugin@^11.12.0":
+"@emotion/babel-plugin@^11.12.0":
   version "11.12.0"
   resolved "https://registry.npmmirror.com/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2"
   integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==
@@ -3093,7 +3080,7 @@
     source-map "^0.5.7"
     stylis "4.2.0"
 
-"@emotion/cache@^11", "@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0":
+"@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0":
   version "11.13.1"
   resolved "https://registry.npmmirror.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7"
   integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
@@ -3104,7 +3091,7 @@
     "@emotion/weak-memoize" "^0.4.0"
     stylis "4.2.0"
 
-"@emotion/css@^11", "@emotion/css@^11.11.2", "@emotion/css@^11.7.1":
+"@emotion/css@^11.11.2", "@emotion/css@^11.7.1":
   version "11.13.0"
   resolved "https://registry.npmmirror.com/@emotion/css/-/css-11.13.0.tgz#3b44f008ce782dafa7cecff75b263af174d0c702"
   integrity sha512-BUk99ylT+YHl+W/HN7nv1RCTkDYmKKqa1qbvM/qLSQEg61gipuBF5Hptk/2/ERmX2DCv0ccuFGhz9i0KSZOqPg==
@@ -3142,41 +3129,31 @@
   resolved "https://registry.npmmirror.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102"
   integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
 
-"@emotion/react@^11", "@emotion/react@^11.11.0":
-  version "11.11.1"
-  resolved "https://registry.npmmirror.com/@emotion/react/-/react-11.11.1.tgz#b2c36afac95b184f73b08da8c214fdf861fa4157"
-  integrity sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==
+"@emotion/react@^11.11.0", "@emotion/react@^11.11.4":
+  version "11.13.3"
+  resolved "https://registry.npmmirror.com/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4"
+  integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg==
   dependencies:
     "@babel/runtime" "^7.18.3"
-    "@emotion/babel-plugin" "^11.11.0"
-    "@emotion/cache" "^11.11.0"
-    "@emotion/serialize" "^1.1.2"
-    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1"
-    "@emotion/utils" "^1.2.1"
-    "@emotion/weak-memoize" "^0.3.1"
+    "@emotion/babel-plugin" "^11.12.0"
+    "@emotion/cache" "^11.13.0"
+    "@emotion/serialize" "^1.3.1"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0"
+    "@emotion/utils" "^1.4.0"
+    "@emotion/weak-memoize" "^0.4.0"
     hoist-non-react-statics "^3.3.1"
 
-"@emotion/serialize@^1", "@emotion/serialize@^1.1.2", "@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0":
-  version "1.3.1"
-  resolved "https://registry.npmmirror.com/@emotion/serialize/-/serialize-1.3.1.tgz#490b660178f43d2de8e92b278b51079d726c05c3"
-  integrity sha512-dEPNKzBPU+vFPGa+z3axPRn8XVDetYORmDC0wAiej+TNcOZE70ZMJa0X7JdeoM6q/nWTMZeLpN/fTnD9o8MQBA==
+"@emotion/serialize@^1.1.3", "@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1":
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/@emotion/serialize/-/serialize-1.3.2.tgz#e1c1a2e90708d5d85d81ccaee2dfeb3cc0cccf7a"
+  integrity sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==
   dependencies:
     "@emotion/hash" "^0.9.2"
     "@emotion/memoize" "^0.9.0"
     "@emotion/unitless" "^0.10.0"
-    "@emotion/utils" "^1.4.0"
+    "@emotion/utils" "^1.4.1"
     csstype "^3.0.2"
 
-"@emotion/server@^11":
-  version "11.11.0"
-  resolved "https://registry.npmmirror.com/@emotion/server/-/server-11.11.0.tgz#35537176a2a5ed8aed7801f254828e636ec3bd6e"
-  integrity sha512-6q89fj2z8VBTx9w93kJ5n51hsmtYuFPtZgnc1L8VzRx9ti4EU6EyvF6Nn1H1x3vcCQCF7u2dB2lY4AYJwUW4PA==
-  dependencies:
-    "@emotion/utils" "^1.2.1"
-    html-tokenize "^2.0.0"
-    multipipe "^1.0.2"
-    through "^2.3.8"
-
 "@emotion/sheet@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmmirror.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c"
@@ -3197,20 +3174,15 @@
   resolved "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/use-insertion-effect-with-fallbacks@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmmirror.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963"
-  integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==
+"@emotion/use-insertion-effect-with-fallbacks@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf"
+  integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==
 
-"@emotion/utils@^1", "@emotion/utils@^1.2.1", "@emotion/utils@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.npmmirror.com/@emotion/utils/-/utils-1.4.0.tgz#262f1d02aaedb2ec91c83a0955dd47822ad5fbdd"
-  integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==
-
-"@emotion/weak-memoize@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.npmmirror.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6"
-  integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==
+"@emotion/utils@^1.2.1", "@emotion/utils@^1.4.0", "@emotion/utils@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/@emotion/utils/-/utils-1.4.1.tgz#b3adbb43de12ee2149541c4f1337d2eb7774f0ad"
+  integrity sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==
 
 "@emotion/weak-memoize@^0.4.0":
   version "0.4.0"
@@ -8618,35 +8590,19 @@ antd-mobile@^5.36.1:
     tslib "^2.5.0"
     use-sync-external-store "^1.2.0"
 
-antd-style@3.4.5:
-  version "3.4.5"
-  resolved "https://registry.npmmirror.com/antd-style/-/antd-style-3.4.5.tgz#ed1c81a738b3ae9c4079824b13a30c27ab934f4e"
-  integrity sha512-6aC4P9XyuVy0O7eZ+HZXd8GbbFX9HgzsXsJ341ihJhgqrfsQZNx8lDQvS2kCV6ao99QqtyTDphK9gWOgV2bHEw==
+antd-style@3.7.1, antd-style@3.x:
+  version "3.7.1"
+  resolved "https://registry.npmmirror.com/antd-style/-/antd-style-3.7.1.tgz#59f35e04c6b4b0082774f9de748d3e946188ba87"
+  integrity sha512-CQOfddVp4aOvBfCepa+Kj2e7ap+2XBINg1Kn2osdE3oQvrD7KJu/K0sfnLcFLkgCJygbxmuazYdWLKb+drPDYA==
   dependencies:
-    "@ant-design/cssinjs" "^1"
-    "@babel/runtime" "^7"
-    "@emotion/cache" "^11"
-    "@emotion/css" "^11"
-    "@emotion/react" "^11"
-    "@emotion/serialize" "^1"
-    "@emotion/server" "^11"
-    "@emotion/utils" "^1"
-    use-merge-value "^1"
-
-antd-style@3.x:
-  version "3.6.1"
-  resolved "https://registry.npmmirror.com/antd-style/-/antd-style-3.6.1.tgz#28be830a4cfe62e4915ce3f1ceadc9aab1245feb"
-  integrity sha512-KpKXiAIV3CAe6TfSh/m6ET2vGuhAof7qfqeaouh5WZ0JDl5jDXXSFPeEfqvZuHAckTl+A0NzArvIHKgKt/NZ9g==
-  dependencies:
-    "@ant-design/cssinjs" "^1"
-    "@babel/runtime" "^7"
-    "@emotion/cache" "^11"
-    "@emotion/css" "^11"
-    "@emotion/react" "^11"
-    "@emotion/serialize" "^1"
-    "@emotion/server" "^11"
-    "@emotion/utils" "^1"
-    use-merge-value "^1"
+    "@ant-design/cssinjs" "^1.21.1"
+    "@babel/runtime" "^7.24.1"
+    "@emotion/cache" "^11.11.0"
+    "@emotion/css" "^11.11.2"
+    "@emotion/react" "^11.11.4"
+    "@emotion/serialize" "^1.1.3"
+    "@emotion/utils" "^1.2.1"
+    use-merge-value "^1.2.0"
 
 antd-token-previewer@^2.0.0-alpha.6:
   version "2.0.5"
@@ -9849,11 +9805,6 @@ buffer-from@^1.0.0, buffer-from@^1.1.1:
   resolved "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-from@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmmirror.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0"
-  integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==
-
 buffer-writer@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
@@ -11611,11 +11562,6 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
-  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
-
 csstype@^3.0.2, csstype@^3.0.8, csstype@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
@@ -12844,13 +12790,6 @@ dumi@2.2.14:
     v8-compile-cache "2.3.0"
     vfile "^5.3.7"
 
-duplexer2@^0.1.2:
-  version "0.1.4"
-  resolved "https://registry.npmmirror.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==
-  dependencies:
-    readable-stream "^2.0.2"
-
 duplexer3@^0.1.4:
   version "0.1.5"
   resolved "https://registry.npmmirror.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
@@ -15944,17 +15883,6 @@ html-to-text@^9.0.5:
     htmlparser2 "^8.0.2"
     selderee "^0.11.0"
 
-html-tokenize@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmmirror.com/html-tokenize/-/html-tokenize-2.0.1.tgz#c3b2ea6e2837d4f8c06693393e9d2a12c960be5f"
-  integrity sha512-QY6S+hZ0f5m1WT8WffYN+Hg+xm/w5I8XeUcAq/ZYP5wVC8xbKi4Whhru3FtrAebD5EhBW8rmFzkDI6eCAuFe2w==
-  dependencies:
-    buffer-from "~0.1.1"
-    inherits "~2.0.1"
-    minimist "~1.2.5"
-    readable-stream "~1.0.27-1"
-    through2 "~0.4.1"
-
 html-void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz#29459b8b05c200b6c5ee98743c41b979d577549f"
@@ -19418,7 +19346,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.5, minimist@~1.2.8:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@~1.2.8:
   version "1.2.8"
   resolved "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -19740,14 +19668,6 @@ multimatch@^5.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-multipipe@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmmirror.com/multipipe/-/multipipe-1.0.2.tgz#cc13efd833c9cda99f224f868461b8e1a3fd939d"
-  integrity sha512-6uiC9OvY71vzSGX8lZvSqscE7ft9nPupJ8fMjrCNRAUy2LREUW42UL+V/NTrogr6rFgRydUrCX4ZitfpSNkSCQ==
-  dependencies:
-    duplexer2 "^0.1.2"
-    object-assign "^4.1.0"
-
 mute-stdout@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
@@ -20378,11 +20298,6 @@ object-keys@^1.1.1:
   resolved "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmmirror.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==
-
 object-path@^0.11.8:
   version "0.11.8"
   resolved "https://registry.npmmirror.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742"
@@ -23283,16 +23198,6 @@ readable-stream@1.1.x:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.0.17, readable-stream@~1.0.27-1:
-  version "1.0.34"
-  resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdir-glob@^1.1.2:
   version "1.1.3"
   resolved "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.3.tgz#c3d831f51f5e7bfa62fa2ffbe4b508c640f09584"
@@ -25397,11 +25302,16 @@ stylis@4.2.0:
   resolved "https://registry.npmmirror.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
   integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
 
-stylis@^4.0.13, stylis@^4.1.2:
+stylis@^4.1.2:
   version "4.3.0"
   resolved "https://registry.npmmirror.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c"
   integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==
 
+stylis@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.npmmirror.com/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4"
+  integrity sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==
+
 sucrase@^3.35.0:
   version "3.35.0"
   resolved "https://registry.npmmirror.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
@@ -25837,14 +25747,6 @@ through2@^4.0.0:
   dependencies:
     readable-stream "3"
 
-through2@~0.4.1:
-  version "0.4.2"
-  resolved "https://registry.npmmirror.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
-  integrity sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~2.1.1"
-
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3:
   version "2.3.8"
   resolved "https://registry.npmmirror.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -26986,7 +26888,7 @@ use-memo-one@^1.1.1:
   resolved "https://registry.npmmirror.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
   integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
-use-merge-value@^1:
+use-merge-value@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmmirror.com/use-merge-value/-/use-merge-value-1.2.0.tgz#45410846c23e490f404c9cbd17d67db9c8c0efcd"
   integrity sha512-DXgG0kkgJN45TcyoXL49vJnn55LehnrmoHc7MbKi+QDBvr8dsesqws8UlyIWGHMR+JXgxc1nvY+jDGMlycsUcw==
@@ -27845,13 +27747,6 @@ xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xtend@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmmirror.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==
-  dependencies:
-    object-keys "~0.4.0"
-
 xxhashjs@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmmirror.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"

From 0c034c104e273382c808582b0fb8be6adc648c6f Mon Sep 17 00:00:00 2001
From: Sheldon Guo <sheldon_66@163.com>
Date: Wed, 30 Oct 2024 10:11:37 +0800
Subject: [PATCH 3/8] fix: fix linkage style not updating in form (#5539)

* refactor: update useDataFormItemProps hook
* refactor: update useDataFormItemProps hook to handle null values in form and subForm
---
 .../form/hooks/useDataFormItemProps.ts        | 13 ++++++---
 .../LinkageRules/useActionValues.ts           | 27 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts b/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts
index 934e66acc5..f584b4089a 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/form/hooks/useDataFormItemProps.ts
+++ b/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 { valueMap: style } = useSatisfiedActionValues({ category: 'style', formValues: data });
+  const record = useCollectionRecordData();
+  const { form } = useFormBlockContext();
+  const subForm = useSubFormValue();
+  const { valueMap: style } = useSatisfiedActionValues({
+    category: 'style',
+    formValues: subForm?.formValue || form?.values || record,
+    form,
+  });
   return { wrapperStyle: style };
 }
diff --git a/packages/core/client/src/schema-settings/LinkageRules/useActionValues.ts b/packages/core/client/src/schema-settings/LinkageRules/useActionValues.ts
index ec1dc3a1af..0a4cdd7089 100644
--- a/packages/core/client/src/schema-settings/LinkageRules/useActionValues.ts
+++ b/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]];
-
-  useEffect(() => {
+  const compute = useCallback(() => {
     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 };
 }

From 92542ca95050abadfc80fa073d639d1a70189585 Mon Sep 17 00:00:00 2001
From: Sheldon Guo <sheldon_66@163.com>
Date: Wed, 30 Oct 2024 10:33:31 +0800
Subject: [PATCH 4/8] chore(plugin-notification-in-app-message): improve UI and
 add logs (#5550)

* chore: add some log to plugin-notification-in-app-message

* refactor: improve unread message count display
---
 .../src/client/components/ContentConfigForm.tsx      |  2 +-
 .../src/client/components/Inbox.tsx                  | 12 +++++++++---
 .../src/client/components/MessageConfigForm.tsx      |  2 +-
 .../src/locale/en-US.json                            |  2 +-
 .../src/locale/zh-CN.json                            |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/ContentConfigForm.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/ContentConfigForm.tsx
index ad1d786df4..99c0d928a0 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/ContentConfigForm.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/ContentConfigForm.tsx
@@ -59,7 +59,7 @@ export const ContentConfigForm = ({ variableOptions }) => {
                   useTypedConstant: ['string'],
                 },
                 description: tval(
-                  "Support two types of links in nocobase: internal links and external links. If using an internal link, the link starts with '/', for example, '/admin/page'. If using an external link, the link starts with 'http', for example, 'https://example.com'.",
+                  'Support two types of links: internal links and external links. If using an internal link, the link starts with"/", for example, "/admin". If using an external link, the link starts with "http", for example, "https://example.com".',
                 ),
               },
             },
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/Inbox.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/Inbox.tsx
index 75c2e042d5..7d8004dc90 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/Inbox.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/Inbox.tsx
@@ -16,7 +16,7 @@
  * For more information, please rwefer to: https://www.nocobase.com/agreement.
  */
 
-import React, { useEffect, useCallback, useContext } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import { Badge, Button, ConfigProvider, Drawer, Tooltip } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
 import { createStyles } from 'antd-style';
@@ -76,9 +76,15 @@ const InnerInbox = (props) => {
       }}
     >
       <Tooltip title={t('Message')}>
-        <Button className={styles.button} title={'Apps'} icon={<Icon type={'MailOutlined'} />} onClick={onIconClick} />
+        <Badge count={unreadMsgsCountObs.value} size="small" offset={[-12, 14]}>
+          <Button
+            className={styles.button}
+            title={'Apps'}
+            icon={<Icon type={'MailOutlined'} />}
+            onClick={onIconClick}
+          />
+        </Badge>
       </Tooltip>
-      {unreadMsgsCountObs.value && <Badge count={unreadMsgsCountObs.value} size="small" offset={[-18, -16]}></Badge>}
       <Drawer
         title={DrawerTitle}
         open={inboxVisible.value}
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageConfigForm.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageConfigForm.tsx
index c6c79190e3..b3c2a4b965 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageConfigForm.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageConfigForm.tsx
@@ -108,7 +108,7 @@ export const MessageConfigForm = ({ variableOptions }) => {
                   useTypedConstant: ['string'],
                 },
                 description: tval(
-                  "Support two types of links in nocobase: internal links and external links. If using an internal link, the link starts with '/', for example, '/admin/page'. If using an external link, the link starts with 'http', for example, 'https://example.com'.",
+                  'Support two types of links: internal links and external links. If using an internal link, the link starts with"/", for example, "/admin". If using an external link, the link starts with "http", for example, "https://example.com".',
                 ),
               },
             },
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/en-US.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/en-US.json
index 3f6e6156ed..d5fc9b716c 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/en-US.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/en-US.json
@@ -17,6 +17,6 @@
   "Message content": "Message content",
   "Inapp Message": "Inapp Message",
   "Detail URL": "Detail URL",
-  "Support two types of links in nocobase: internal links and external links. If using an internal link, the link starts with '/', for example, '/admin/page'. If using an external link, the link starts with 'http', for example, 'https://example.com'.": "Support two types of links in nocobase: internal links and external links. If using an internal link, the link starts with '/', for example, '/admin/page'. If using an external link, the link starts with 'http', for example, 'https://example.com'.",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "Support two types of links: internal links and external links. If using an internal link, the link starts with \"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".",
   "Mark as read": "Mark as read"
 }
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/zh-CN.json
index d20a8ff8b3..ec5ddf50ee 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/zh-CN.json
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/locale/zh-CN.json
@@ -16,6 +16,6 @@
   "Message content": "消息内容",
   "Inapp Message": "站内信",
   "Detail URL": "详情链接",
-  "Support two types of links in nocobase: internal links and external links. If using an internal link, the link starts with '/', for example, '/admin/page'. If using an external link, the link starts with 'http', for example, 'https://example.com'.": "nocobase支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以'/'开头，例如，'/admin/page'。如果使用外部链接，链接以'http'开头，例如，'https://example.com'。",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/admin”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
   "Mark as read": "标记为已读"
 }

From c43933e51bb7c02b4f97cf7c2334e3954ea96266 Mon Sep 17 00:00:00 2001
From: YANG QIA <2013xile@gmail.com>
Date: Wed, 30 Oct 2024 10:47:12 +0800
Subject: [PATCH 5/8] fix(tree): fix errors when updating path collection
 (#5551)

* fix(tree): fix errors when updating path collection

* fix: update
---
 .../table/__e2e__/schemaSettings.test.ts      |  2 +-
 .../src/server/plugin.ts                      | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

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 022dba03f7..54e77815ea 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
@@ -937,7 +937,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();
 
diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts
index 51063f7f8b..10ab1412f2 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts
+++ b/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;
           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;
             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;
             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;
             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;
     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;
     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({

From 9e5355cbed7880e84b04eee4c8c4361c84183d3b Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Wed, 30 Oct 2024 11:06:29 +0800
Subject: [PATCH 6/8] fix(mobile): fix the issue of preview images being
 covered by page (#5535)

* refactor(mobile): replace mobile BasicZIndexProvider with zIndexContext from core library

* fix(mobile): fix the issue of preview images being covered by page
---
 .../schema-component/antd/action/index.tsx    |    3 +-
 .../src/client/__e2e__/templates.ts           | 1065 +++++++++++++++++
 .../src/client/__e2e__/zIndex.test.ts         |   72 ++
 .../adaptor-of-desktop/ActionDrawer.tsx       |   12 +-
 .../BasicZIndexProvider.tsx                   |   33 -
 .../adaptor-of-desktop/FilterAction.tsx       |   12 +-
 .../InternalPopoverNester.tsx                 |   11 +-
 .../mobile-action-page/MobileActionPage.tsx   |   12 +-
 .../src/client/adaptor-of-desktop/zIndex.ts   |   11 +
 .../src/client/mobile/Mobile.tsx              |    6 +-
 10 files changed, 1178 insertions(+), 59 deletions(-)
 create mode 100644 packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/templates.ts
 create mode 100644 packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/zIndex.test.ts
 delete mode 100644 packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/BasicZIndexProvider.tsx
 create mode 100644 packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/zIndex.ts

diff --git a/packages/core/client/src/schema-component/antd/action/index.tsx b/packages/core/client/src/schema-component/antd/action/index.tsx
index 22db0e3b38..80766dbb69 100644
--- a/packages/core/client/src/schema-component/antd/action/index.tsx
+++ b/packages/core/client/src/schema-component/antd/action/index.tsx
@@ -8,6 +8,7 @@
  */
 
 export * from './Action';
+export * from './Action.Designer';
 export * from './ActionBar';
 export * from './context';
 export * from './hooks';
@@ -15,5 +16,5 @@ export * from './hooks/useGetAriaLabelOfAction';
 export * from './hooks/useGetAriaLabelOfDrawer';
 export * from './hooks/useGetAriaLabelOfModal';
 export * from './hooks/useGetAriaLabelOfPopover';
-export * from './Action.Designer';
 export * from './types';
+export * from './zIndexContext';
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/templates.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/templates.ts
new file mode 100644
index 0000000000..33a52b9c34
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/templates.ts
@@ -0,0 +1,1065 @@
+/**
+ * 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 const shouldDisplayImageNormally = {
+  collections: [
+    {
+      name: 'image',
+      fields: [
+        {
+          name: 'attachment',
+          interface: 'attachment',
+        },
+      ],
+    },
+  ],
+  pageSchema: {
+    type: 'void',
+    'x-component': 'Grid',
+    'x-component-props': {
+      showDivider: false,
+    },
+    'x-initializer': 'mobile:addBlock',
+    properties: {
+      '2qkpsi1o454': {
+        _isJSONSchemaObject: true,
+        version: '2.0',
+        type: 'void',
+        'x-component': 'Grid.Row',
+        'x-app-version': '1.3.42-beta',
+        properties: {
+          n7plq4w7u4j: {
+            _isJSONSchemaObject: true,
+            version: '2.0',
+            type: 'void',
+            'x-component': 'Grid.Col',
+            'x-app-version': '1.3.42-beta',
+            properties: {
+              vi2vd17p09w: {
+                _isJSONSchemaObject: true,
+                version: '2.0',
+                type: 'void',
+                'x-decorator': 'TableBlockProvider',
+                'x-acl-action': 'image:list',
+                'x-use-decorator-props': 'useTableBlockDecoratorProps',
+                'x-decorator-props': {
+                  collection: 'image',
+                  dataSource: 'main',
+                  action: 'list',
+                  params: {
+                    pageSize: 20,
+                  },
+                  rowKey: 'id',
+                  showIndex: true,
+                  dragSort: false,
+                },
+                'x-toolbar': 'BlockSchemaToolbar',
+                'x-settings': 'blockSettings:table',
+                'x-component': 'CardItem',
+                'x-filter-targets': [],
+                'x-app-version': '1.3.42-beta',
+                properties: {
+                  actions: {
+                    _isJSONSchemaObject: true,
+                    version: '2.0',
+                    type: 'void',
+                    'x-initializer': 'table:configureActions',
+                    'x-component': 'ActionBar',
+                    'x-component-props': {
+                      style: {
+                        marginBottom: 'var(--nb-spacing)',
+                      },
+                    },
+                    'x-app-version': '1.3.42-beta',
+                    'x-uid': 'xdkvvipejgd',
+                    'x-async': false,
+                    'x-index': 1,
+                  },
+                  '61g0b1ddb4a': {
+                    _isJSONSchemaObject: true,
+                    version: '2.0',
+                    type: 'array',
+                    'x-initializer': 'table:configureColumns',
+                    'x-component': 'TableV2',
+                    'x-use-component-props': 'useTableBlockProps',
+                    'x-component-props': {
+                      rowKey: 'id',
+                      rowSelection: {
+                        type: 'checkbox',
+                      },
+                    },
+                    'x-app-version': '1.3.42-beta',
+                    properties: {
+                      actions: {
+                        'x-uid': 'rjpymlq1jzw',
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'void',
+                        title: '{{ t("Actions") }}',
+                        'x-action-column': 'actions',
+                        'x-decorator': 'TableV2.Column.ActionBar',
+                        'x-component': 'TableV2.Column',
+                        'x-toolbar': 'TableColumnSchemaToolbar',
+                        'x-initializer': 'table:configureItemActions',
+                        'x-settings': 'fieldSettings:TableColumn',
+                        'x-toolbar-props': {
+                          initializer: 'table:configureItemActions',
+                        },
+                        'x-app-version': '1.3.42-beta',
+                        'x-component-props': {
+                          width: 50,
+                        },
+                        properties: {
+                          nj2c3kinca5: {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            type: 'void',
+                            'x-decorator': 'DndContext',
+                            'x-component': 'Space',
+                            'x-component-props': {
+                              split: '|',
+                            },
+                            'x-app-version': '1.3.42-beta',
+                            properties: {
+                              dzdmqaizn2s: {
+                                _isJSONSchemaObject: true,
+                                version: '2.0',
+                                type: 'void',
+                                title: '{{ t("View") }}',
+                                'x-action': 'view',
+                                'x-toolbar': 'ActionSchemaToolbar',
+                                'x-settings': 'actionSettings:view',
+                                'x-component': 'Action.Link',
+                                'x-component-props': {
+                                  openMode: 'page',
+                                },
+                                'x-action-context': {
+                                  dataSource: 'main',
+                                  collection: 'image',
+                                },
+                                'x-decorator': 'ACLActionProvider',
+                                'x-designer-props': {
+                                  linkageAction: true,
+                                },
+                                properties: {
+                                  drawer: {
+                                    _isJSONSchemaObject: true,
+                                    version: '2.0',
+                                    type: 'void',
+                                    title: '{{ t("View record") }}',
+                                    'x-component': 'Action.Container',
+                                    'x-component-props': {
+                                      className: 'nb-action-popup',
+                                    },
+                                    properties: {
+                                      tabs: {
+                                        _isJSONSchemaObject: true,
+                                        version: '2.0',
+                                        type: 'void',
+                                        'x-component': 'Tabs',
+                                        'x-component-props': {},
+                                        'x-initializer': 'popup:addTab',
+                                        properties: {
+                                          tab1: {
+                                            _isJSONSchemaObject: true,
+                                            version: '2.0',
+                                            type: 'void',
+                                            title: '{{t("Details")}}',
+                                            'x-component': 'Tabs.TabPane',
+                                            'x-designer': 'Tabs.Designer',
+                                            'x-component-props': {},
+                                            properties: {
+                                              grid: {
+                                                _isJSONSchemaObject: true,
+                                                version: '2.0',
+                                                type: 'void',
+                                                'x-component': 'Grid',
+                                                'x-initializer': 'popup:common:addBlock',
+                                                properties: {
+                                                  v3lu0q5qb2s: {
+                                                    _isJSONSchemaObject: true,
+                                                    version: '2.0',
+                                                    type: 'void',
+                                                    'x-component': 'Grid.Row',
+                                                    'x-app-version': '1.3.42-beta',
+                                                    properties: {
+                                                      '8v6rb76xzcl': {
+                                                        _isJSONSchemaObject: true,
+                                                        version: '2.0',
+                                                        type: 'void',
+                                                        'x-component': 'Grid.Col',
+                                                        'x-app-version': '1.3.42-beta',
+                                                        properties: {
+                                                          j5mq2jtfqbu: {
+                                                            _isJSONSchemaObject: true,
+                                                            version: '2.0',
+                                                            type: 'void',
+                                                            'x-acl-action': 'image:get',
+                                                            'x-decorator': 'DetailsBlockProvider',
+                                                            'x-use-decorator-props': 'useDetailsDecoratorProps',
+                                                            'x-decorator-props': {
+                                                              dataSource: 'main',
+                                                              collection: 'image',
+                                                              readPretty: true,
+                                                              action: 'get',
+                                                            },
+                                                            'x-toolbar': 'BlockSchemaToolbar',
+                                                            'x-settings': 'blockSettings:details',
+                                                            'x-component': 'CardItem',
+                                                            'x-app-version': '1.3.42-beta',
+                                                            properties: {
+                                                              l2d5m4sojzb: {
+                                                                _isJSONSchemaObject: true,
+                                                                version: '2.0',
+                                                                type: 'void',
+                                                                'x-component': 'Details',
+                                                                'x-read-pretty': true,
+                                                                'x-use-component-props': 'useDetailsProps',
+                                                                'x-app-version': '1.3.42-beta',
+                                                                properties: {
+                                                                  ilctz1mj532: {
+                                                                    _isJSONSchemaObject: true,
+                                                                    version: '2.0',
+                                                                    type: 'void',
+                                                                    'x-initializer': 'details:configureActions',
+                                                                    'x-component': 'ActionBar',
+                                                                    'x-component-props': {
+                                                                      style: {
+                                                                        marginBottom: 24,
+                                                                      },
+                                                                    },
+                                                                    'x-app-version': '1.3.42-beta',
+                                                                    properties: {
+                                                                      lhm4dx0xm3r: {
+                                                                        _isJSONSchemaObject: true,
+                                                                        version: '2.0',
+                                                                        type: 'void',
+                                                                        title: '{{ t("Edit") }}',
+                                                                        'x-action': 'update',
+                                                                        'x-toolbar': 'ActionSchemaToolbar',
+                                                                        'x-settings': 'actionSettings:edit',
+                                                                        'x-component': 'Action',
+                                                                        'x-component-props': {
+                                                                          openMode: 'page',
+                                                                          icon: 'EditOutlined',
+                                                                          type: 'primary',
+                                                                        },
+                                                                        'x-action-context': {
+                                                                          dataSource: 'main',
+                                                                          collection: 'image',
+                                                                        },
+                                                                        'x-decorator': 'ACLActionProvider',
+                                                                        'x-app-version': '1.3.42-beta',
+                                                                        properties: {
+                                                                          drawer: {
+                                                                            _isJSONSchemaObject: true,
+                                                                            version: '2.0',
+                                                                            type: 'void',
+                                                                            title: '{{ t("Edit record") }}',
+                                                                            'x-component': 'Action.Container',
+                                                                            'x-component-props': {
+                                                                              className: 'nb-action-popup',
+                                                                            },
+                                                                            'x-app-version': '1.3.42-beta',
+                                                                            properties: {
+                                                                              tabs: {
+                                                                                _isJSONSchemaObject: true,
+                                                                                version: '2.0',
+                                                                                type: 'void',
+                                                                                'x-component': 'Tabs',
+                                                                                'x-component-props': {},
+                                                                                'x-initializer': 'popup:addTab',
+                                                                                'x-app-version': '1.3.42-beta',
+                                                                                properties: {
+                                                                                  tab1: {
+                                                                                    _isJSONSchemaObject: true,
+                                                                                    version: '2.0',
+                                                                                    type: 'void',
+                                                                                    title: '{{t("Edit")}}',
+                                                                                    'x-component': 'Tabs.TabPane',
+                                                                                    'x-designer': 'Tabs.Designer',
+                                                                                    'x-component-props': {},
+                                                                                    'x-app-version': '1.3.42-beta',
+                                                                                    properties: {
+                                                                                      grid: {
+                                                                                        _isJSONSchemaObject: true,
+                                                                                        version: '2.0',
+                                                                                        type: 'void',
+                                                                                        'x-component': 'Grid',
+                                                                                        'x-initializer':
+                                                                                          'popup:common:addBlock',
+                                                                                        'x-app-version': '1.3.42-beta',
+                                                                                        properties: {
+                                                                                          '5pwp67hvgii': {
+                                                                                            _isJSONSchemaObject: true,
+                                                                                            version: '2.0',
+                                                                                            type: 'void',
+                                                                                            'x-component': 'Grid.Row',
+                                                                                            'x-app-version':
+                                                                                              '1.3.42-beta',
+                                                                                            properties: {
+                                                                                              b02yo5jzqu1: {
+                                                                                                _isJSONSchemaObject:
+                                                                                                  true,
+                                                                                                version: '2.0',
+                                                                                                type: 'void',
+                                                                                                'x-component':
+                                                                                                  'Grid.Col',
+                                                                                                'x-app-version':
+                                                                                                  '1.3.42-beta',
+                                                                                                properties: {
+                                                                                                  '6bsqjxlo2l0': {
+                                                                                                    _isJSONSchemaObject:
+                                                                                                      true,
+                                                                                                    version: '2.0',
+                                                                                                    type: 'void',
+                                                                                                    'x-acl-action':
+                                                                                                      'image:get',
+                                                                                                    'x-decorator':
+                                                                                                      'DetailsBlockProvider',
+                                                                                                    'x-use-decorator-props':
+                                                                                                      'useDetailsDecoratorProps',
+                                                                                                    'x-decorator-props':
+                                                                                                      {
+                                                                                                        dataSource:
+                                                                                                          'main',
+                                                                                                        collection:
+                                                                                                          'image',
+                                                                                                        readPretty:
+                                                                                                          true,
+                                                                                                        action: 'get',
+                                                                                                      },
+                                                                                                    'x-toolbar':
+                                                                                                      'BlockSchemaToolbar',
+                                                                                                    'x-settings':
+                                                                                                      'blockSettings:details',
+                                                                                                    'x-component':
+                                                                                                      'CardItem',
+                                                                                                    'x-app-version':
+                                                                                                      '1.3.42-beta',
+                                                                                                    properties: {
+                                                                                                      juho6f9cld0: {
+                                                                                                        _isJSONSchemaObject:
+                                                                                                          true,
+                                                                                                        version: '2.0',
+                                                                                                        type: 'void',
+                                                                                                        'x-component':
+                                                                                                          'Details',
+                                                                                                        'x-read-pretty':
+                                                                                                          true,
+                                                                                                        'x-use-component-props':
+                                                                                                          'useDetailsProps',
+                                                                                                        'x-app-version':
+                                                                                                          '1.3.42-beta',
+                                                                                                        properties: {
+                                                                                                          '6xrgjg0w2j0':
+                                                                                                            {
+                                                                                                              _isJSONSchemaObject:
+                                                                                                                true,
+                                                                                                              version:
+                                                                                                                '2.0',
+                                                                                                              type: 'void',
+                                                                                                              'x-initializer':
+                                                                                                                'details:configureActions',
+                                                                                                              'x-component':
+                                                                                                                'ActionBar',
+                                                                                                              'x-component-props':
+                                                                                                                {
+                                                                                                                  style:
+                                                                                                                    {
+                                                                                                                      marginBottom: 24,
+                                                                                                                    },
+                                                                                                                },
+                                                                                                              'x-app-version':
+                                                                                                                '1.3.42-beta',
+                                                                                                              properties:
+                                                                                                                {
+                                                                                                                  tqtunfb7c5a:
+                                                                                                                    {
+                                                                                                                      _isJSONSchemaObject:
+                                                                                                                        true,
+                                                                                                                      version:
+                                                                                                                        '2.0',
+                                                                                                                      type: 'void',
+                                                                                                                      title:
+                                                                                                                        '{{ t("Edit") }}',
+                                                                                                                      'x-action':
+                                                                                                                        'update',
+                                                                                                                      'x-toolbar':
+                                                                                                                        'ActionSchemaToolbar',
+                                                                                                                      'x-settings':
+                                                                                                                        'actionSettings:edit',
+                                                                                                                      'x-component':
+                                                                                                                        'Action',
+                                                                                                                      'x-component-props':
+                                                                                                                        {
+                                                                                                                          openMode:
+                                                                                                                            'page',
+                                                                                                                          icon: 'EditOutlined',
+                                                                                                                          type: 'primary',
+                                                                                                                        },
+                                                                                                                      'x-action-context':
+                                                                                                                        {
+                                                                                                                          dataSource:
+                                                                                                                            'main',
+                                                                                                                          collection:
+                                                                                                                            'image',
+                                                                                                                        },
+                                                                                                                      'x-decorator':
+                                                                                                                        'ACLActionProvider',
+                                                                                                                      'x-app-version':
+                                                                                                                        '1.3.42-beta',
+                                                                                                                      properties:
+                                                                                                                        {
+                                                                                                                          drawer:
+                                                                                                                            {
+                                                                                                                              _isJSONSchemaObject:
+                                                                                                                                true,
+                                                                                                                              version:
+                                                                                                                                '2.0',
+                                                                                                                              type: 'void',
+                                                                                                                              title:
+                                                                                                                                '{{ t("Edit record") }}',
+                                                                                                                              'x-component':
+                                                                                                                                'Action.Container',
+                                                                                                                              'x-component-props':
+                                                                                                                                {
+                                                                                                                                  className:
+                                                                                                                                    'nb-action-popup',
+                                                                                                                                },
+                                                                                                                              'x-app-version':
+                                                                                                                                '1.3.42-beta',
+                                                                                                                              properties:
+                                                                                                                                {
+                                                                                                                                  tabs: {
+                                                                                                                                    _isJSONSchemaObject:
+                                                                                                                                      true,
+                                                                                                                                    version:
+                                                                                                                                      '2.0',
+                                                                                                                                    type: 'void',
+                                                                                                                                    'x-component':
+                                                                                                                                      'Tabs',
+                                                                                                                                    'x-component-props':
+                                                                                                                                      {},
+                                                                                                                                    'x-initializer':
+                                                                                                                                      'popup:addTab',
+                                                                                                                                    'x-app-version':
+                                                                                                                                      '1.3.42-beta',
+                                                                                                                                    properties:
+                                                                                                                                      {
+                                                                                                                                        tab1: {
+                                                                                                                                          _isJSONSchemaObject:
+                                                                                                                                            true,
+                                                                                                                                          version:
+                                                                                                                                            '2.0',
+                                                                                                                                          type: 'void',
+                                                                                                                                          title:
+                                                                                                                                            '{{t("Edit")}}',
+                                                                                                                                          'x-component':
+                                                                                                                                            'Tabs.TabPane',
+                                                                                                                                          'x-designer':
+                                                                                                                                            'Tabs.Designer',
+                                                                                                                                          'x-component-props':
+                                                                                                                                            {},
+                                                                                                                                          'x-app-version':
+                                                                                                                                            '1.3.42-beta',
+                                                                                                                                          properties:
+                                                                                                                                            {
+                                                                                                                                              grid: {
+                                                                                                                                                _isJSONSchemaObject:
+                                                                                                                                                  true,
+                                                                                                                                                version:
+                                                                                                                                                  '2.0',
+                                                                                                                                                type: 'void',
+                                                                                                                                                'x-component':
+                                                                                                                                                  'Grid',
+                                                                                                                                                'x-initializer':
+                                                                                                                                                  'popup:common:addBlock',
+                                                                                                                                                'x-app-version':
+                                                                                                                                                  '1.3.42-beta',
+                                                                                                                                                properties:
+                                                                                                                                                  {
+                                                                                                                                                    xswkkgymq30:
+                                                                                                                                                      {
+                                                                                                                                                        _isJSONSchemaObject:
+                                                                                                                                                          true,
+                                                                                                                                                        version:
+                                                                                                                                                          '2.0',
+                                                                                                                                                        type: 'void',
+                                                                                                                                                        'x-component':
+                                                                                                                                                          'Grid.Row',
+                                                                                                                                                        'x-app-version':
+                                                                                                                                                          '1.3.42-beta',
+                                                                                                                                                        properties:
+                                                                                                                                                          {
+                                                                                                                                                            pq2gdv03h0f:
+                                                                                                                                                              {
+                                                                                                                                                                _isJSONSchemaObject:
+                                                                                                                                                                  true,
+                                                                                                                                                                version:
+                                                                                                                                                                  '2.0',
+                                                                                                                                                                type: 'void',
+                                                                                                                                                                'x-component':
+                                                                                                                                                                  'Grid.Col',
+                                                                                                                                                                'x-app-version':
+                                                                                                                                                                  '1.3.42-beta',
+                                                                                                                                                                properties:
+                                                                                                                                                                  {
+                                                                                                                                                                    pmoy87u1q83:
+                                                                                                                                                                      {
+                                                                                                                                                                        _isJSONSchemaObject:
+                                                                                                                                                                          true,
+                                                                                                                                                                        version:
+                                                                                                                                                                          '2.0',
+                                                                                                                                                                        type: 'void',
+                                                                                                                                                                        'x-acl-action':
+                                                                                                                                                                          'image:get',
+                                                                                                                                                                        'x-decorator':
+                                                                                                                                                                          'DetailsBlockProvider',
+                                                                                                                                                                        'x-use-decorator-props':
+                                                                                                                                                                          'useDetailsDecoratorProps',
+                                                                                                                                                                        'x-decorator-props':
+                                                                                                                                                                          {
+                                                                                                                                                                            dataSource:
+                                                                                                                                                                              'main',
+                                                                                                                                                                            collection:
+                                                                                                                                                                              'image',
+                                                                                                                                                                            readPretty:
+                                                                                                                                                                              true,
+                                                                                                                                                                            action:
+                                                                                                                                                                              'get',
+                                                                                                                                                                          },
+                                                                                                                                                                        'x-toolbar':
+                                                                                                                                                                          'BlockSchemaToolbar',
+                                                                                                                                                                        'x-settings':
+                                                                                                                                                                          'blockSettings:details',
+                                                                                                                                                                        'x-component':
+                                                                                                                                                                          'CardItem',
+                                                                                                                                                                        'x-app-version':
+                                                                                                                                                                          '1.3.42-beta',
+                                                                                                                                                                        properties:
+                                                                                                                                                                          {
+                                                                                                                                                                            krrpne6bx2e:
+                                                                                                                                                                              {
+                                                                                                                                                                                _isJSONSchemaObject:
+                                                                                                                                                                                  true,
+                                                                                                                                                                                version:
+                                                                                                                                                                                  '2.0',
+                                                                                                                                                                                type: 'void',
+                                                                                                                                                                                'x-component':
+                                                                                                                                                                                  'Details',
+                                                                                                                                                                                'x-read-pretty':
+                                                                                                                                                                                  true,
+                                                                                                                                                                                'x-use-component-props':
+                                                                                                                                                                                  'useDetailsProps',
+                                                                                                                                                                                'x-app-version':
+                                                                                                                                                                                  '1.3.42-beta',
+                                                                                                                                                                                properties:
+                                                                                                                                                                                  {
+                                                                                                                                                                                    '4eixb6olg5s':
+                                                                                                                                                                                      {
+                                                                                                                                                                                        _isJSONSchemaObject:
+                                                                                                                                                                                          true,
+                                                                                                                                                                                        version:
+                                                                                                                                                                                          '2.0',
+                                                                                                                                                                                        type: 'void',
+                                                                                                                                                                                        'x-initializer':
+                                                                                                                                                                                          'details:configureActions',
+                                                                                                                                                                                        'x-component':
+                                                                                                                                                                                          'ActionBar',
+                                                                                                                                                                                        'x-component-props':
+                                                                                                                                                                                          {
+                                                                                                                                                                                            style:
+                                                                                                                                                                                              {
+                                                                                                                                                                                                marginBottom: 24,
+                                                                                                                                                                                              },
+                                                                                                                                                                                          },
+                                                                                                                                                                                        'x-app-version':
+                                                                                                                                                                                          '1.3.42-beta',
+                                                                                                                                                                                        'x-uid':
+                                                                                                                                                                                          'mtk4qib0pmb',
+                                                                                                                                                                                        'x-async':
+                                                                                                                                                                                          false,
+                                                                                                                                                                                        'x-index': 1,
+                                                                                                                                                                                      },
+                                                                                                                                                                                    grid: {
+                                                                                                                                                                                      _isJSONSchemaObject:
+                                                                                                                                                                                        true,
+                                                                                                                                                                                      version:
+                                                                                                                                                                                        '2.0',
+                                                                                                                                                                                      type: 'void',
+                                                                                                                                                                                      'x-component':
+                                                                                                                                                                                        'Grid',
+                                                                                                                                                                                      'x-initializer':
+                                                                                                                                                                                        'details:configureFields',
+                                                                                                                                                                                      'x-app-version':
+                                                                                                                                                                                        '1.3.42-beta',
+                                                                                                                                                                                      properties:
+                                                                                                                                                                                        {
+                                                                                                                                                                                          '5qv0bbqybgm':
+                                                                                                                                                                                            {
+                                                                                                                                                                                              _isJSONSchemaObject:
+                                                                                                                                                                                                true,
+                                                                                                                                                                                              version:
+                                                                                                                                                                                                '2.0',
+                                                                                                                                                                                              type: 'void',
+                                                                                                                                                                                              'x-component':
+                                                                                                                                                                                                'Grid.Row',
+                                                                                                                                                                                              'x-app-version':
+                                                                                                                                                                                                '1.3.42-beta',
+                                                                                                                                                                                              properties:
+                                                                                                                                                                                                {
+                                                                                                                                                                                                  x1e4gnfeupv:
+                                                                                                                                                                                                    {
+                                                                                                                                                                                                      _isJSONSchemaObject:
+                                                                                                                                                                                                        true,
+                                                                                                                                                                                                      version:
+                                                                                                                                                                                                        '2.0',
+                                                                                                                                                                                                      type: 'void',
+                                                                                                                                                                                                      'x-component':
+                                                                                                                                                                                                        'Grid.Col',
+                                                                                                                                                                                                      'x-app-version':
+                                                                                                                                                                                                        '1.3.42-beta',
+                                                                                                                                                                                                      properties:
+                                                                                                                                                                                                        {
+                                                                                                                                                                                                          attachment:
+                                                                                                                                                                                                            {
+                                                                                                                                                                                                              _isJSONSchemaObject:
+                                                                                                                                                                                                                true,
+                                                                                                                                                                                                              version:
+                                                                                                                                                                                                                '2.0',
+                                                                                                                                                                                                              type: 'string',
+                                                                                                                                                                                                              'x-toolbar':
+                                                                                                                                                                                                                'FormItemSchemaToolbar',
+                                                                                                                                                                                                              'x-settings':
+                                                                                                                                                                                                                'fieldSettings:FormItem',
+                                                                                                                                                                                                              'x-component':
+                                                                                                                                                                                                                'CollectionField',
+                                                                                                                                                                                                              'x-decorator':
+                                                                                                                                                                                                                'FormItem',
+                                                                                                                                                                                                              'x-collection-field':
+                                                                                                                                                                                                                'image.attachment',
+                                                                                                                                                                                                              'x-component-props':
+                                                                                                                                                                                                                {},
+                                                                                                                                                                                                              'x-use-component-props':
+                                                                                                                                                                                                                'useAttachmentFieldProps',
+                                                                                                                                                                                                              'x-app-version':
+                                                                                                                                                                                                                '1.3.42-beta',
+                                                                                                                                                                                                              'x-uid':
+                                                                                                                                                                                                                'dhcu2vf5fxm',
+                                                                                                                                                                                                              'x-async':
+                                                                                                                                                                                                                false,
+                                                                                                                                                                                                              'x-index': 1,
+                                                                                                                                                                                                            },
+                                                                                                                                                                                                        },
+                                                                                                                                                                                                      'x-uid':
+                                                                                                                                                                                                        'yl57to4ttjy',
+                                                                                                                                                                                                      'x-async':
+                                                                                                                                                                                                        false,
+                                                                                                                                                                                                      'x-index': 1,
+                                                                                                                                                                                                    },
+                                                                                                                                                                                                },
+                                                                                                                                                                                              'x-uid':
+                                                                                                                                                                                                'eyqz6iaciv5',
+                                                                                                                                                                                              'x-async':
+                                                                                                                                                                                                false,
+                                                                                                                                                                                              'x-index': 1,
+                                                                                                                                                                                            },
+                                                                                                                                                                                        },
+                                                                                                                                                                                      'x-uid':
+                                                                                                                                                                                        '0sx8rthcy15',
+                                                                                                                                                                                      'x-async':
+                                                                                                                                                                                        false,
+                                                                                                                                                                                      'x-index': 2,
+                                                                                                                                                                                    },
+                                                                                                                                                                                  },
+                                                                                                                                                                                'x-uid':
+                                                                                                                                                                                  'uh0vhvhnltl',
+                                                                                                                                                                                'x-async':
+                                                                                                                                                                                  false,
+                                                                                                                                                                                'x-index': 1,
+                                                                                                                                                                              },
+                                                                                                                                                                          },
+                                                                                                                                                                        'x-uid':
+                                                                                                                                                                          'ogkh4von4yu',
+                                                                                                                                                                        'x-async':
+                                                                                                                                                                          false,
+                                                                                                                                                                        'x-index': 1,
+                                                                                                                                                                      },
+                                                                                                                                                                  },
+                                                                                                                                                                'x-uid':
+                                                                                                                                                                  'lhgnxv5urvf',
+                                                                                                                                                                'x-async':
+                                                                                                                                                                  false,
+                                                                                                                                                                'x-index': 1,
+                                                                                                                                                              },
+                                                                                                                                                          },
+                                                                                                                                                        'x-uid':
+                                                                                                                                                          '3rdklcguzy1',
+                                                                                                                                                        'x-async':
+                                                                                                                                                          false,
+                                                                                                                                                        'x-index': 1,
+                                                                                                                                                      },
+                                                                                                                                                  },
+                                                                                                                                                'x-uid':
+                                                                                                                                                  'kbzczrd39z3',
+                                                                                                                                                'x-async':
+                                                                                                                                                  false,
+                                                                                                                                                'x-index': 1,
+                                                                                                                                              },
+                                                                                                                                            },
+                                                                                                                                          'x-uid':
+                                                                                                                                            'saexcyuo5ao',
+                                                                                                                                          'x-async':
+                                                                                                                                            false,
+                                                                                                                                          'x-index': 1,
+                                                                                                                                        },
+                                                                                                                                      },
+                                                                                                                                    'x-uid':
+                                                                                                                                      'l6gxsphiv7p',
+                                                                                                                                    'x-async':
+                                                                                                                                      false,
+                                                                                                                                    'x-index': 1,
+                                                                                                                                  },
+                                                                                                                                },
+                                                                                                                              'x-uid':
+                                                                                                                                '5j05xhjnvhu',
+                                                                                                                              'x-async':
+                                                                                                                                false,
+                                                                                                                              'x-index': 1,
+                                                                                                                            },
+                                                                                                                        },
+                                                                                                                      'x-uid':
+                                                                                                                        '9qid8vlu438',
+                                                                                                                      'x-async':
+                                                                                                                        false,
+                                                                                                                      'x-index': 1,
+                                                                                                                    },
+                                                                                                                },
+                                                                                                              'x-uid':
+                                                                                                                'hnt0v2iaf1q',
+                                                                                                              'x-async':
+                                                                                                                false,
+                                                                                                              'x-index': 1,
+                                                                                                            },
+                                                                                                          grid: {
+                                                                                                            _isJSONSchemaObject:
+                                                                                                              true,
+                                                                                                            version:
+                                                                                                              '2.0',
+                                                                                                            type: 'void',
+                                                                                                            'x-component':
+                                                                                                              'Grid',
+                                                                                                            'x-initializer':
+                                                                                                              'details:configureFields',
+                                                                                                            'x-app-version':
+                                                                                                              '1.3.42-beta',
+                                                                                                            properties:
+                                                                                                              {
+                                                                                                                '4ljipl6fcex':
+                                                                                                                  {
+                                                                                                                    _isJSONSchemaObject:
+                                                                                                                      true,
+                                                                                                                    version:
+                                                                                                                      '2.0',
+                                                                                                                    type: 'void',
+                                                                                                                    'x-component':
+                                                                                                                      'Grid.Row',
+                                                                                                                    'x-app-version':
+                                                                                                                      '1.3.42-beta',
+                                                                                                                    properties:
+                                                                                                                      {
+                                                                                                                        o28cy7so1co:
+                                                                                                                          {
+                                                                                                                            _isJSONSchemaObject:
+                                                                                                                              true,
+                                                                                                                            version:
+                                                                                                                              '2.0',
+                                                                                                                            type: 'void',
+                                                                                                                            'x-component':
+                                                                                                                              'Grid.Col',
+                                                                                                                            'x-app-version':
+                                                                                                                              '1.3.42-beta',
+                                                                                                                            properties:
+                                                                                                                              {
+                                                                                                                                attachment:
+                                                                                                                                  {
+                                                                                                                                    _isJSONSchemaObject:
+                                                                                                                                      true,
+                                                                                                                                    version:
+                                                                                                                                      '2.0',
+                                                                                                                                    type: 'string',
+                                                                                                                                    'x-toolbar':
+                                                                                                                                      'FormItemSchemaToolbar',
+                                                                                                                                    'x-settings':
+                                                                                                                                      'fieldSettings:FormItem',
+                                                                                                                                    'x-component':
+                                                                                                                                      'CollectionField',
+                                                                                                                                    'x-decorator':
+                                                                                                                                      'FormItem',
+                                                                                                                                    'x-collection-field':
+                                                                                                                                      'image.attachment',
+                                                                                                                                    'x-component-props':
+                                                                                                                                      {},
+                                                                                                                                    'x-use-component-props':
+                                                                                                                                      'useAttachmentFieldProps',
+                                                                                                                                    'x-app-version':
+                                                                                                                                      '1.3.42-beta',
+                                                                                                                                    'x-uid':
+                                                                                                                                      'u19h5djk1af',
+                                                                                                                                    'x-async':
+                                                                                                                                      false,
+                                                                                                                                    'x-index': 1,
+                                                                                                                                  },
+                                                                                                                              },
+                                                                                                                            'x-uid':
+                                                                                                                              't1m1yr1sddj',
+                                                                                                                            'x-async':
+                                                                                                                              false,
+                                                                                                                            'x-index': 1,
+                                                                                                                          },
+                                                                                                                      },
+                                                                                                                    'x-uid':
+                                                                                                                      'h3ok06z8mnt',
+                                                                                                                    'x-async':
+                                                                                                                      false,
+                                                                                                                    'x-index': 1,
+                                                                                                                  },
+                                                                                                              },
+                                                                                                            'x-uid':
+                                                                                                              'gfw19ntb1ig',
+                                                                                                            'x-async':
+                                                                                                              false,
+                                                                                                            'x-index': 2,
+                                                                                                          },
+                                                                                                        },
+                                                                                                        'x-uid':
+                                                                                                          '5lreqos5pcm',
+                                                                                                        'x-async':
+                                                                                                          false,
+                                                                                                        'x-index': 1,
+                                                                                                      },
+                                                                                                    },
+                                                                                                    'x-uid':
+                                                                                                      '28dc9dbzmnd',
+                                                                                                    'x-async': false,
+                                                                                                    'x-index': 1,
+                                                                                                  },
+                                                                                                },
+                                                                                                'x-uid': '0nwx7uvpdrw',
+                                                                                                'x-async': false,
+                                                                                                'x-index': 1,
+                                                                                              },
+                                                                                            },
+                                                                                            'x-uid': 'vh98qnnifff',
+                                                                                            'x-async': false,
+                                                                                            'x-index': 1,
+                                                                                          },
+                                                                                        },
+                                                                                        'x-uid': 'nklyrutj2hw',
+                                                                                        'x-async': false,
+                                                                                        'x-index': 1,
+                                                                                      },
+                                                                                    },
+                                                                                    'x-uid': 'jzi0d8nhv9t',
+                                                                                    'x-async': false,
+                                                                                    'x-index': 1,
+                                                                                  },
+                                                                                },
+                                                                                'x-uid': 'wiru51cp3bj',
+                                                                                'x-async': false,
+                                                                                'x-index': 1,
+                                                                              },
+                                                                            },
+                                                                            'x-uid': 'kcy9s6f3kll',
+                                                                            'x-async': false,
+                                                                            'x-index': 1,
+                                                                          },
+                                                                        },
+                                                                        'x-uid': 'k52k7dy2jyh',
+                                                                        'x-async': false,
+                                                                        'x-index': 1,
+                                                                      },
+                                                                    },
+                                                                    'x-uid': 'e9xf3xhivpu',
+                                                                    'x-async': false,
+                                                                    'x-index': 1,
+                                                                  },
+                                                                  grid: {
+                                                                    _isJSONSchemaObject: true,
+                                                                    version: '2.0',
+                                                                    type: 'void',
+                                                                    'x-component': 'Grid',
+                                                                    'x-initializer': 'details:configureFields',
+                                                                    'x-app-version': '1.3.42-beta',
+                                                                    properties: {
+                                                                      pmh5rz8nxf0: {
+                                                                        _isJSONSchemaObject: true,
+                                                                        version: '2.0',
+                                                                        type: 'void',
+                                                                        'x-component': 'Grid.Row',
+                                                                        'x-app-version': '1.3.42-beta',
+                                                                        properties: {
+                                                                          wdi21i7x7th: {
+                                                                            _isJSONSchemaObject: true,
+                                                                            version: '2.0',
+                                                                            type: 'void',
+                                                                            'x-component': 'Grid.Col',
+                                                                            'x-app-version': '1.3.42-beta',
+                                                                            properties: {
+                                                                              attachment: {
+                                                                                _isJSONSchemaObject: true,
+                                                                                version: '2.0',
+                                                                                type: 'string',
+                                                                                'x-toolbar': 'FormItemSchemaToolbar',
+                                                                                'x-settings': 'fieldSettings:FormItem',
+                                                                                'x-component': 'CollectionField',
+                                                                                'x-decorator': 'FormItem',
+                                                                                'x-collection-field':
+                                                                                  'image.attachment',
+                                                                                'x-component-props': {},
+                                                                                'x-use-component-props':
+                                                                                  'useAttachmentFieldProps',
+                                                                                'x-app-version': '1.3.42-beta',
+                                                                                'x-uid': 'nsxtdx4v0on',
+                                                                                'x-async': false,
+                                                                                'x-index': 1,
+                                                                              },
+                                                                            },
+                                                                            'x-uid': '7jwrrijskjo',
+                                                                            'x-async': false,
+                                                                            'x-index': 1,
+                                                                          },
+                                                                        },
+                                                                        'x-uid': 'ioxlkouqs1s',
+                                                                        'x-async': false,
+                                                                        'x-index': 1,
+                                                                      },
+                                                                    },
+                                                                    'x-uid': 'c7v6g526r3o',
+                                                                    'x-async': false,
+                                                                    'x-index': 2,
+                                                                  },
+                                                                },
+                                                                'x-uid': 'xvnohfnt59r',
+                                                                'x-async': false,
+                                                                'x-index': 1,
+                                                              },
+                                                            },
+                                                            'x-uid': '2w9fddhi7ig',
+                                                            'x-async': false,
+                                                            'x-index': 1,
+                                                          },
+                                                        },
+                                                        'x-uid': '2wm58u6r3pu',
+                                                        'x-async': false,
+                                                        'x-index': 1,
+                                                      },
+                                                    },
+                                                    'x-uid': '1gl08rddg53',
+                                                    'x-async': false,
+                                                    'x-index': 1,
+                                                  },
+                                                },
+                                                'x-uid': 'ljevsl3tauf',
+                                                'x-async': false,
+                                                'x-index': 1,
+                                              },
+                                            },
+                                            'x-uid': 'ldqvb7su74d',
+                                            'x-async': false,
+                                            'x-index': 1,
+                                          },
+                                        },
+                                        'x-uid': 'a6vwhe6f4di',
+                                        'x-async': false,
+                                        'x-index': 1,
+                                      },
+                                    },
+                                    'x-uid': 'ufel6b95xab',
+                                    'x-async': false,
+                                    'x-index': 1,
+                                  },
+                                },
+                                'x-uid': 'ynfe2e3advc',
+                                'x-async': false,
+                                'x-index': 1,
+                              },
+                            },
+                            'x-uid': 'muv6sn88u21',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-async': false,
+                        'x-index': 1,
+                      },
+                      aeie2yj3330: {
+                        _isJSONSchemaObject: true,
+                        version: '2.0',
+                        type: 'void',
+                        'x-decorator': 'TableV2.Column.Decorator',
+                        'x-toolbar': 'TableColumnSchemaToolbar',
+                        'x-settings': 'fieldSettings:TableColumn',
+                        'x-component': 'TableV2.Column',
+                        'x-app-version': '1.3.42-beta',
+                        properties: {
+                          attachment: {
+                            _isJSONSchemaObject: true,
+                            version: '2.0',
+                            'x-collection-field': 'image.attachment',
+                            'x-component': 'CollectionField',
+                            'x-component-props': {
+                              size: 'small',
+                            },
+                            'x-read-pretty': true,
+                            'x-decorator': null,
+                            'x-decorator-props': {
+                              labelStyle: {
+                                display: 'none',
+                              },
+                            },
+                            'x-use-component-props': 'useAttachmentFieldProps',
+                            'x-app-version': '1.3.42-beta',
+                            'x-uid': 'v8ob310s6rw',
+                            'x-async': false,
+                            'x-index': 1,
+                          },
+                        },
+                        'x-uid': 'nl49qq20w9u',
+                        'x-async': false,
+                        'x-index': 2,
+                      },
+                    },
+                    'x-uid': 'mmmy06sb66h',
+                    'x-async': false,
+                    'x-index': 2,
+                  },
+                },
+                'x-uid': '544lfyanyxa',
+                'x-async': false,
+                'x-index': 1,
+              },
+            },
+            'x-uid': '8o70uof3o2h',
+            'x-async': false,
+            'x-index': 1,
+          },
+        },
+        'x-uid': 'hi06e74rl8e',
+        'x-async': false,
+        'x-index': 1,
+      },
+    },
+    name: 'q8vu8vaasre',
+    'x-uid': 'q8vu8vaasre',
+    'x-async': true,
+    'x-index': 1,
+  },
+};
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/zIndex.test.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/zIndex.test.ts
new file mode 100644
index 0000000000..625bdc8cc9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/__e2e__/zIndex.test.ts
@@ -0,0 +1,72 @@
+/**
+ * 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 { expect, test } from '@nocobase/test/e2e';
+import { shouldDisplayImageNormally } from './templates';
+
+test.describe('zIndex', () => {
+  test('should display image normally', async ({ page, mockMobilePage, mockRecord }) => {
+    const nocoPage = await mockMobilePage(shouldDisplayImageNormally).waitForInit();
+    const record = await mockRecord('image');
+    await nocoPage.goto();
+
+    const title = record.attachment[0].title;
+
+    // 通过鼠标 hover 到 Add block 按钮来检查是否符合预期
+    const check = async (level: number) => {
+      try {
+        switch (level) {
+          case 0:
+            await page.getByLabel('schema-initializer-Grid-').hover({ timeout: 300 });
+            break;
+          case 1:
+            await page.getByLabel('schema-initializer-Grid-popup').hover({ timeout: 300 });
+            break;
+          case 2:
+            await page.getByLabel('schema-initializer-Grid-popup').nth(1).hover({ timeout: 300 });
+            break;
+          case 3:
+            await page.getByLabel('schema-initializer-Grid-popup').nth(2).hover({ timeout: 300 });
+            break;
+        }
+      } catch (e) {
+        return;
+      }
+      await page.waitForTimeout(300);
+      await expect(page.getByText('Desktop data blocks')).not.toBeVisible();
+    };
+
+    // 1. 在主页面，点击图片预览，图片不能被主页面盖住
+    await page.getByRole('link', { name: title }).click();
+    await page.waitForTimeout(300);
+    await check(0);
+    await page.getByLabel('Close lightbox').click();
+
+    // 2. 进入第一层子页面，然后点击图片预览， 图片不能被子页面盖住
+    await page.getByLabel('action-Action.Link-View-view-').click();
+    await page.getByRole('link', { name: title }).nth(1).click();
+    await page.waitForTimeout(300);
+    await check(1);
+    await page.getByLabel('Close lightbox').click();
+
+    // 3. 进入第二层子页面，然后点击图片预览， 图片不能被子页面盖住
+    await page.getByLabel('action-Action-Edit-update-').click();
+    await page.getByRole('link', { name: title }).nth(2).click();
+    await page.waitForTimeout(300);
+    await check(2);
+    await page.getByLabel('Close lightbox').click();
+
+    // 4. 进入第三层子页面，然后点击图片预览， 图片不能被子页面盖住
+    await page.getByLabel('action-Action-Edit-update-').nth(2).click();
+    await page.getByRole('link', { name: title }).nth(3).click();
+    await page.waitForTimeout(300);
+    await check(3);
+    await page.getByLabel('Close lightbox').click();
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/ActionDrawer.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/ActionDrawer.tsx
index 6e0e7baea6..39a2ebd34d 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/ActionDrawer.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/ActionDrawer.tsx
@@ -8,14 +8,14 @@
  */
 
 import { ISchema, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
-import { Action, SchemaComponent, useActionContext } from '@nocobase/client';
+import { Action, SchemaComponent, useActionContext, useZIndexContext, zIndexContext } from '@nocobase/client';
 import { ConfigProvider } from 'antd';
 import { Popup } from 'antd-mobile';
 import { CloseOutline } from 'antd-mobile-icons';
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { useMobileActionDrawerStyle } from './ActionDrawer.style';
-import { BasicZIndexProvider, MIN_Z_INDEX_INCREMENT, useBasicZIndex } from './BasicZIndexProvider';
 import { usePopupContainer } from './FilterAction';
+import { MIN_Z_INDEX_INCREMENT } from './zIndex';
 
 export const ActionDrawerUsedInMobile: any = observer((props: { footerNodeName?: string }) => {
   const fieldSchema = useFieldSchema();
@@ -23,7 +23,7 @@ export const ActionDrawerUsedInMobile: any = observer((props: { footerNodeName?:
   const { visible, setVisible } = useActionContext();
   const { popupContainerRef, visiblePopup } = usePopupContainer(visible);
   const { styles } = useMobileActionDrawerStyle();
-  const { basicZIndex } = useBasicZIndex();
+  const parentZIndex = useZIndexContext();
 
   // this schema need to add padding in the content area of the popup
   const isSpecialSchema = isChangePasswordSchema(fieldSchema) || isEditProfileSchema(fieldSchema);
@@ -32,7 +32,7 @@ export const ActionDrawerUsedInMobile: any = observer((props: { footerNodeName?:
 
   const specialStyle = isSpecialSchema ? { backgroundColor: 'white' } : {};
 
-  const newZIndex = basicZIndex + MIN_Z_INDEX_INCREMENT;
+  const newZIndex = parentZIndex + MIN_Z_INDEX_INCREMENT;
 
   const zIndexStyle = useMemo(() => {
     return {
@@ -66,7 +66,7 @@ export const ActionDrawerUsedInMobile: any = observer((props: { footerNodeName?:
   }, [newZIndex]);
 
   return (
-    <BasicZIndexProvider basicZIndex={newZIndex}>
+    <zIndexContext.Provider value={newZIndex}>
       <ConfigProvider theme={theme}>
         <Popup
           visible={visiblePopup}
@@ -120,7 +120,7 @@ export const ActionDrawerUsedInMobile: any = observer((props: { footerNodeName?:
           ) : null}
         </Popup>
       </ConfigProvider>
-    </BasicZIndexProvider>
+    </zIndexContext.Provider>
   );
 });
 
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/BasicZIndexProvider.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/BasicZIndexProvider.tsx
deleted file mode 100644
index c802e0d3d1..0000000000
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/BasicZIndexProvider.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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 React, { useMemo } from 'react';
-
-const BasicZIndexContext = React.createContext<{
-  basicZIndex: number;
-}>({
-  basicZIndex: 0,
-});
-
-/**
- * used to accumulate z-index in nested popups
- * @param props
- * @returns
- */
-export const BasicZIndexProvider: React.FC<{ basicZIndex: number }> = (props) => {
-  const value = useMemo(() => ({ basicZIndex: props.basicZIndex }), [props.basicZIndex]);
-  return <BasicZIndexContext.Provider value={value}>{props.children}</BasicZIndexContext.Provider>;
-};
-
-export const useBasicZIndex = () => {
-  return React.useContext(BasicZIndexContext);
-};
-
-// minimum z-index increment
-export const MIN_Z_INDEX_INCREMENT = 10;
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/FilterAction.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/FilterAction.tsx
index 4370e8449b..0a21e37e94 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/FilterAction.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/FilterAction.tsx
@@ -7,14 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Filter, withDynamicSchemaProps } from '@nocobase/client';
+import { Filter, useZIndexContext, withDynamicSchemaProps } from '@nocobase/client';
 import { ConfigProvider } from 'antd';
 import { Popup } from 'antd-mobile';
 import { CloseOutline } from 'antd-mobile-icons';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMobileActionDrawerStyle } from './ActionDrawer.style';
-import { MIN_Z_INDEX_INCREMENT, useBasicZIndex } from './BasicZIndexProvider';
+import { MIN_Z_INDEX_INCREMENT } from './zIndex';
 
 const OriginFilterAction = Filter.Action;
 
@@ -24,11 +24,11 @@ export const FilterAction = withDynamicSchemaProps((props) => {
       {...props}
       Container={(props) => {
         const { visiblePopup, popupContainerRef } = usePopupContainer(props.open);
-        const { basicZIndex } = useBasicZIndex();
+        const parentZIndex = useZIndexContext();
         const { styles } = useMobileActionDrawerStyle();
         const { t } = useTranslation();
 
-        const newZIndex = basicZIndex + MIN_Z_INDEX_INCREMENT;
+        const newZIndex = parentZIndex + MIN_Z_INDEX_INCREMENT;
 
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const closePopup = useCallback(() => {
@@ -116,9 +116,9 @@ export const usePopupContainer = (visible: boolean) => {
   const [mobileContainer] = useState<HTMLElement>(() => document.querySelector('.mobile-container'));
   const [visiblePopup, setVisiblePopup] = useState(false);
   const popupContainerRef = React.useRef<HTMLDivElement>(null);
-  const { basicZIndex } = useBasicZIndex();
+  const parentZIndex = useZIndexContext();
 
-  const newZIndex = basicZIndex + MIN_Z_INDEX_INCREMENT;
+  const newZIndex = parentZIndex + MIN_Z_INDEX_INCREMENT;
 
   useEffect(() => {
     if (!visible) {
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/InternalPopoverNester.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/InternalPopoverNester.tsx
index 3ce77d41d9..03207a8a70 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/InternalPopoverNester.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/InternalPopoverNester.tsx
@@ -8,22 +8,23 @@
  */
 
 import { useField } from '@formily/react';
+import { useZIndexContext, zIndexContext } from '@nocobase/client';
 import { ConfigProvider } from 'antd';
 import { Popup } from 'antd-mobile';
 import { CloseOutline } from 'antd-mobile-icons';
 import React, { useCallback, useMemo } from 'react';
-import { BasicZIndexProvider, MIN_Z_INDEX_INCREMENT, useBasicZIndex } from './BasicZIndexProvider';
 import { usePopupContainer } from './FilterAction';
 import { useInternalPopoverNesterUsedInMobileStyle } from './InternalPopoverNester.style';
+import { MIN_Z_INDEX_INCREMENT } from './zIndex';
 
 const Container = (props) => {
   const { onOpenChange } = props;
   const { visiblePopup, popupContainerRef } = usePopupContainer(props.open);
   const { styles } = useInternalPopoverNesterUsedInMobileStyle();
   const field = useField();
-  const { basicZIndex } = useBasicZIndex();
+  const parentZIndex = useZIndexContext();
 
-  const newZIndex = basicZIndex + MIN_Z_INDEX_INCREMENT;
+  const newZIndex = parentZIndex + MIN_Z_INDEX_INCREMENT;
   const title = field.title || '';
 
   const zIndexStyle = useMemo(() => {
@@ -49,7 +50,7 @@ const Container = (props) => {
   }, [newZIndex]);
 
   return (
-    <BasicZIndexProvider basicZIndex={newZIndex}>
+    <zIndexContext.Provider value={newZIndex}>
       <ConfigProvider theme={theme}>
         <div onClick={openPopup}>{props.children}</div>
         <Popup
@@ -77,7 +78,7 @@ const Container = (props) => {
           <div style={{ height: 50 }}></div>
         </Popup>
       </ConfigProvider>
-    </BasicZIndexProvider>
+    </zIndexContext.Provider>
   );
 };
 
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.tsx
index 3c3d474642..166111056d 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/mobile-action-page/MobileActionPage.tsx
@@ -16,12 +16,14 @@ import {
   useActionContext,
   useApp,
   useTabsContext,
+  useZIndexContext,
+  zIndexContext,
 } from '@nocobase/client';
 import _ from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { usePluginTranslation } from '../../locale';
-import { BasicZIndexProvider, MIN_Z_INDEX_INCREMENT, useBasicZIndex } from '../BasicZIndexProvider';
+import { MIN_Z_INDEX_INCREMENT } from '../zIndex';
 import { useMobileActionPageStyle } from './MobileActionPage.style';
 import { MobileTabsForMobileActionPage } from './MobileTabsForMobileActionPage';
 
@@ -94,11 +96,11 @@ export const MobileActionPage = ({ level, footerNodeName }) => {
   const { styles } = useMobileActionPageStyle();
   const tabContext = useTabsContext();
   const containerDOM = useMemo(() => document.querySelector('.nb-mobile-subpages-slot'), []);
-  const { basicZIndex } = useBasicZIndex();
+  const parentZIndex = useZIndexContext();
 
   // in nested popups, basicZIndex is an accumulated value to ensure that
   // the z-index of the current level is always higher than the previous level
-  const newZIndex = basicZIndex + MIN_Z_INDEX_INCREMENT + (level || 1);
+  const newZIndex = parentZIndex + MIN_Z_INDEX_INCREMENT + (level || 1);
 
   const footerSchema = fieldSchema.reduceProperties((buf, s) => {
     if (s['x-component'] === footerNodeName) {
@@ -118,7 +120,7 @@ export const MobileActionPage = ({ level, footerNodeName }) => {
   }
 
   const actionPageNode = (
-    <BasicZIndexProvider basicZIndex={newZIndex}>
+    <zIndexContext.Provider value={newZIndex}>
       <div className={styles.container} style={zIndexStyle}>
         <TabsContextProvider {...tabContext} tabBarExtraContent={<BackButtonUsedInSubPage />} tabBarGutter={48}>
           <SchemaComponent components={components} schema={fieldSchema} onlyRenderProperties />
@@ -136,7 +138,7 @@ export const MobileActionPage = ({ level, footerNodeName }) => {
           </div>
         )}
       </div>
-    </BasicZIndexProvider>
+    </zIndexContext.Provider>
   );
 
   if (containerDOM) {
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/zIndex.ts b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/zIndex.ts
new file mode 100644
index 0000000000..f59af7ae7e
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/adaptor-of-desktop/zIndex.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.
+ */
+
+// minimum z-index increment
+export const MIN_Z_INDEX_INCREMENT = 10;
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
index 45506f07d6..d0f1f404ab 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/mobile/Mobile.tsx
@@ -18,12 +18,12 @@ import {
   OpenModeProvider,
   useAssociationFieldModeContext,
   usePlugin,
+  zIndexContext,
 } from '@nocobase/client';
 import React from 'react';
 import { isDesktop } from 'react-device-detect';
 
 import { ActionDrawerUsedInMobile, useToAdaptActionDrawerToMobile } from '../adaptor-of-desktop/ActionDrawer';
-import { BasicZIndexProvider } from '../adaptor-of-desktop/BasicZIndexProvider';
 import { useToAdaptFilterActionToMobile } from '../adaptor-of-desktop/FilterAction';
 import { InternalPopoverNesterUsedInMobile } from '../adaptor-of-desktop/InternalPopoverNester';
 import { MobileActionPage } from '../adaptor-of-desktop/mobile-action-page/MobileActionPage';
@@ -102,9 +102,9 @@ export const Mobile = () => {
                   <ResetSchemaOptionsProvider>
                     <AssociationFieldModeProvider modeToComponent={modeToComponent}>
                       {/* the z-index of all popups and subpages will be based on this value */}
-                      <BasicZIndexProvider basicZIndex={1000}>
+                      <zIndexContext.Provider value={100}>
                         <MobileRouter />
-                      </BasicZIndexProvider>
+                      </zIndexContext.Provider>
                     </AssociationFieldModeProvider>
                   </ResetSchemaOptionsProvider>
                 </MobileAppProvider>

From 7f83dad158af6173e573b743564299ff86f997fb Mon Sep 17 00:00:00 2001
From: xilesun <2013xile@gmail.com>
Date: Wed, 30 Oct 2024 13:47:01 +0800
Subject: [PATCH 7/8] chore(ci): update

---
 .github/workflows/manual-build-pro-image.yml        | 2 +-
 .github/workflows/manual-build-pro-plugin-image.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/manual-build-pro-image.yml b/.github/workflows/manual-build-pro-image.yml
index 4186ac7a48..2e75ca4fff 100644
--- a/.github/workflows/manual-build-pro-image.yml
+++ b/.github/workflows/manual-build-pro-image.yml
@@ -1,7 +1,7 @@
 name: Manual build pro image
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pr_number }}-${{ github.event.inputs.nocobase_pr_number }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }}
   cancel-in-progress: true
 
 run-name: Build pro image ${{ github.ref }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }}
diff --git a/.github/workflows/manual-build-pro-plugin-image.yml b/.github/workflows/manual-build-pro-plugin-image.yml
index b7e8975917..c7f7323f5c 100644
--- a/.github/workflows/manual-build-pro-plugin-image.yml
+++ b/.github/workflows/manual-build-pro-plugin-image.yml
@@ -1,10 +1,10 @@
 name: Build pro plugin docker image
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.pro_plugin }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }}
   cancel-in-progress: true
 
-run-name: Build pro plugin image ${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }}
+run-name: Build pro plugin image ${{ github.ref }}-${{ inputs.pro_plugin }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }}
 
 on:
   workflow_dispatch:

From a2b464ff1430102374390a3bf6720758d1c8a2b3 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Wed, 30 Oct 2024 15:40:31 +0800
Subject: [PATCH 8/8] feat: numeric precision can be configured to 8 digits
 (#5552)

---
 .../core/client/src/collection-manager/interfaces/number.ts    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/core/client/src/collection-manager/interfaces/number.ts b/packages/core/client/src/collection-manager/interfaces/number.ts
index be89ced87c..13b534dbf4 100644
--- a/packages/core/client/src/collection-manager/interfaces/number.ts
+++ b/packages/core/client/src/collection-manager/interfaces/number.ts
@@ -47,6 +47,9 @@ export class NumberFieldInterface extends CollectionFieldInterface {
         { value: '0.001', label: '1.000' },
         { value: '0.0001', label: '1.0000' },
         { value: '0.00001', label: '1.00000' },
+        { value: '0.000001', label: '1.000000' },
+        { value: '0.0000001', label: '1.0000000' },
+        { value: '0.00000001', label: '1.00000000' },
       ],
     },
   };