From 3c13c27563d1a0ac720ebfe2e701f911048e0d68 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 20 Dec 2023 12:31:14 +0500
Subject: [PATCH 1/8] remove unused npm modules

---
 client/package.json                   |    2 -
 client/packages/lowcoder/package.json |    6 +-
 client/yarn.lock                      | 1270 +------------------------
 3 files changed, 25 insertions(+), 1253 deletions(-)

diff --git a/client/package.json b/client/package.json
index 3798025a0b..ee69f45218 100644
--- a/client/package.json
+++ b/client/package.json
@@ -27,7 +27,6 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@types/ali-oss": "^6.16.4",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.2.2",
     "@types/mime": "^2.0.3",
@@ -40,7 +39,6 @@
     "@types/styled-components": "^5.1.19",
     "@types/stylis": "^4.0.2",
     "@types/tern": "0.23.4",
-    "@types/toposort": "^2.0.3",
     "@types/ua-parser-js": "^0.7.36",
     "@welldone-software/why-did-you-render": "^6.2.3",
     "add": "^2.0.6",
diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
index c4936531f8..9cc144593a 100644
--- a/client/packages/lowcoder/package.json
+++ b/client/packages/lowcoder/package.json
@@ -7,8 +7,6 @@
   "types": "src/index.sdk.ts",
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-form": "^1.52.9",
-    "@ant-design/pro-table": "^2.62.7",
     "@codemirror/autocomplete": "^0.20.3",
     "@codemirror/basic-setup": "^0.20.0",
     "@codemirror/lang-css": "0.20",
@@ -39,9 +37,7 @@
     "agora-access-token": "^2.0.4",
     "agora-rtc-sdk-ng": "^4.19.0",
     "agora-rtm-sdk": "^1.5.1",
-    "ali-oss": "^6.17.1",
     "antd": "^5.12.2",
-    "antd-img-crop": "^4.12.2",
     "axios": "^0.21.1",
     "buffer": "^6.0.3",
     "clsx": "^2.0.0",
@@ -84,6 +80,7 @@
     "react-router": "^5.2.1",
     "react-router-dom": "^5.3.0",
     "react-signature-canvas": "^1.0.6",
+    "react-sortable-hoc": "^2.0.0",
     "react-test-renderer": "^18.1.0",
     "react-use": "^17.3.2",
     "really-relaxed-json": "^0.3.2",
@@ -99,7 +96,6 @@
     "styled-components": "^5.3.3",
     "stylis": "^4.1.1",
     "tern": "^0.24.3",
-    "toposort": "^2.0.2",
     "typescript-collections": "^1.3.3",
     "ua-parser-js": "^1.0.33",
     "uuid": "^9.0.0",
diff --git a/client/yarn.lock b/client/yarn.lock
index 0000f88360..6eea82d750 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -106,7 +106,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ant-design/icons@npm:^4.1.0, @ant-design/icons@npm:^4.2.1, @ant-design/icons@npm:^4.3.0, @ant-design/icons@npm:^4.7.0, @ant-design/icons@npm:^4.8.1":
+"@ant-design/icons@npm:^4.7.0":
   version: 4.8.1
   resolution: "@ant-design/icons@npm:4.8.1"
   dependencies:
@@ -139,134 +139,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ant-design/pro-card@npm:1.20.22":
-  version: 1.20.22
-  resolution: "@ant-design/pro-card@npm:1.20.22"
-  dependencies:
-    "@ant-design/icons": ^4.2.1
-    "@ant-design/pro-utils": 1.45.3
-    "@babel/runtime": ^7.18.0
-    antd: "^4.20.0 "
-    classnames: ^2.2.6
-    omit.js: ^2.0.2
-    rc-util: ^5.4.0
-  peerDependencies:
-    react: ">=16.9.0"
-  checksum: bf82c04ccf60027159550cf1ebf9f79c92a844ccae40e32fadc3941d8fdb207ebebfd2e0cd9166d986191d5a8beecdc40264d5e019ec5283a9314d7f65a69f77
-  languageName: node
-  linkType: hard
-
-"@ant-design/pro-field@npm:1.36.7":
-  version: 1.36.7
-  resolution: "@ant-design/pro-field@npm:1.36.7"
-  dependencies:
-    "@ant-design/icons": ^4.2.1
-    "@ant-design/pro-provider": 1.10.0
-    "@ant-design/pro-utils": 1.45.3
-    "@babel/runtime": ^7.18.0
-    "@chenshuai2144/sketch-color": ^1.0.8
-    antd: "^4.20.0 "
-    classnames: ^2.2.6
-    lodash.omit: ^4.5.0
-    lodash.tonumber: ^4.0.3
-    moment: ^2.27.0
-    omit.js: ^2.0.2
-    rc-util: ^5.4.0
-    swr: ^1.2.0
-  peerDependencies:
-    react: ">=16.9.0"
-  checksum: 618a7776b4cd8ebe9994e4d7c13955e333a6c03d877d25a626efc96f9ec637d8881f861cb02f7a0ea4eb57306b2bd4b7de916acaf42dccf3523ebb66dc130f9d
-  languageName: node
-  linkType: hard
-
-"@ant-design/pro-form@npm:1.74.7, @ant-design/pro-form@npm:^1.52.9":
-  version: 1.74.7
-  resolution: "@ant-design/pro-form@npm:1.74.7"
-  dependencies:
-    "@ant-design/icons": ^4.2.1
-    "@ant-design/pro-field": 1.36.7
-    "@ant-design/pro-provider": 1.10.0
-    "@ant-design/pro-utils": 1.45.3
-    "@babel/runtime": ^7.18.0
-    "@umijs/use-params": ^1.0.9
-    antd: "^4.20.0 "
-    classnames: ^2.2.6
-    lodash.merge: ^4.6.2
-    omit.js: ^2.0.2
-    rc-resize-observer: ^1.1.0
-    rc-util: ^5.0.6
-    use-json-comparison: ^1.0.5
-    use-media-antd-query: ^1.1.0
-  peerDependencies:
-    rc-field-form: ^1.22.0
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 51fabe89de7eea035ee0a8e602f95b2956d560894e035084d96832b6e5334b4bb801c3a491af8275f1924465570f82ebb86b6513e5093a1734a53ecd5be625c7
-  languageName: node
-  linkType: hard
-
-"@ant-design/pro-provider@npm:1.10.0":
-  version: 1.10.0
-  resolution: "@ant-design/pro-provider@npm:1.10.0"
-  dependencies:
-    "@babel/runtime": ^7.18.0
-    antd: "^4.20.0 "
-    rc-util: ^5.0.1
-    swr: ^1.2.0
-  peerDependencies:
-    react: ">=16.9.0"
-  checksum: 53494b4ce2bf406bde87ba3b4801864bfe53982c9d1ea283397a24b9a9b1a93fd902d00041ef766a6f0707008cff39a32f4617a08f3a92f43c7b9afdc313073b
-  languageName: node
-  linkType: hard
-
-"@ant-design/pro-table@npm:^2.62.7":
-  version: 2.80.8
-  resolution: "@ant-design/pro-table@npm:2.80.8"
-  dependencies:
-    "@ant-design/icons": ^4.1.0
-    "@ant-design/pro-card": 1.20.22
-    "@ant-design/pro-field": 1.36.7
-    "@ant-design/pro-form": 1.74.7
-    "@ant-design/pro-provider": 1.10.0
-    "@ant-design/pro-utils": 1.45.3
-    "@babel/runtime": ^7.18.0
-    antd: "^4.20.0 "
-    classnames: ^2.2.6
-    moment: ^2.24.0
-    omit.js: ^2.0.2
-    rc-util: ^5.0.1
-    react-sortable-hoc: ^2.0.0
-    unstated-next: ^1.1.0
-    use-json-comparison: ^1.0.5
-    use-media-antd-query: ^1.1.0
-  peerDependencies:
-    rc-field-form: ^1.22.0
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 70a958b75f82ce095f1460b6f899f9cbd215d13f2d0946e28cc37e522642aa44c1a9803b008bb9cddaa78ffe4330ce556f77961e0992675d628afecaa7649462
-  languageName: node
-  linkType: hard
-
-"@ant-design/pro-utils@npm:1.45.3":
-  version: 1.45.3
-  resolution: "@ant-design/pro-utils@npm:1.45.3"
-  dependencies:
-    "@ant-design/icons": ^4.3.0
-    "@ant-design/pro-provider": 1.10.0
-    "@babel/runtime": ^7.18.0
-    antd: "^4.20.0 "
-    classnames: ^2.2.6
-    moment: ^2.27.0
-    rc-util: ^5.0.6
-    react-sortable-hoc: ^2.0.0
-    swr: ^1.2.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 26010495194316dd72109879610ba23145bc6aef7d309b4e4c07c9c90351fe6c0712a7d4407b11b8a1f89f000505cdfb674c0aca3c50328f69f9b6932878a0a7
-  languageName: node
-  linkType: hard
-
 "@ant-design/react-slick@npm:~1.0.2":
   version: 1.0.2
   resolution: "@ant-design/react-slick@npm:1.0.2"
@@ -1916,18 +1788,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@chenshuai2144/sketch-color@npm:^1.0.8":
-  version: 1.0.9
-  resolution: "@chenshuai2144/sketch-color@npm:1.0.9"
-  dependencies:
-    reactcss: ^1.2.3
-    tinycolor2: ^1.4.2
-  peerDependencies:
-    react: ">=16.12.0"
-  checksum: 7337f9a24abc7630f2b839b1cce875ff07061b8b568d0d72c9528db9dc3c0ec7db78242b20180b419c60ecb2766533487d7cd77000f0e24dc7d049f8bc86db50
-  languageName: node
-  linkType: hard
-
 "@codemirror/autocomplete@npm:^0.20.0, @codemirror/autocomplete@npm:^0.20.3":
   version: 0.20.3
   resolution: "@codemirror/autocomplete@npm:0.20.3"
@@ -3893,13 +3753,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ali-oss@npm:^6.16.4":
-  version: 6.16.11
-  resolution: "@types/ali-oss@npm:6.16.11"
-  checksum: 1932d908edf7d71aef24de60792c4d4cbe3a31a692a785e6a85c13d866ddb3c397eff7875bc169177eef347a194492dc2cab5a127097248aac0f1367d52064da
-  languageName: node
-  linkType: hard
-
 "@types/aria-query@npm:^5.0.1":
   version: 5.0.4
   resolution: "@types/aria-query@npm:5.0.4"
@@ -4452,13 +4305,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/toposort@npm:^2.0.3":
-  version: 2.0.7
-  resolution: "@types/toposort@npm:2.0.7"
-  checksum: 7424224e96675419f4f2adb1c2f26d2cc94da9f0af7afb6c67e434a6929ff895fbffc6707ec75fe7169df2af73f9fd573c282ae7db991513909a4c5fc03be9f1
-  languageName: node
-  linkType: hard
-
 "@types/tough-cookie@npm:*":
   version: 4.0.5
   resolution: "@types/tough-cookie@npm:4.0.5"
@@ -4635,15 +4481,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@umijs/use-params@npm:^1.0.9":
-  version: 1.0.9
-  resolution: "@umijs/use-params@npm:1.0.9"
-  peerDependencies:
-    react: "*"
-  checksum: 7f72436440dff0e1911ee916340bd26c6c9a510bad4af536d3ec9a5a175d37255d42dbd1cb0dc996daf4d0c3b76e44816ac423ac73e6b3c1655b6b839fed175c
-  languageName: node
-  linkType: hard
-
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -4842,13 +4679,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"address@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "address@npm:1.2.2"
-  checksum: ace439960c1e3564d8f523aff23a841904bf33a2a7c2e064f7f60a064194075758b9690e65bd9785692a4ef698a998c57eb74d145881a1cecab8ba658ddb1607
-  languageName: node
-  linkType: hard
-
 "adler-32@npm:~1.3.0":
   version: 1.3.1
   resolution: "adler-32@npm:1.3.1"
@@ -4874,15 +4704,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agentkeepalive@npm:^3.4.1":
-  version: 3.5.2
-  resolution: "agentkeepalive@npm:3.5.2"
-  dependencies:
-    humanize-ms: ^1.2.1
-  checksum: 75ecb0f764cae3b3c2ba919e2230ac5ff82051e029d8c74d5044e29ddbec14106f696be0196ac83ed370c8dabd2e5ff67bd7601b24660f3d9ed62bd3cdf0f23a
-  languageName: node
-  linkType: hard
-
 "aggregate-error@npm:^3.0.0":
   version: 3.1.0
   resolution: "aggregate-error@npm:3.1.0"
@@ -4998,37 +4819,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ali-oss@npm:^6.17.1":
-  version: 6.18.1
-  resolution: "ali-oss@npm:6.18.1"
-  dependencies:
-    address: ^1.2.2
-    agentkeepalive: ^3.4.1
-    bowser: ^1.6.0
-    copy-to: ^2.0.1
-    dateformat: ^2.0.0
-    debug: ^4.3.4
-    destroy: ^1.0.4
-    end-or-error: ^1.0.1
-    get-ready: ^1.0.0
-    humanize-ms: ^1.2.0
-    is-type-of: ^1.4.0
-    js-base64: ^2.5.2
-    jstoxml: ^2.0.0
-    merge-descriptors: ^1.0.1
-    mime: ^2.4.5
-    platform: ^1.3.1
-    pump: ^3.0.0
-    sdk-base: ^2.0.1
-    stream-http: 2.8.2
-    stream-wormhole: ^1.0.4
-    urllib: 2.41.0
-    utility: ^1.18.0
-    xml2js: ^0.6.2
-  checksum: be188f80a6aed655362ca3f0b4d02554407f72e163df9f8414273e83fe6ce742d7e560f8f95c335e96ece9eeb67f0a70f637a1545226bb0349adb5076750e99a
-  languageName: node
-  linkType: hard
-
 "ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
@@ -5093,21 +4883,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"antd-img-crop@npm:^4.12.2":
-  version: 4.18.0
-  resolution: "antd-img-crop@npm:4.18.0"
-  dependencies:
-    compare-versions: 6.1.0
-    react-easy-crop: ^5.0.2
-    tslib: ^2.6.2
-  peerDependencies:
-    antd: ">=4.0.0"
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: ed9a8149652c44de383980fd93fd88383c49c6aa1e18560e47a1f3e1c960771779c778cde6f433ce24622be6dd0263ab07908e44d83ab32d03edffd73f12e002
-  languageName: node
-  linkType: hard
-
 "antd-mobile-icons@npm:^0.3.0":
   version: 0.3.0
   resolution: "antd-mobile-icons@npm:0.3.0"
@@ -5149,60 +4924,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"antd@npm:^4.20.0 ":
-  version: 4.24.15
-  resolution: "antd@npm:4.24.15"
-  dependencies:
-    "@ant-design/colors": ^6.0.0
-    "@ant-design/icons": ^4.8.1
-    "@ant-design/react-slick": ~1.0.2
-    "@babel/runtime": ^7.18.3
-    "@ctrl/tinycolor": ^3.6.1
-    classnames: ^2.2.6
-    copy-to-clipboard: ^3.2.0
-    lodash: ^4.17.21
-    moment: ^2.29.2
-    rc-cascader: ~3.7.3
-    rc-checkbox: ~3.0.1
-    rc-collapse: ~3.4.2
-    rc-dialog: ~9.0.2
-    rc-drawer: ~6.3.0
-    rc-dropdown: ~4.0.1
-    rc-field-form: ~1.38.2
-    rc-image: ~5.13.0
-    rc-input: ~0.1.4
-    rc-input-number: ~7.3.11
-    rc-mentions: ~1.13.1
-    rc-menu: ~9.8.4
-    rc-motion: ^2.9.0
-    rc-notification: ~4.6.1
-    rc-pagination: ~3.2.0
-    rc-picker: ~2.7.6
-    rc-progress: ~3.4.2
-    rc-rate: ~2.9.3
-    rc-resize-observer: ^1.3.1
-    rc-segmented: ~2.1.2
-    rc-select: ~14.1.18
-    rc-slider: ~10.0.1
-    rc-steps: ~5.0.0
-    rc-switch: ~3.2.2
-    rc-table: ~7.26.0
-    rc-tabs: ~12.5.10
-    rc-textarea: ~0.4.7
-    rc-tooltip: ~5.2.2
-    rc-tree: ~5.7.12
-    rc-tree-select: ~5.5.5
-    rc-trigger: ^5.3.4
-    rc-upload: ~4.3.5
-    rc-util: ^5.37.0
-    scroll-into-view-if-needed: ^2.2.25
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 44fb3657b99f870dd3852bb646bec0ab83da43ecebd017a22e437a25350f9441150c548d2ac83c623f99275ac7dc566e3fedc5e0404c2baf8343a87ca75f7016
-  languageName: node
-  linkType: hard
-
 "antd@npm:^5.12.2":
   version: 5.12.2
   resolution: "antd@npm:5.12.2"
@@ -5262,7 +4983,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"any-promise@npm:^1.0.0, any-promise@npm:^1.3.0":
+"any-promise@npm:^1.0.0":
   version: 1.3.0
   resolution: "any-promise@npm:1.3.0"
   checksum: 0ee8a9bdbe882c90464d75d1f55cf027f5458650c4bd1f0467e65aec38ccccda07ca5844969ee77ed46d04e7dded3eaceb027e8d32f385688523fe305fa7e1de
@@ -5818,13 +5539,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bowser@npm:^1.6.0":
-  version: 1.9.4
-  resolution: "bowser@npm:1.9.4"
-  checksum: 127584ee1b8f0c27f410f652d409ea8bcb23d185a4269bcbe0229069720be9d83dc80a939e0fa33d8a9055141a0cf2fee5a02b2b5515c38841ddc899d67dec8d
-  languageName: node
-  linkType: hard
-
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -6003,13 +5717,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builtin-status-codes@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "builtin-status-codes@npm:3.0.0"
-  checksum: 1119429cf4b0d57bf76b248ad6f529167d343156ebbcc4d4e4ad600484f6bc63002595cbb61b67ad03ce55cd1d3c4711c03bbf198bf24653b8392420482f3773
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^18.0.0":
   version: 18.0.1
   resolution: "cacache@npm:18.0.1"
@@ -6455,13 +6162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:6.1.0":
-  version: 6.1.0
-  resolution: "compare-versions@npm:6.1.0"
-  checksum: d4e2a45706a023d8d0b6680338b66b79e20bd02d1947f0ac6531dab634cbed89fa373b3f03d503c5e489761194258d6e1bae67a07f88b1efc61648454f2d47e7
-  languageName: node
-  linkType: hard
-
 "compute-gcd@npm:^1.2.1":
   version: 1.2.1
   resolution: "compute-gcd@npm:1.2.1"
@@ -6485,13 +6185,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compute-scroll-into-view@npm:^1.0.20":
-  version: 1.0.20
-  resolution: "compute-scroll-into-view@npm:1.0.20"
-  checksum: f15fab29221953620735393ac1866541aab0d27d28078bedbba071a291ee9c8cc1a72bee302cf0bc06ed83c5e55afb74ebcbd634a63671ba33cf1fb1c51d3308
-  languageName: node
-  linkType: hard
-
 "compute-scroll-into-view@npm:^3.0.2":
   version: 3.1.0
   resolution: "compute-scroll-into-view@npm:3.1.0"
@@ -6539,13 +6232,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-type@npm:^1.0.2":
-  version: 1.0.5
-  resolution: "content-type@npm:1.0.5"
-  checksum: 566271e0a251642254cde0f845f9dd4f9856e52d988f4eb0d0dcffbb7a1f8ec98de7a5215fc628f3bce30fe2fb6fd2bc064b562d721658c59b544e2d34ea2766
-  languageName: node
-  linkType: hard
-
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
@@ -6562,7 +6248,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-to-clipboard@npm:^3.2.0, copy-to-clipboard@npm:^3.3.1, copy-to-clipboard@npm:^3.3.3":
+"copy-to-clipboard@npm:^3.3.1, copy-to-clipboard@npm:^3.3.3":
   version: 3.3.3
   resolution: "copy-to-clipboard@npm:3.3.3"
   dependencies:
@@ -6571,13 +6257,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-to@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "copy-to@npm:2.0.1"
-  checksum: 05ea12875bdc96ae053a3b30148e9d992026035ff2bfcc0b615e8d49d1cf8fc3d1f40843f9a4b7b1b6d9118eeebcba31e621076d7de525828aa9c07d22a81dab
-  languageName: node
-  linkType: hard
-
 "core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
   version: 3.34.0
   resolution: "core-js-compat@npm:3.34.0"
@@ -6601,7 +6280,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-util-is@npm:^1.0.2, core-util-is@npm:~1.0.0":
+"core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
   checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
@@ -7375,13 +7054,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dateformat@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "dateformat@npm:2.2.0"
-  checksum: 1a276434222757b99ce8ed352188db90ce6667389f32e7ff9565d8715531ff2213454b55fbe06d8fd97fb6f2be095656a95195c9cda9c0738d9aab92a9d59688
-  languageName: node
-  linkType: hard
-
 "dayjs@npm:1.x, dayjs@npm:^1.11.1, dayjs@npm:^1.11.7, dayjs@npm:^1.9.1":
   version: 1.11.10
   resolution: "dayjs@npm:1.11.10"
@@ -7401,15 +7073,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^2.6.9":
-  version: 2.6.9
-  resolution: "debug@npm:2.6.9"
-  dependencies:
-    ms: 2.0.0
-  checksum: d2f51589ca66df60bf36e1fa6e4386b318c3f1e06772280eea5b1ae9fd3d05e9c2b7fd8a7d862457d00853c75b00451aa2d7459b924629ee385287a650f58fe6
-  languageName: node
-  linkType: hard
-
 "debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
@@ -7508,15 +7171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"default-user-agent@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "default-user-agent@npm:1.0.0"
-  dependencies:
-    os-name: ~1.0.3
-  checksum: b1ef07c8e7de846a66e1e120d7ba11969faa36c8db4af2317f9b64d30e7507d129e3f721c7cc3f531a1719c1ab463d830bf426fbcda87b11defe23689f4d2b60
-  languageName: node
-  linkType: hard
-
 "deferred-leveldown@npm:~0.2.0":
   version: 0.2.0
   resolution: "deferred-leveldown@npm:0.2.0"
@@ -7588,13 +7242,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"destroy@npm:^1.0.4":
-  version: 1.2.0
-  resolution: "destroy@npm:1.2.0"
-  checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
-  languageName: node
-  linkType: hard
-
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
@@ -7627,13 +7274,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"digest-header@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "digest-header@npm:1.1.0"
-  checksum: fadbdda75e1cc650e460c8fe2064f74c43cc005d0eab66cc390dd1ae2678cfb41f69f151323fbd3e059e28c941f1b9adc6ea4dbd9c918cb246f34a5eb8e103f0
-  languageName: node
-  linkType: hard
-
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -7853,13 +7493,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ee-first@npm:~1.1.1":
-  version: 1.1.1
-  resolution: "ee-first@npm:1.1.1"
-  checksum: 1b4cac778d64ce3b582a7e26b218afe07e207a0f9bfe13cc7395a6d307849cfe361e65033c3251e00c27dd060cab43014c2d6b2647676135e18b77d2d05b3f4f
-  languageName: node
-  linkType: hard
-
 "ejs@npm:^3.1.6":
   version: 3.1.9
   resolution: "ejs@npm:3.1.9"
@@ -7930,22 +7563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"end-of-stream@npm:^1.1.0":
-  version: 1.4.4
-  resolution: "end-of-stream@npm:1.4.4"
-  dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
-  languageName: node
-  linkType: hard
-
-"end-or-error@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "end-or-error@npm:1.0.1"
-  checksum: 12d5aaa572e83fd567f999f133f02626f28481f6fc83fb5a9b6610a2cd48cdbbe36491483291bd366ae4073af3a9d6495ffde39ae417cb74b7bbf8d8bd76d7a6
-  languageName: node
-  linkType: hard
-
 "enhanced-resolve@npm:^2.2.2":
   version: 2.3.0
   resolution: "enhanced-resolve@npm:2.3.0"
@@ -8216,13 +7833,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-html@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "escape-html@npm:1.0.3"
-  checksum: 6213ca9ae00d0ab8bccb6d8d4e0a98e76237b2410302cf7df70aaa6591d509a2a37ce8998008cbecae8fc8ffaadf3fb0229535e6a145f3ce0b211d060decbb24
-  languageName: node
-  linkType: hard
-
 "escape-string-regexp@npm:^1.0.5":
   version: 1.0.5
   resolution: "escape-string-regexp@npm:1.0.5"
@@ -8769,15 +8379,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend-shallow@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "extend-shallow@npm:2.0.1"
-  dependencies:
-    is-extendable: ^0.1.0
-  checksum: 8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
-  languageName: node
-  linkType: hard
-
 "extend@npm:^3.0.0, extend@npm:^3.0.2, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
@@ -9100,17 +8701,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"formstream@npm:^1.1.0":
-  version: 1.3.1
-  resolution: "formstream@npm:1.3.1"
-  dependencies:
-    destroy: ^1.0.4
-    mime: ^2.5.2
-    pause-stream: ~0.0.11
-  checksum: a4047bca9399dcd978d0bfd2e5dae52198dce8a53eb281f2e65dcb49e2e65bcaaa8573b46eeaa0c2a136ea69ff3d1137bb2b0f359cbe7110b5dcd12fc4a38155
-  languageName: node
-  linkType: hard
-
 "frac@npm:~1.1.2":
   version: 1.1.2
   resolution: "frac@npm:1.1.2"
@@ -9252,13 +8842,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-ready@npm:^1.0.0, get-ready@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "get-ready@npm:1.0.0"
-  checksum: a4f3a2d7af3721d03f0f20206d1e6783671c276518ff6837b5f8b5c8fe77c6dad331353fe002c19163e1607fd47d377e5d4e8abbd28616a00ad4072d48840994
-  languageName: node
-  linkType: hard
-
 "get-stream@npm:^6.0.0, get-stream@npm:^6.0.1":
   version: 6.0.1
   resolution: "get-stream@npm:6.0.1"
@@ -9836,15 +9419,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"humanize-ms@npm:^1.2.0, humanize-ms@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "humanize-ms@npm:1.2.1"
-  dependencies:
-    ms: ^2.0.0
-  checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16
-  languageName: node
-  linkType: hard
-
 "husky@npm:^8.0.1":
   version: 8.0.3
   resolution: "husky@npm:8.0.3"
@@ -9861,7 +9435,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.15":
+"iconv-lite@npm:0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -10060,13 +9634,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^1.1.5":
-  version: 1.1.8
-  resolution: "ip@npm:1.1.8"
-  checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
-  languageName: node
-  linkType: hard
-
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
@@ -10162,13 +9729,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-class-hotfix@npm:~0.0.6":
-  version: 0.0.6
-  resolution: "is-class-hotfix@npm:0.0.6"
-  checksum: 7a0d5f14ef6db81c38f78f53fb08e440068e1ff62d5717fe4af1ca419fa0b68e6559a166c7d9953700e83efc290ef8fa24cf3363382014f9d6a74623d037ad7f
-  languageName: node
-  linkType: hard
-
 "is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
@@ -10196,13 +9756,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-extendable@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "is-extendable@npm:0.1.1"
-  checksum: 3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
-  languageName: node
-  linkType: hard
-
 "is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
@@ -10427,17 +9980,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-type-of@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "is-type-of@npm:1.4.0"
-  dependencies:
-    core-util-is: ^1.0.2
-    is-class-hotfix: ~0.0.6
-    isstream: ~0.1.2
-  checksum: 9d8ca64d0cb00da0bffe1c52c8883e6a1581377a0152d5a1ddbfcdd46fafac9ad713ad07866de73218160c36217ed482a83a700f52e13dc385f88c50c5fc51fd
-  languageName: node
-  linkType: hard
-
 "is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9":
   version: 1.1.12
   resolution: "is-typed-array@npm:1.1.12"
@@ -11157,13 +10699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-base64@npm:^2.5.2":
-  version: 2.6.4
-  resolution: "js-base64@npm:2.6.4"
-  checksum: 5f4084078d6c46f8529741d110df84b14fac3276b903760c21fa8cc8521370d607325dfe1c1a9fbbeaae1ff8e602665aaeef1362427d8fef704f9e3659472ce8
-  languageName: node
-  linkType: hard
-
 "js-cookie@npm:^2.2.1, js-cookie@npm:^2.x.x":
   version: 2.2.1
   resolution: "js-cookie@npm:2.2.1"
@@ -11434,13 +10969,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jstoxml@npm:^2.0.0":
-  version: 2.2.9
-  resolution: "jstoxml@npm:2.2.9"
-  checksum: 6a80183a646f415a2e959f31fa2e04f07e538b68daa8d47ebc38ff1576060ac958c76685516d1cc0c213f64acd3d0488f53e7f79db094b7b3a48d2b70acc4edb
-  languageName: node
-  linkType: hard
-
 "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5":
   version: 3.3.5
   resolution: "jsx-ast-utils@npm:3.3.5"
@@ -11798,13 +11326,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.omit@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.omit@npm:4.5.0"
-  checksum: 434645e49fe84ab315719bd5a9a3a585a0f624aa4160bc09157dd041a414bcc287c15840365c1379476a3f3eda41fbe838976c3f7bdecbbf4c5478e86c471a30
-  languageName: node
-  linkType: hard
-
 "lodash.pick@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.pick@npm:4.4.0"
@@ -11826,13 +11347,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.tonumber@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "lodash.tonumber@npm:4.0.3"
-  checksum: d8156cf76eb1c5960ec1c20bc16a647a7fe4d1289365d2dc05f7e3dd1915e2f0767d9ad3a1ac2419903a0309701f051fcb6a923a928d15afa6e17a3e32d6ea3a
-  languageName: node
-  linkType: hard
-
 "lodash@npm:^3.9.1":
   version: 3.10.1
   resolution: "lodash@npm:3.10.1"
@@ -11840,7 +11354,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4, lodash@npm:^4.0.1, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
+"lodash@npm:^4, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -12041,7 +11555,6 @@ __metadata:
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^12.0.0
     "@testing-library/user-event": ^13.2.1
-    "@types/ali-oss": ^6.16.4
     "@types/file-saver": ^2.0.5
     "@types/jest": ^29.2.2
     "@types/mime": ^2.0.3
@@ -12054,7 +11567,6 @@ __metadata:
     "@types/styled-components": ^5.1.19
     "@types/stylis": ^4.0.2
     "@types/tern": 0.23.4
-    "@types/toposort": ^2.0.3
     "@types/ua-parser-js": ^0.7.36
     "@welldone-software/why-did-you-render": ^6.2.3
     add: ^2.0.6
@@ -12115,8 +11627,6 @@ __metadata:
   resolution: "lowcoder@workspace:packages/lowcoder"
   dependencies:
     "@ant-design/icons": ^4.7.0
-    "@ant-design/pro-form": ^1.52.9
-    "@ant-design/pro-table": ^2.62.7
     "@codemirror/autocomplete": ^0.20.3
     "@codemirror/basic-setup": ^0.20.0
     "@codemirror/lang-css": 0.20
@@ -12153,9 +11663,7 @@ __metadata:
     agora-access-token: ^2.0.4
     agora-rtc-sdk-ng: ^4.19.0
     agora-rtm-sdk: ^1.5.1
-    ali-oss: ^6.17.1
     antd: ^5.12.2
-    antd-img-crop: ^4.12.2
     axios: ^0.21.1
     buffer: ^6.0.3
     clsx: ^2.0.0
@@ -12203,6 +11711,7 @@ __metadata:
     react-router: ^5.2.1
     react-router-dom: ^5.3.0
     react-signature-canvas: ^1.0.6
+    react-sortable-hoc: ^2.0.0
     react-test-renderer: ^18.1.0
     react-use: ^17.3.2
     really-relaxed-json: ^0.3.2
@@ -12219,7 +11728,6 @@ __metadata:
     styled-components: ^5.3.3
     stylis: ^4.1.1
     tern: ^0.24.3
-    toposort: ^2.0.2
     typescript: ^4.8.4
     typescript-collections: ^1.3.3
     ua-parser-js: ^1.0.33
@@ -12621,13 +12129,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"merge-descriptors@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "merge-descriptors@npm:1.0.3"
-  checksum: 52117adbe0313d5defa771c9993fe081e2d2df9b840597e966aadafde04ae8d0e3da46bac7ca4efc37d4d2b839436582659cd49c6a43eacb3fe3050896a105d1
-  languageName: node
-  linkType: hard
-
 "merge-stream@npm:^2.0.0":
   version: 2.0.0
   resolution: "merge-stream@npm:2.0.0"
@@ -13046,7 +12547,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime@npm:^2.4.5, mime@npm:^2.4.6, mime@npm:^2.5.2":
+"mime@npm:^2.4.6":
   version: 2.6.0
   resolution: "mime@npm:2.6.0"
   bin:
@@ -13126,7 +12627,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.6":
+"minimist@npm:^1.2.0, minimist@npm:^1.2.6":
   version: 1.2.8
   resolution: "minimist@npm:1.2.8"
   checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
@@ -13217,17 +12718,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1":
-  version: 0.5.6
-  resolution: "mkdirp@npm:0.5.6"
-  dependencies:
-    minimist: ^1.2.6
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
-  languageName: node
-  linkType: hard
-
 "mkdirp@npm:^1.0.3":
   version: 1.0.4
   resolution: "mkdirp@npm:1.0.4"
@@ -13267,13 +12757,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.0.0":
-  version: 2.0.0
-  resolution: "ms@npm:2.0.0"
-  checksum: 0e6a22b8b746d2e0b65a430519934fefd41b6db0682e3477c10f60c76e947c4c0ad06f63ffdf1d78d335f83edee8c0aa928aa66a36c7cd95b69b26f468d527f4
-  languageName: node
-  linkType: hard
-
 "ms@npm:2.1.2":
   version: 2.1.2
   resolution: "ms@npm:2.1.2"
@@ -13281,7 +12764,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:^2.0.0, ms@npm:^2.1.1":
+"ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -13460,13 +12943,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-wheel@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "normalize-wheel@npm:1.0.1"
-  checksum: 00b32efa040bad9438e732385a4ca27f8532fa2c8c06b54be43b9f75b2da6642bf41a0b4f81e542639dc8d682cde8b059b0a02ae0723fb8ebc3c8f036c8e51d8
-  languageName: node
-  linkType: hard
-
 "npm-run-path@npm:^4.0.1":
   version: 4.0.1
   resolution: "npm-run-path@npm:4.0.1"
@@ -13647,14 +13123,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"omit.js@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "omit.js@npm:2.0.2"
-  checksum: 5d802b9fd7640250aada82f3b9b7243b554b38911f29b3de0d1066c00f24dd4ee72d3b9c94c582e373fb6511bd21e107917d419a7b2a04287f26c31133b48a15
-  languageName: node
-  linkType: hard
-
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
+"once@npm:^1.3.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
@@ -13720,32 +13189,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-name@npm:~1.0.3":
-  version: 1.0.3
-  resolution: "os-name@npm:1.0.3"
-  dependencies:
-    osx-release: ^1.0.0
-    win-release: ^1.0.0
-  bin:
-    os-name: cli.js
-  checksum: 2fc86cc199f8b4992bb00041401c5ab0407e3069e05981f3aa3e5a44cee9b7f22c2b0f5db2c0c1d55656c519884272b5e1e55517358c2e5f728b37dd38f5af78
-  languageName: node
-  linkType: hard
-
-"osx-release@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "osx-release@npm:1.1.0"
-  dependencies:
-    minimist: ^1.1.0
-  bin:
-    osx-release: cli.js
-  checksum: abd437ef21dbfb04f098acc90112cc92ef10c17213e3fd75f8eba45931bd85f6d564ecade0642fac51acff2015597194a76a11773009a90baeb35a03b1c36b06
-  languageName: node
-  linkType: hard
-
-"p-limit@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "p-limit@npm:2.3.0"
+"p-limit@npm:^2.2.0":
+  version: 2.3.0
+  resolution: "p-limit@npm:2.3.0"
   dependencies:
     p-try: ^2.0.0
   checksum: 84ff17f1a38126c3314e91ecfe56aecbf36430940e2873dadaa773ffe072dc23b7af8e46d4b6485d302a11673fe94c6b67ca2cfbb60c989848b02100d0594ac1
@@ -13968,15 +13414,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pause-stream@npm:~0.0.11":
-  version: 0.0.11
-  resolution: "pause-stream@npm:0.0.11"
-  dependencies:
-    through: ~2.3
-  checksum: 3c4a14052a638b92e0c96eb00c0d7977df7f79ea28395250c525d197f1fc02d34ce1165d5362e2e6ebbb251524b94a76f3f0d4abc39ab8b016d97449fe15583c
-  languageName: node
-  linkType: hard
-
 "pbkdf2@npm:^3.0.3":
   version: 3.1.2
   resolution: "pbkdf2@npm:3.1.2"
@@ -14043,13 +13480,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"platform@npm:^1.3.1":
-  version: 1.3.6
-  resolution: "platform@npm:1.3.6"
-  checksum: 6f472a09c61d418c7e26c1c16d0bdc029549d512dbec6526216a1e59ec68100d07007d0097dcba69dddad883d6f2a83361b4bdfe0094a3d9a2af24158643d85e
-  languageName: node
-  linkType: hard
-
 "pn@npm:^1.1.0":
   version: 1.1.0
   resolution: "pn@npm:1.1.0"
@@ -14253,16 +13683,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pump@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pump@npm:3.0.0"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9
-  languageName: node
-  linkType: hard
-
 "punycode@npm:^2.1.0, punycode@npm:^2.1.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
@@ -14293,15 +13713,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:^6.4.0":
-  version: 6.11.2
-  resolution: "qs@npm:6.11.2"
-  dependencies:
-    side-channel: ^1.0.4
-  checksum: e812f3c590b2262548647d62f1637b6989cc56656dc960b893fe2098d96e1bd633f36576f4cd7564dfbff9db42e17775884db96d846bebe4f37420d073ecdc0b
-  languageName: node
-  linkType: hard
-
 "qs@npm:~6.5.2":
   version: 6.5.3
   resolution: "qs@npm:6.5.3"
@@ -14400,37 +13811,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-cascader@npm:~3.7.3":
-  version: 3.7.3
-  resolution: "rc-cascader@npm:3.7.3"
-  dependencies:
-    "@babel/runtime": ^7.12.5
-    array-tree-filter: ^2.1.0
-    classnames: ^2.3.1
-    rc-select: ~14.1.0
-    rc-tree: ~5.7.0
-    rc-util: ^5.6.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 6c01218c65ed30c2638773fd8bb0ea4bc91263860c67797c8664d815c7db7ed1cdf11d80a385dff58b8d5ffe68dcfdc5299b186d31b894b4113dbaeb92ea2aca
-  languageName: node
-  linkType: hard
-
-"rc-checkbox@npm:~3.0.1":
-  version: 3.0.1
-  resolution: "rc-checkbox@npm:3.0.1"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.3.2
-    rc-util: ^5.25.2
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 046b138e95c1b77fb0fb0d06ef3cdb00e34ae551adfe0a0b886cd0fb0ee34a98d1bef43a2c0122e6731862c2ec031d0d2fff9b4ea6c36857777532ad29115265
-  languageName: node
-  linkType: hard
-
 "rc-checkbox@npm:~3.1.0":
   version: 3.1.0
   resolution: "rc-checkbox@npm:3.1.0"
@@ -14445,22 +13825,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-collapse@npm:~3.4.2":
-  version: 3.4.2
-  resolution: "rc-collapse@npm:3.4.2"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.3.4
-    rc-util: ^5.2.1
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 617409c4ca8cbcad85df7de33f40fc0526ff28f54304d687b82add8c7c4e442c5fdf2935a645d51e44afa87b23d673f4a8a4d9ee1033b473f6fd4bd5b94df4bc
-  languageName: node
-  linkType: hard
-
 "rc-collapse@npm:~3.7.2":
   version: 3.7.2
   resolution: "rc-collapse@npm:3.7.2"
@@ -14476,22 +13840,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-dialog@npm:~9.0.0, rc-dialog@npm:~9.0.2":
-  version: 9.0.2
-  resolution: "rc-dialog@npm:9.0.2"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    "@rc-component/portal": ^1.0.0-8
-    classnames: ^2.2.6
-    rc-motion: ^2.3.0
-    rc-util: ^5.21.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 470953c33123c984d7c18685435f08fb7cc4111fdbd01f032a8b111e1b0c06b2a9edcc26bc6895e1a426529e8c2842d6f79441f6bfceaa9c1c273e6b56f0f16d
-  languageName: node
-  linkType: hard
-
 "rc-dialog@npm:~9.3.4":
   version: 9.3.4
   resolution: "rc-dialog@npm:9.3.4"
@@ -14508,22 +13856,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-drawer@npm:~6.3.0":
-  version: 6.3.0
-  resolution: "rc-drawer@npm:6.3.0"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    "@rc-component/portal": ^1.1.1
-    classnames: ^2.2.6
-    rc-motion: ^2.6.1
-    rc-util: ^5.21.2
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 63c9c5d05590a35dc9a66b03544626180e8df08c593568e32f5ac86e0078b09a7388a60441f357b7c71a31715aa18f43fc4a1e165d745d58861380c88b8c9d36
-  languageName: node
-  linkType: hard
-
 "rc-drawer@npm:~6.5.2":
   version: 6.5.2
   resolution: "rc-drawer@npm:6.5.2"
@@ -14540,21 +13872,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-dropdown@npm:~4.0.0, rc-dropdown@npm:~4.0.1":
-  version: 4.0.1
-  resolution: "rc-dropdown@npm:4.0.1"
-  dependencies:
-    "@babel/runtime": ^7.18.3
-    classnames: ^2.2.6
-    rc-trigger: ^5.3.1
-    rc-util: ^5.17.0
-  peerDependencies:
-    react: ">=16.11.0"
-    react-dom: ">=16.11.0"
-  checksum: 12d16fc49dbab3f548ba1674b12cf688f58bcb73932285354a506b2f443aa58dc09cad3e07edb5d8de8e659c91b985022eef0734f233b76261af1b17a61ce619
-  languageName: node
-  linkType: hard
-
 "rc-dropdown@npm:~4.1.0":
   version: 4.1.0
   resolution: "rc-dropdown@npm:4.1.0"
@@ -14584,20 +13901,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-field-form@npm:~1.38.2":
-  version: 1.38.2
-  resolution: "rc-field-form@npm:1.38.2"
-  dependencies:
-    "@babel/runtime": ^7.18.0
-    async-validator: ^4.1.0
-    rc-util: ^5.32.2
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: a1d180f231220a632b25e317fba107e2d579b18e83dc95f4dfbc014ee8631c4a1167e3ac58838b66fe8116594e81454e69cd8093fa5c023b5f69bd64b4ad5875
-  languageName: node
-  linkType: hard
-
 "rc-field-form@npm:~1.41.0":
   version: 1.41.0
   resolution: "rc-field-form@npm:1.41.0"
@@ -14612,23 +13915,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-image@npm:~5.13.0":
-  version: 5.13.0
-  resolution: "rc-image@npm:5.13.0"
-  dependencies:
-    "@babel/runtime": ^7.11.2
-    "@rc-component/portal": ^1.0.2
-    classnames: ^2.2.6
-    rc-dialog: ~9.0.0
-    rc-motion: ^2.6.2
-    rc-util: ^5.0.6
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 720ecb531474f272366a1769a831f49cc6aeabcb5e0aaa3d2395b3cdc8a8b9b08733e1b92a37c229170fa3520433efbed2d03f573f35df3efffd32998690f68e
-  languageName: node
-  linkType: hard
-
 "rc-image@npm:~7.5.1":
   version: 7.5.1
   resolution: "rc-image@npm:7.5.1"
@@ -14646,20 +13932,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-input-number@npm:~7.3.11":
-  version: 7.3.11
-  resolution: "rc-input-number@npm:7.3.11"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.5
-    rc-util: ^5.23.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 8555171aed72a277721a7d22cdfadc56585f20f9422ce55b0f505eaae43837586d85bd7ebc5dca7b6eec96cbd8798b622ffd03f0187464dbaf6d741a5c20ee7d
-  languageName: node
-  linkType: hard
-
 "rc-input-number@npm:~8.4.0":
   version: 8.4.0
   resolution: "rc-input-number@npm:8.4.0"
@@ -14676,20 +13948,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-input@npm:~0.1.4":
-  version: 0.1.4
-  resolution: "rc-input@npm:0.1.4"
-  dependencies:
-    "@babel/runtime": ^7.11.1
-    classnames: ^2.2.1
-    rc-util: ^5.18.1
-  peerDependencies:
-    react: ">=16.0.0"
-    react-dom: ">=16.0.0"
-  checksum: 1c1935856d7f991ec6f6f8d17945ad501ce956116fdd79b8fcbe1e265465a59b348ba61f1f90045ef14b24e93cc4963b87d5333b9b784f5f28407b6601e8570e
-  languageName: node
-  linkType: hard
-
 "rc-input@npm:~1.3.5, rc-input@npm:~1.3.6":
   version: 1.3.11
   resolution: "rc-input@npm:1.3.11"
@@ -14704,23 +13962,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-mentions@npm:~1.13.1":
-  version: 1.13.1
-  resolution: "rc-mentions@npm:1.13.1"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.6
-    rc-menu: ~9.8.0
-    rc-textarea: ^0.4.0
-    rc-trigger: ^5.0.4
-    rc-util: ^5.22.5
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 7893c56f91a9ef60d70d607d0fb415c07398d35096a25488d49ea4829a56eda2c9cc0334af919330978e20fe85d39393caddbb52484f9bf39a80e78df4057b2e
-  languageName: node
-  linkType: hard
-
 "rc-mentions@npm:~2.9.1":
   version: 2.9.1
   resolution: "rc-mentions@npm:2.9.1"
@@ -14756,24 +13997,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-menu@npm:~9.8.0, rc-menu@npm:~9.8.4":
-  version: 9.8.4
-  resolution: "rc-menu@npm:9.8.4"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.4.3
-    rc-overflow: ^1.2.8
-    rc-trigger: ^5.1.2
-    rc-util: ^5.27.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: a646dea20e8f5638aa25da8e9fa552ffb833b13fbfce04b7ae876892e7ea1592143cbf57bcb943fa9ea96f29e65a1987c2aab5c1407874e825e0ba20e16109f2
-  languageName: node
-  linkType: hard
-
-"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.2.0, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.9.0":
+"rc-motion@npm:^2.0.0, rc-motion@npm:^2.0.1, rc-motion@npm:^2.3.0, rc-motion@npm:^2.3.4, rc-motion@npm:^2.4.3, rc-motion@npm:^2.4.4, rc-motion@npm:^2.6.1, rc-motion@npm:^2.6.2, rc-motion@npm:^2.9.0":
   version: 2.9.0
   resolution: "rc-motion@npm:2.9.0"
   dependencies:
@@ -14787,21 +14011,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-notification@npm:~4.6.1":
-  version: 4.6.1
-  resolution: "rc-notification@npm:4.6.1"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.2.0
-    rc-util: ^5.20.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: e953a85a6061103485db33f76b5c25907c273a03fd39be942b26eace33c83b42c26054d0d6f063d2239cc2d52462e9638c818be59da966ea18a74a0b168c4c36
-  languageName: node
-  linkType: hard
-
 "rc-notification@npm:~5.3.0":
   version: 5.3.0
   resolution: "rc-notification@npm:5.3.0"
@@ -14817,7 +14026,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-overflow@npm:^1.0.0, rc-overflow@npm:^1.2.8, rc-overflow@npm:^1.3.1":
+"rc-overflow@npm:^1.3.1":
   version: 1.3.2
   resolution: "rc-overflow@npm:1.3.2"
   dependencies:
@@ -14832,19 +14041,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-pagination@npm:~3.2.0":
-  version: 3.2.0
-  resolution: "rc-pagination@npm:3.2.0"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: deca480696346bbe729945e19fca2b1b50defebd9251ddcc821cc0aa6f58383e9f6fcc7fe4571f48299ba74f30a370687cc099e44e77e2d3d43d4b2d845f91e5
-  languageName: node
-  linkType: hard
-
 "rc-pagination@npm:~4.0.3":
   version: 4.0.3
   resolution: "rc-pagination@npm:4.0.3"
@@ -14859,7 +14055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-picker@npm:^2.7.6, rc-picker@npm:~2.7.6":
+"rc-picker@npm:^2.7.6":
   version: 2.7.6
   resolution: "rc-picker@npm:2.7.6"
   dependencies:
@@ -14906,20 +14102,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-progress@npm:~3.4.2":
-  version: 3.4.2
-  resolution: "rc-progress@npm:3.4.2"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.6
-    rc-util: ^5.16.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 738aa7a7d00c1a550884bcfa55e0a55bad799f97207889bc9b43c17d2c1b66b6a42e75d635a1c6cdb1696d01f8dddcf8d7d0656356b5871b46b63343db96777b
-  languageName: node
-  linkType: hard
-
 "rc-progress@npm:~3.5.1":
   version: 3.5.1
   resolution: "rc-progress@npm:3.5.1"
@@ -14948,20 +14130,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-rate@npm:~2.9.3":
-  version: 2.9.3
-  resolution: "rc-rate@npm:2.9.3"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.5
-    rc-util: ^5.0.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 044f51145b414adf351b4e643cc86ecc33c8332fb3499c606aea52ae80e4bfc60e471ff46511ca9770a5c73d42ac80ceacf4e092a9de3ba23a6a8493caa76ba4
-  languageName: node
-  linkType: hard
-
 "rc-resize-observer@npm:^1.0.0, rc-resize-observer@npm:^1.1.0, rc-resize-observer@npm:^1.3.1, rc-resize-observer@npm:^1.4.0":
   version: 1.4.0
   resolution: "rc-resize-observer@npm:1.4.0"
@@ -14977,21 +14145,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-segmented@npm:~2.1.2":
-  version: 2.1.2
-  resolution: "rc-segmented@npm:2.1.2"
-  dependencies:
-    "@babel/runtime": ^7.11.1
-    classnames: ^2.2.1
-    rc-motion: ^2.4.4
-    rc-util: ^5.17.0
-  peerDependencies:
-    react: ">=16.0.0"
-    react-dom: ">=16.0.0"
-  checksum: 9ebba682e70b480cacea79985b6c3fcd024d564a3105a9d48c6a0481a87002f8382987195014ce00e37d455e84dbd0def05d24e3671a52bd89aeeec43c82a91a
-  languageName: node
-  linkType: hard
-
 "rc-segmented@npm:~2.2.2":
   version: 2.2.2
   resolution: "rc-segmented@npm:2.2.2"
@@ -15007,24 +14160,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-select@npm:~14.1.0, rc-select@npm:~14.1.18":
-  version: 14.1.18
-  resolution: "rc-select@npm:14.1.18"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.0.1
-    rc-overflow: ^1.0.0
-    rc-trigger: ^5.0.4
-    rc-util: ^5.16.1
-    rc-virtual-list: ^3.2.0
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 6d0bf03480e8e1a8a98550f5ce0fc695f465bac548963014103ad5fc0aae5104f5b6e3bf83cb881362d9d87181a79d4945ffe30efc129c922e040b35eba5e4de
-  languageName: node
-  linkType: hard
-
 "rc-select@npm:~14.10.0":
   version: 14.10.0
   resolution: "rc-select@npm:14.10.0"
@@ -15043,21 +14178,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-slider@npm:~10.0.1":
-  version: 10.0.1
-  resolution: "rc-slider@npm:10.0.1"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.5
-    rc-util: ^5.18.1
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 803f0cc39d43897c0b24549e87232a668d26ff5b0e14b528fd454aa455cdf96ebc60654832c51bb1a6c7b7594ca39017d6c96b3237662471efb863f1723e3d9c
-  languageName: node
-  linkType: hard
-
 "rc-slider@npm:~10.5.0":
   version: 10.5.0
   resolution: "rc-slider@npm:10.5.0"
@@ -15072,20 +14192,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-steps@npm:~5.0.0":
-  version: 5.0.0
-  resolution: "rc-steps@npm:5.0.0"
-  dependencies:
-    "@babel/runtime": ^7.16.7
-    classnames: ^2.2.3
-    rc-util: ^5.16.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: b58507b807d648a425b339fbbd49472da0b7213e5464cd021d2cbcb3273818e4bf8d6e6b2d5dda7608160887e156a14f97585d3029ce9f501db9444bcb365618
-  languageName: node
-  linkType: hard
-
 "rc-steps@npm:~6.0.1":
   version: 6.0.1
   resolution: "rc-steps@npm:6.0.1"
@@ -15100,20 +14206,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-switch@npm:~3.2.2":
-  version: 3.2.2
-  resolution: "rc-switch@npm:3.2.2"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.1
-    rc-util: ^5.0.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: c0242385fa93a9aa5cc65500cf6f83a673ff91caf70eed8c1335af2cd695aafda2c4c972da0daae8ea26478e314b9a9212074364d44110ff9b453c0d3debb851
-  languageName: node
-  linkType: hard
-
 "rc-switch@npm:~4.1.0":
   version: 4.1.0
   resolution: "rc-switch@npm:4.1.0"
@@ -15128,22 +14220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-table@npm:~7.26.0":
-  version: 7.26.0
-  resolution: "rc-table@npm:7.26.0"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.5
-    rc-resize-observer: ^1.1.0
-    rc-util: ^5.22.5
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 78970d0140203d57541bf5952c542ca7448608bbd29da949e51007c4b3f94570a35b4e95b35ce4d49954c6c88a9e44d2f36f8f4015bfe1b97e926a381141d251
-  languageName: node
-  linkType: hard
-
 "rc-table@npm:~7.36.0":
   version: 7.36.0
   resolution: "rc-table@npm:7.36.0"
@@ -15179,40 +14255,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tabs@npm:~12.5.10":
-  version: 12.5.10
-  resolution: "rc-tabs@npm:12.5.10"
-  dependencies:
-    "@babel/runtime": ^7.11.2
-    classnames: 2.x
-    rc-dropdown: ~4.0.0
-    rc-menu: ~9.8.0
-    rc-motion: ^2.6.2
-    rc-resize-observer: ^1.0.0
-    rc-util: ^5.16.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 0b26b61ce96f525c2d4c74b89561997176b8673c842d28f542cbc056cc26ee16953ea34d9a591b599872717a342ffbdded4e6115d95bcfe1ec594048fe669d31
-  languageName: node
-  linkType: hard
-
-"rc-textarea@npm:^0.4.0, rc-textarea@npm:~0.4.7":
-  version: 0.4.7
-  resolution: "rc-textarea@npm:0.4.7"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: ^2.2.1
-    rc-resize-observer: ^1.0.0
-    rc-util: ^5.24.4
-    shallowequal: ^1.1.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 3e682c81aeca9da03b86a18c6a4c3f580d8250fb3042f32de9fb05aad8b64522a88a02b40b99ca8dd9fd8d6869edf5832eee8537b8af0f1b662f63824577f4ce
-  languageName: node
-  linkType: hard
-
 "rc-textarea@npm:~1.5.0, rc-textarea@npm:~1.5.3":
   version: 1.5.3
   resolution: "rc-textarea@npm:1.5.3"
@@ -15229,20 +14271,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tooltip@npm:~5.2.2":
-  version: 5.2.2
-  resolution: "rc-tooltip@npm:5.2.2"
-  dependencies:
-    "@babel/runtime": ^7.11.2
-    classnames: ^2.3.1
-    rc-trigger: ^5.0.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: df6a59096876becf930df0347cfe6379cde9647f338a333dd0aae99039bf45e72db866f03ab6b5fd5ce616b074ec888f50e61ebe0f8d2a135c2617595dbf0583
-  languageName: node
-  linkType: hard
-
 "rc-tooltip@npm:~6.1.2":
   version: 6.1.2
   resolution: "rc-tooltip@npm:6.1.2"
@@ -15273,38 +14301,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-tree-select@npm:~5.5.5":
-  version: 5.5.5
-  resolution: "rc-tree-select@npm:5.5.5"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-select: ~14.1.0
-    rc-tree: ~5.7.0
-    rc-util: ^5.16.1
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 6d7de4d9b80583b3bd39be0c8bad5138a62770805048da9fd177eb3f21acc7d02cd68ea64d9ca3accf8bfefa41b0db84c1ac50a3637c7b3c97060d7d3e9d60e5
-  languageName: node
-  linkType: hard
-
-"rc-tree@npm:~5.7.0, rc-tree@npm:~5.7.12":
-  version: 5.7.12
-  resolution: "rc-tree@npm:5.7.12"
-  dependencies:
-    "@babel/runtime": ^7.10.1
-    classnames: 2.x
-    rc-motion: ^2.0.1
-    rc-util: ^5.16.1
-    rc-virtual-list: ^3.5.1
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 107a85407c774616cd06bc54164f3413d4e85fbe0909efee16d6bf45486ee624ba67ff07e523c25249724d6be99ec155a2503d89e14d5b3ed28acf06b4cdabab
-  languageName: node
-  linkType: hard
-
 "rc-tree@npm:~5.8.1, rc-tree@npm:~5.8.2":
   version: 5.8.2
   resolution: "rc-tree@npm:5.8.2"
@@ -15321,7 +14317,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-trigger@npm:^5.0.0, rc-trigger@npm:^5.0.4, rc-trigger@npm:^5.1.2, rc-trigger@npm:^5.3.1, rc-trigger@npm:^5.3.4":
+"rc-trigger@npm:^5.0.4, rc-trigger@npm:^5.3.1":
   version: 5.3.4
   resolution: "rc-trigger@npm:5.3.4"
   dependencies:
@@ -15351,7 +14347,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.16.0, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.2.1, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.21.2, rc-util@npm:^5.22.5, rc-util@npm:^5.23.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.28.0, rc-util@npm:^5.30.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1, rc-util@npm:^5.4.0, rc-util@npm:^5.6.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4":
+"rc-util@npm:^5.0.1, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.28.0, rc-util@npm:^5.30.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4":
   version: 5.38.1
   resolution: "rc-util@npm:5.38.1"
   dependencies:
@@ -15364,7 +14360,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-virtual-list@npm:^3.11.1, rc-virtual-list@npm:^3.2.0, rc-virtual-list@npm:^3.5.1, rc-virtual-list@npm:^3.5.2":
+"rc-virtual-list@npm:^3.11.1, rc-virtual-list@npm:^3.5.1, rc-virtual-list@npm:^3.5.2":
   version: 3.11.3
   resolution: "rc-virtual-list@npm:3.11.3"
   dependencies:
@@ -15439,19 +14435,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-easy-crop@npm:^5.0.2":
-  version: 5.0.3
-  resolution: "react-easy-crop@npm:5.0.3"
-  dependencies:
-    normalize-wheel: ^1.0.1
-    tslib: 2.0.1
-  peerDependencies:
-    react: ">=16.4.0"
-    react-dom: ">=16.4.0"
-  checksum: 58cdc85350839b6efc69bef8bf4d93ca5f8431e7482c86e1424d585b4697d49b220d830e27cf3eb5d78fff11641a8bac39fe5ef31d090bba0fdbc2b9f2b67044
-  languageName: node
-  linkType: hard
-
 "react-fast-compare@npm:^3.0.1, react-fast-compare@npm:^3.1.1":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
@@ -15915,15 +14898,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reactcss@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "reactcss@npm:1.2.3"
-  dependencies:
-    lodash: ^4.0.1
-  checksum: c53e386a0881f1477e1cff661f6a6ad4c662230941f3827862193ac30f9b75cdf7bc7b4c7e5ca543d3e4e80fee1a3e9fa0056c206b1c0423726c41773ab3fe45
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:^1.0.26-4":
   version: 1.1.14
   resolution: "readable-stream@npm:1.1.14"
@@ -15936,7 +14910,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.6":
+"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
@@ -16712,7 +15686,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sax@npm:>=0.6.0, sax@npm:^1.2.4":
+"sax@npm:^1.2.4":
   version: 1.3.0
   resolution: "sax@npm:1.3.0"
   checksum: 238ab3a9ba8c8f8aaf1c5ea9120386391f6ee0af52f1a6a40bbb6df78241dd05d782f2359d614ac6aae08c4c4125208b456548a6cf68625aa4fe178486e63ecd
@@ -16763,15 +15737,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scroll-into-view-if-needed@npm:^2.2.25":
-  version: 2.2.31
-  resolution: "scroll-into-view-if-needed@npm:2.2.31"
-  dependencies:
-    compute-scroll-into-view: ^1.0.20
-  checksum: 93b28f3723a462245b40d4120c40c542c8449473e2b157a5f8e18f04d95d66cd35249d96c625e8a440a56891f7d8905b1d026c690bdda07fcfb4f1a48d643ad1
-  languageName: node
-  linkType: hard
-
 "scroll-into-view-if-needed@npm:^3.1.0":
   version: 3.1.0
   resolution: "scroll-into-view-if-needed@npm:3.1.0"
@@ -16795,15 +15760,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sdk-base@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "sdk-base@npm:2.0.1"
-  dependencies:
-    get-ready: ~1.0.0
-  checksum: 8475cca6182ae16078e863cf251b995ce925710619af1a1adca46a21f0f1a3169dc005051f3041761420c342038712a2e09f67b0e034419a9dbe3b07a2bf8b00
-  languageName: node
-  linkType: hard
-
 "sdp@npm:^3.0.2":
   version: 3.2.0
   resolution: "sdp@npm:3.2.0"
@@ -16811,7 +15767,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^5.0.1, semver@npm:^5.6.0":
+"semver@npm:^5.6.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -17235,13 +16191,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:^1.3.1":
-  version: 1.5.0
-  resolution: "statuses@npm:1.5.0"
-  checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
-  languageName: node
-  linkType: hard
-
 "stealthy-require@npm:^1.1.1":
   version: 1.1.1
   resolution: "stealthy-require@npm:1.1.1"
@@ -17258,26 +16207,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-http@npm:2.8.2":
-  version: 2.8.2
-  resolution: "stream-http@npm:2.8.2"
-  dependencies:
-    builtin-status-codes: ^3.0.0
-    inherits: ^2.0.1
-    readable-stream: ^2.3.6
-    to-arraybuffer: ^1.0.0
-    xtend: ^4.0.0
-  checksum: d72df90581ba5acb93b84d5e80fda1b40b149c3e0c893193b378dc4cc262dd737c202b0c8b0a8155a063ede8bc719c393e3ea089fd10f29a72d2f64676c990f5
-  languageName: node
-  linkType: hard
-
-"stream-wormhole@npm:^1.0.4":
-  version: 1.1.0
-  resolution: "stream-wormhole@npm:1.1.0"
-  checksum: cc19e0235c5d031bd530fa83913c807d9525fa4ba33d51691dd822c0726b8b7ef138b34f289d063a3018cddba67d3ba7fd0ecedaa97242a0f1ed2eed3c6a2ab1
-  languageName: node
-  linkType: hard
-
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
@@ -17613,15 +16542,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swr@npm:^1.2.0":
-  version: 1.3.0
-  resolution: "swr@npm:1.3.0"
-  peerDependencies:
-    react: ^16.11.0 || ^17.0.0 || ^18.0.0
-  checksum: e7a184f0d560e9c8be85c023cc8e65e56a88a6ed46f9394b301b07f838edca23d2e303685319a4fcd620b81d447a7bcb489c7fa0a752c259f91764903c690cdb
-  languageName: node
-  linkType: hard
-
 "symbol-tree@npm:^3.2.2, symbol-tree@npm:^3.2.4":
   version: 3.2.4
   resolution: "symbol-tree@npm:3.2.4"
@@ -17731,13 +16651,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through@npm:~2.3":
-  version: 2.3.8
-  resolution: "through@npm:2.3.8"
-  checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
-  languageName: node
-  linkType: hard
-
 "tiny-invariant@npm:^1.0.2, tiny-invariant@npm:^1.1.0":
   version: 1.3.1
   resolution: "tiny-invariant@npm:1.3.1"
@@ -17752,13 +16665,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinycolor2@npm:^1.4.2":
-  version: 1.6.0
-  resolution: "tinycolor2@npm:1.6.0"
-  checksum: 6df4d07fceeedc0a878d7bac47e2cd47c1ceeb1078340a9eb8a295bc0651e17c750f73d47b3028d829f30b85c15e0572c0fd4142083e4c21a30a597e47f47230
-  languageName: node
-  linkType: hard
-
 "tmpl@npm:1.0.5":
   version: 1.0.5
   resolution: "tmpl@npm:1.0.5"
@@ -17766,13 +16672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-arraybuffer@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "to-arraybuffer@npm:1.0.1"
-  checksum: 31433c10b388722729f5da04c6b2a06f40dc84f797bb802a5a171ced1e599454099c6c5bc5118f4b9105e7d049d3ad9d0f71182b77650e4fdb04539695489941
-  languageName: node
-  linkType: hard
-
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -17796,13 +16695,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"toposort@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "toposort@npm:2.0.2"
-  checksum: d64c74b570391c9432873f48e231b439ee56bc49f7cb9780b505cfdf5cb832f808d0bae072515d93834dd6bceca5bb34448b5b4b408335e4d4716eaf68195dcb
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0":
   version: 2.5.0
   resolution: "tough-cookie@npm:2.5.0"
@@ -17953,13 +16845,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.0.1":
-  version: 2.0.1
-  resolution: "tslib@npm:2.0.1"
-  checksum: 507f32fc24a614c5097d414b622373b6cbb99e305413517e7fd49bef1e63570c0dd15b417ae68152088c3496218e82a5d8c7cd6b48c7a32dcee1a3f7191fff74
-  languageName: node
-  linkType: hard
-
 "tslib@npm:2.3.0":
   version: 2.3.0
   resolution: "tslib@npm:2.3.0"
@@ -17974,7 +16859,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0, tslib@npm:^2.6.2":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
@@ -18252,15 +17137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unescape@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "unescape@npm:1.0.1"
-  dependencies:
-    extend-shallow: ^2.0.1
-  checksum: 0d89b0f55e08a2843e635f1ccf8472a35b367c41d9a8014dd7de5cc3af710a6e988a950b86b6229e143147ade21772f2d72054bc846f4972eb448df472b856ec
-  languageName: node
-  linkType: hard
-
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
@@ -18394,13 +17270,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unstated-next@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "unstated-next@npm:1.1.0"
-  checksum: 8e1c75ea3fe524268a52d12298d3f2f097db2c6292d638a59011ad52eef467e8416e1f523d1deaceefccb3b877f2bd3bf43f5014967a9caa6ae537d0441f09d2
-  languageName: node
-  linkType: hard
-
 "update-browserslist-db@npm:^1.0.13":
   version: 1.0.13
   resolution: "update-browserslist-db@npm:1.0.13"
@@ -18434,33 +17303,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"urllib@npm:2.41.0":
-  version: 2.41.0
-  resolution: "urllib@npm:2.41.0"
-  dependencies:
-    any-promise: ^1.3.0
-    content-type: ^1.0.2
-    debug: ^2.6.9
-    default-user-agent: ^1.0.0
-    digest-header: ^1.0.0
-    ee-first: ~1.1.1
-    formstream: ^1.1.0
-    humanize-ms: ^1.2.0
-    iconv-lite: ^0.4.15
-    ip: ^1.1.5
-    pump: ^3.0.0
-    qs: ^6.4.0
-    statuses: ^1.3.1
-    utility: ^1.16.1
-  peerDependencies:
-    proxy-agent: ^5.0.0
-  peerDependenciesMeta:
-    proxy-agent:
-      optional: true
-  checksum: b1f8ffbcce6c87e294798595db45922531a18b0f37f7c1e90eeb47e6cfb7091c20084a918ecb88cc79bf155519ff7855f80d3a04090fca386bfdc5c3005f33f3
-  languageName: node
-  linkType: hard
-
 "use-composed-ref@npm:^1.3.0":
   version: 1.3.0
   resolution: "use-composed-ref@npm:1.3.0"
@@ -18482,15 +17324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-json-comparison@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "use-json-comparison@npm:1.0.6"
-  peerDependencies:
-    react: ">=16.9.0"
-  checksum: 1054bc5ec16ba728e6a176e0d0eea9edf57a55d19a3579a17329b7b71b6bf9e647d952ea9b87d765a11de536dd994dc7f9d3011a6cd86ec791b67322889d03e6
-  languageName: node
-  linkType: hard
-
 "use-latest@npm:^1.2.1":
   version: 1.2.1
   resolution: "use-latest@npm:1.2.1"
@@ -18505,15 +17338,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-media-antd-query@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "use-media-antd-query@npm:1.1.0"
-  peerDependencies:
-    react: ">=16.9.0"
-  checksum: ec9ef1c6ae9a044ee7ad2e39e6289902134201036d4406cbc07611846f0dc7ae8e82d4c82c244990e934d4c442cafab6f1e380787ec8d7eaa998a0205bcfadeb
-  languageName: node
-  linkType: hard
-
 "use-sync-external-store@npm:^1.2.0":
   version: 1.2.0
   resolution: "use-sync-external-store@npm:1.2.0"
@@ -18530,19 +17354,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"utility@npm:^1.16.1, utility@npm:^1.18.0":
-  version: 1.18.0
-  resolution: "utility@npm:1.18.0"
-  dependencies:
-    copy-to: ^2.0.1
-    escape-html: ^1.0.3
-    mkdirp: ^0.5.1
-    mz: ^2.7.0
-    unescape: ^1.0.1
-  checksum: 7cf4a75fa9adebba0740aa5d3f19ed0fbbd99bb1e7a2d0c30152ae144ccf45f272febdbbf01564cc980582cacc300fa4843ac19a633a50fa6d8e5adfc74d0138
-  languageName: node
-  linkType: hard
-
 "uuid@npm:^3.3.2":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
@@ -19144,15 +17955,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"win-release@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "win-release@npm:1.1.1"
-  dependencies:
-    semver: ^5.0.1
-  checksum: 8943898cc4badaf8598342d63093e49ae9a64c140cf190e81472d3a8890f3387b8408181412e1b58658fe7777ce5d1e3f02eee4beeaee49909d1d17a72d52fc1
-  languageName: node
-  linkType: hard
-
 "wmf@npm:~1.0.1":
   version: 1.0.2
   resolution: "wmf@npm:1.0.2"
@@ -19274,23 +18076,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:^0.6.2":
-  version: 0.6.2
-  resolution: "xml2js@npm:0.6.2"
-  dependencies:
-    sax: ">=0.6.0"
-    xmlbuilder: ~11.0.0
-  checksum: 458a83806193008edff44562c0bdb982801d61ee7867ae58fd35fab781e69e17f40dfeb8fc05391a4648c9c54012066d3955fe5d993ffbe4dc63399023f32ac2
-  languageName: node
-  linkType: hard
-
-"xmlbuilder@npm:~11.0.0":
-  version: 11.0.1
-  resolution: "xmlbuilder@npm:11.0.1"
-  checksum: 7152695e16f1a9976658215abab27e55d08b1b97bca901d58b048d2b6e106b5af31efccbdecf9b07af37c8377d8e7e821b494af10b3a68b0ff4ae60331b415b0
-  languageName: node
-  linkType: hard
-
 "xmlchars@npm:^2.1.1, xmlchars@npm:^2.2.0":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"
@@ -19305,13 +18090,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xtend@npm:^4.0.0":
-  version: 4.0.2
-  resolution: "xtend@npm:4.0.2"
-  checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
-  languageName: node
-  linkType: hard
-
 "xtend@npm:~2.0.4":
   version: 2.0.6
   resolution: "xtend@npm:2.0.6"

From 09b2e2a7785a9fe15cc3e87dc57bfcadd3d5a406 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 20 Dec 2023 13:18:14 +0500
Subject: [PATCH 2/8] upgrade mermaid

---
 client/packages/lowcoder-comps/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
index 2fe76ae1b7..65e132cd5f 100644
--- a/client/packages/lowcoder-comps/package.json
+++ b/client/packages/lowcoder-comps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "type": "module",
   "license": "MIT",
   "dependencies": {
@@ -18,7 +18,7 @@
     "echarts-wordcloud": "^2.1.0",
     "lowcoder-cli": "workspace:^",
     "lowcoder-sdk": "workspace:^",
-    "mermaid": "^10.2.4",
+    "mermaid": "^10.6.1",
     "react": "17",
     "react-dom": "17",
     "typescript": "4.8.4"

From f6a0416f91dd3dcf4f26951a2ae5d524559c6aba Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 20 Dec 2023 13:18:35 +0500
Subject: [PATCH 3/8] removed @testing-library/user-event

---
 client/package.json |  1 -
 client/yarn.lock    | 16 ++--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/client/package.json b/client/package.json
index ee69f45218..22d38afc91 100644
--- a/client/package.json
+++ b/client/package.json
@@ -26,7 +26,6 @@
     "@rollup/plugin-typescript": "^8.5.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
-    "@testing-library/user-event": "^13.2.1",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.2.2",
     "@types/mime": "^2.0.3",
diff --git a/client/yarn.lock b/client/yarn.lock
index 6eea82d750..74dd5d0ff1 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -3728,17 +3728,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/user-event@npm:^13.2.1":
-  version: 13.5.0
-  resolution: "@testing-library/user-event@npm:13.5.0"
-  dependencies:
-    "@babel/runtime": ^7.12.5
-  peerDependencies:
-    "@testing-library/dom": ">=7.21.4"
-  checksum: 16319de685fbb7008f1ba667928f458b2d08196918002daca56996de80ef35e6d9de26e9e1ece7d00a004692b95a597cf9142fff0dc53f2f51606a776584f549
-  languageName: node
-  linkType: hard
-
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
@@ -11463,7 +11452,7 @@ __metadata:
     jest-canvas-mock: ^2.5.2
     lowcoder-cli: "workspace:^"
     lowcoder-sdk: "workspace:^"
-    mermaid: ^10.2.4
+    mermaid: ^10.6.1
     react: 17
     react-dom: 17
     typescript: 4.8.4
@@ -11554,7 +11543,6 @@ __metadata:
     "@rollup/plugin-typescript": ^8.5.0
     "@testing-library/jest-dom": ^5.16.5
     "@testing-library/react": ^12.0.0
-    "@testing-library/user-event": ^13.2.1
     "@types/file-saver": ^2.0.5
     "@types/jest": ^29.2.2
     "@types/mime": ^2.0.3
@@ -12143,7 +12131,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mermaid@npm:^10.2.4":
+"mermaid@npm:^10.6.1":
   version: 10.6.1
   resolution: "mermaid@npm:10.6.1"
   dependencies:

From df577d10ff95a176f904995548dd8caccb7735c5 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 20 Dec 2023 16:27:24 +0500
Subject: [PATCH 4/8] upgrade axios

---
 client/config/test/jest.setup-after-env.js    | 16 ++++++++++++
 client/packages/lowcoder/package.json         |  2 +-
 .../lowcoder/src/api/apiUtils.test.ts         | 26 ++++++++++++-------
 client/packages/lowcoder/src/api/apiUtils.ts  |  8 +++---
 .../lowcoder/src/constants/apiConstants.ts    |  3 ++-
 client/yarn.lock                              | 15 +++--------
 6 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/client/config/test/jest.setup-after-env.js b/client/config/test/jest.setup-after-env.js
index b031316de2..6bb7398393 100644
--- a/client/config/test/jest.setup-after-env.js
+++ b/client/config/test/jest.setup-after-env.js
@@ -21,3 +21,19 @@ window.ResizeObserver = function () {
     disconnect: () => {},
   };
 };
+
+window.ImageData = {}
+window.MediaStreamTrack = {}
+window.URL.createObjectURL = () => {}
+
+class Worker {
+  constructor(stringUrl) {
+    this.url = stringUrl;
+    this.onmessage = () => {};
+  }
+
+  postMessage(msg) {
+    this.onmessage(msg);
+  }
+}
+window.Worker = Worker;
\ No newline at end of file
diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
index 9cc144593a..d23bd7cecc 100644
--- a/client/packages/lowcoder/package.json
+++ b/client/packages/lowcoder/package.json
@@ -38,7 +38,7 @@
     "agora-rtc-sdk-ng": "^4.19.0",
     "agora-rtm-sdk": "^1.5.1",
     "antd": "^5.12.2",
-    "axios": "^0.21.1",
+    "axios": "^1.6.2",
     "buffer": "^6.0.3",
     "clsx": "^2.0.0",
     "cnchar": "^3.2.4",
diff --git a/client/packages/lowcoder/src/api/apiUtils.test.ts b/client/packages/lowcoder/src/api/apiUtils.test.ts
index acfba0de23..50d1dc3336 100644
--- a/client/packages/lowcoder/src/api/apiUtils.test.ts
+++ b/client/packages/lowcoder/src/api/apiUtils.test.ts
@@ -7,7 +7,7 @@ import {
   doValidResponse,
   validateResponse,
 } from "./apiUtils";
-import { AxiosResponse } from "axios";
+import { AxiosHeaders, AxiosResponse } from "axios";
 import { ApiResponse } from "./apiResponses";
 import {
   createMessage,
@@ -23,8 +23,14 @@ beforeAll(() => {
   jest.spyOn(log, "error").mockImplementation(() => {});
 });
 
+const headers = new AxiosHeaders({
+  "Content-Type": "application/json",
+});
+
 test("apiRequestInterceptor", () => {
-  expect(apiRequestInterceptor({})).toHaveProperty("timer");
+  expect(apiRequestInterceptor({
+    headers,
+  })).toHaveProperty("timer");
 });
 
 test("apiSuccessResponseInterceptor", () => {
@@ -132,8 +138,8 @@ test("validateResponse", () => {
       status: 500,
       data: { success: false, code: 1, message: "fail", data: "" },
       statusText: "",
-      headers: [],
-      config: {},
+      headers,
+      config: { headers },
     })
   ).toThrowError(Error("fail"));
   expect(
@@ -141,8 +147,8 @@ test("validateResponse", () => {
       status: 500,
       data: { success: true, code: 1, message: "", data: "" },
       statusText: "",
-      headers: [],
-      config: {},
+      headers,
+      config: { headers },
     })
   ).toEqual(true);
 });
@@ -171,8 +177,8 @@ test("doValidResponse", () => {
       status: 500,
       data: { success: false, code: 1, message: "fail", data: "" },
       statusText: "",
-      headers: [],
-      config: {},
+      headers,
+      config: { headers },
     })
   ).toEqual(false);
   expect(
@@ -180,8 +186,8 @@ test("doValidResponse", () => {
       status: 500,
       data: { success: true, code: 1, message: "", data: "" },
       statusText: "",
-      headers: [],
-      config: {},
+      headers,
+      config: { headers },
     })
   ).toEqual(true);
 });
diff --git a/client/packages/lowcoder/src/api/apiUtils.ts b/client/packages/lowcoder/src/api/apiUtils.ts
index 61d9ff6e26..485264c813 100644
--- a/client/packages/lowcoder/src/api/apiUtils.ts
+++ b/client/packages/lowcoder/src/api/apiUtils.ts
@@ -10,7 +10,7 @@ import {
 import { AUTH_BIND_URL, OAUTH_REDIRECT } from "constants/routesURL";
 import log from "loglevel";
 import history from "util/history";
-import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios";
+import axios, { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from "axios";
 import { trans } from "i18n";
 import StoreRegistry from "redux/store/storeRegistry";
 import { logoutAction } from "redux/reduxActions/userActions";
@@ -20,7 +20,7 @@ const executeActionRegex = /query\/execute/;
 const timeoutErrorRegex = /timeout of (\d+)ms exceeded/;
 export const axiosConnectionAbortedCode = "ECONNABORTED";
 
-type AxiosRequestConfigWithTimer = AxiosRequestConfig & { timer: number };
+type AxiosRequestConfigWithTimer = InternalAxiosRequestConfig & { timer: number };
 
 export type AxiosResponseWithTimer = AxiosResponse<ApiResponse> & {
   config: AxiosRequestConfigWithTimer;
@@ -37,7 +37,7 @@ export type AxiosErrorWithTimer = AxiosError<ApiResponse> & {
 };
 
 function isAxiosErrorWithTimer(error: any): error is AxiosErrorWithTimer {
-  return axios.isAxiosError(error) && error?.config && "timer" in error.config;
+  return Boolean(axios.isAxiosError(error) && error?.config && "timer" in error.config);
 }
 
 const makeExecuteActionResponse = (response: any) => {
@@ -68,7 +68,7 @@ const notNeedBindPath = () => {
   return pathName === AUTH_BIND_URL || pathName === OAUTH_REDIRECT;
 };
 
-export const apiRequestInterceptor = (config: AxiosRequestConfig): AxiosRequestConfigWithTimer => ({
+export const apiRequestInterceptor = (config: InternalAxiosRequestConfig): AxiosRequestConfigWithTimer => ({
   ...config,
   timer: performance.now(),
 });
diff --git a/client/packages/lowcoder/src/constants/apiConstants.ts b/client/packages/lowcoder/src/constants/apiConstants.ts
index 914687d35c..3b2f65badf 100644
--- a/client/packages/lowcoder/src/constants/apiConstants.ts
+++ b/client/packages/lowcoder/src/constants/apiConstants.ts
@@ -1,3 +1,4 @@
+import { RawAxiosRequestHeaders } from "axios";
 import { trans } from "i18n";
 
 export const DEFAULT_VERIFY_CODE_INTERVAL_SECONDS = 10;
@@ -47,7 +48,7 @@ export type PaginationParam = {
   size: number;
 };
 
-export const API_REQUEST_HEADERS: APIHeaders = {
+export const API_REQUEST_HEADERS: RawAxiosRequestHeaders = {
   "Content-Type": "application/json",
 };
 export const SERVER_HOST = `${REACT_APP_API_HOST ?? ""}`;
diff --git a/client/yarn.lock b/client/yarn.lock
index 74dd5d0ff1..909bc0a9ce 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -5232,7 +5232,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:*, axios@npm:^1.1.3":
+"axios@npm:*, axios@npm:^1.1.3, axios@npm:^1.6.2":
   version: 1.6.2
   resolution: "axios@npm:1.6.2"
   dependencies:
@@ -5243,15 +5243,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.1":
-  version: 0.21.4
-  resolution: "axios@npm:0.21.4"
-  dependencies:
-    follow-redirects: ^1.14.0
-  checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c
-  languageName: node
-  linkType: hard
-
 "axios@npm:^0.27.2":
   version: 0.27.2
   resolution: "axios@npm:0.27.2"
@@ -8616,7 +8607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0":
   version: 1.15.3
   resolution: "follow-redirects@npm:1.15.3"
   peerDependenciesMeta:
@@ -11652,7 +11643,7 @@ __metadata:
     agora-rtc-sdk-ng: ^4.19.0
     agora-rtm-sdk: ^1.5.1
     antd: ^5.12.2
-    axios: ^0.21.1
+    axios: ^1.6.2
     buffer: ^6.0.3
     clsx: ^2.0.0
     cnchar: ^3.2.4

From b73df0b6b53c29396abff557fe031105c56f3f48 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 20 Dec 2023 17:40:04 +0500
Subject: [PATCH 5/8] upgrade codemirror

---
 client/packages/lowcoder/package.json         |  15 +-
 .../src/comps/controls/codeControl.tsx        |   2 +-
 client/yarn.lock                              | 301 +++++++++---------
 3 files changed, 157 insertions(+), 161 deletions(-)

diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
index d23bd7cecc..a460b45296 100644
--- a/client/packages/lowcoder/package.json
+++ b/client/packages/lowcoder/package.json
@@ -7,13 +7,14 @@
   "types": "src/index.sdk.ts",
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@codemirror/autocomplete": "^0.20.3",
-    "@codemirror/basic-setup": "^0.20.0",
-    "@codemirror/lang-css": "0.20",
-    "@codemirror/lang-html": "0.20",
-    "@codemirror/lang-javascript": "^0.20.1",
-    "@codemirror/lang-json": "0.20.0",
-    "@codemirror/lang-sql": "^0.20.4",
+    "@codemirror/autocomplete": "^6.11.1",
+    "@codemirror/commands": "^6.3.2",
+    "@codemirror/lang-css": "^6.2.1",
+    "@codemirror/lang-html": "^6.4.7",
+    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-sql": "^6.5.4",
+    "@codemirror/search": "^6.5.5",
     "@dnd-kit/core": "^5.0.1",
     "@dnd-kit/modifiers": "^5.0.0",
     "@dnd-kit/sortable": "^6.0.0",
diff --git a/client/packages/lowcoder/src/comps/controls/codeControl.tsx b/client/packages/lowcoder/src/comps/controls/codeControl.tsx
index 3b50b3318c..c423e836f2 100644
--- a/client/packages/lowcoder/src/comps/controls/codeControl.tsx
+++ b/client/packages/lowcoder/src/comps/controls/codeControl.tsx
@@ -1,4 +1,4 @@
-import { EditorState } from "@codemirror/basic-setup";
+import { EditorState } from "@codemirror/state";
 import { isThemeColorKey } from "api/commonSettingApi";
 import { CodeEditor } from "base/codeEditor";
 import { Language } from "base/codeEditor/codeEditorTypes";
diff --git a/client/yarn.lock b/client/yarn.lock
index 909bc0a9ce..ad6f48e62f 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1788,161 +1788,154 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/autocomplete@npm:^0.20.0, @codemirror/autocomplete@npm:^0.20.3":
-  version: 0.20.3
-  resolution: "@codemirror/autocomplete@npm:0.20.3"
+"@codemirror/autocomplete@npm:^6.0.0, @codemirror/autocomplete@npm:^6.11.1":
+  version: 6.11.1
+  resolution: "@codemirror/autocomplete@npm:6.11.1"
   dependencies:
-    "@codemirror/language": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
-    "@lezer/common": ^0.16.0
-  checksum: 7dfc6b98f343382845b4bf074a7a449fbdd4d204309f4a492209395ac560c92aa6cd24824735606263de1efc25ea6a67c2cd5a46a56a4ff4d4351e1e3c953bf6
+    "@codemirror/language": ^6.0.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.17.0
+    "@lezer/common": ^1.0.0
+  peerDependencies:
+    "@codemirror/language": ^6.0.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.0.0
+    "@lezer/common": ^1.0.0
+  checksum: 69cb77d51dbc4c76a990fb8e562075d6fa11b2aef00fce33d2a98dd701f6a89050b1b464ae8ee1e2cbe1a4210522b1a3c2260cdf5c933a062093acaf98a5eedc
   languageName: node
   linkType: hard
 
-"@codemirror/basic-setup@npm:^0.20.0":
-  version: 0.20.0
-  resolution: "@codemirror/basic-setup@npm:0.20.0"
+"@codemirror/commands@npm:^6.3.2":
+  version: 6.3.2
+  resolution: "@codemirror/commands@npm:6.3.2"
   dependencies:
-    "@codemirror/autocomplete": ^0.20.0
-    "@codemirror/commands": ^0.20.0
-    "@codemirror/language": ^0.20.0
-    "@codemirror/lint": ^0.20.0
-    "@codemirror/search": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
-  checksum: bb17178b9e6a3c05edb1678535e8303da60b77a55a5d509fffbdd91b85b351a5b4f135bf6d7bd2cd1210efc688d0c440791a7688a703c83cf1d3438be0718d95
+    "@codemirror/language": ^6.0.0
+    "@codemirror/state": ^6.2.0
+    "@codemirror/view": ^6.0.0
+    "@lezer/common": ^1.1.0
+  checksum: 683c444d8e6ad889ab5efd0d742b0fa28b78c8cad63276ec60d298b13d4939c8bd7e1d6fd3535645b8d255147de0d3aef46d89a29c19d0af58a7f2914bdcb3ab
   languageName: node
   linkType: hard
 
-"@codemirror/commands@npm:^0.20.0":
-  version: 0.20.0
-  resolution: "@codemirror/commands@npm:0.20.0"
+"@codemirror/lang-css@npm:^6.0.0, @codemirror/lang-css@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "@codemirror/lang-css@npm:6.2.1"
   dependencies:
-    "@codemirror/language": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
-    "@lezer/common": ^0.16.0
-  checksum: 4538de7200f9ac4c8482fd99bee8d49ae983ca2be3b81d5f1f3e3cf7d7821f64f3ddf396213dd56b2fd9bd46f6d72467846dad0e4c42a3b9c8ba8243522e0bc6
+    "@codemirror/autocomplete": ^6.0.0
+    "@codemirror/language": ^6.0.0
+    "@codemirror/state": ^6.0.0
+    "@lezer/common": ^1.0.2
+    "@lezer/css": ^1.0.0
+  checksum: 5a8457ee8a4310030a969f2d3128429f549c4dc9b7907ee8888b42119c80b65af99093801432efdf659b8ec36a147d2a947bc1ecbbf69a759395214e3f4834a8
   languageName: node
   linkType: hard
 
-"@codemirror/lang-css@npm:0.20, @codemirror/lang-css@npm:^0.20.0":
-  version: 0.20.0
-  resolution: "@codemirror/lang-css@npm:0.20.0"
+"@codemirror/lang-html@npm:^6.4.7":
+  version: 6.4.7
+  resolution: "@codemirror/lang-html@npm:6.4.7"
   dependencies:
-    "@codemirror/autocomplete": ^0.20.0
-    "@codemirror/language": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@lezer/css": ^0.16.0
-  checksum: a922c76fe51a13d5af6e019fe36cd344d9d855aeb8a6ee8b01d2c757d015b3615907984c99dfa1866a81ef1fac465251b959a08e4d15d79b8ed2a4a35f3eed5e
+    "@codemirror/autocomplete": ^6.0.0
+    "@codemirror/lang-css": ^6.0.0
+    "@codemirror/lang-javascript": ^6.0.0
+    "@codemirror/language": ^6.4.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.17.0
+    "@lezer/common": ^1.0.0
+    "@lezer/css": ^1.1.0
+    "@lezer/html": ^1.3.0
+  checksum: 26e3d9243bd8dea2c0f7769315f8ed4b77969497f52c545c84ff32f155489b3a29e476aa78ffc11e910a0f927bbebce4d28f4e17e1994f6c9d8df6bdd3c33ef1
   languageName: node
   linkType: hard
 
-"@codemirror/lang-html@npm:0.20":
-  version: 0.20.0
-  resolution: "@codemirror/lang-html@npm:0.20.0"
+"@codemirror/lang-javascript@npm:^6.0.0, @codemirror/lang-javascript@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "@codemirror/lang-javascript@npm:6.2.1"
   dependencies:
-    "@codemirror/autocomplete": ^0.20.0
-    "@codemirror/lang-css": ^0.20.0
-    "@codemirror/lang-javascript": ^0.20.0
-    "@codemirror/language": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@lezer/common": ^0.16.0
-    "@lezer/html": ^0.16.0
-  checksum: ee02952c0409da4040e6f8aa522e69b2f5f7b0c16c704360cf0c7b2ac6010e8aed2a643f6096ccc877f8c3f784d1b5ce7136c92300dc63ddf5e971793aad0944
+    "@codemirror/autocomplete": ^6.0.0
+    "@codemirror/language": ^6.6.0
+    "@codemirror/lint": ^6.0.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.17.0
+    "@lezer/common": ^1.0.0
+    "@lezer/javascript": ^1.0.0
+  checksum: 3df38c4cced06195283a9a2a9365aaa7c8c1b157852b331bc3a118403f774bbba57d2a392de52f5e28d2b344a323bc0146bcf7c8ef8be2473f167d815e4a37cd
   languageName: node
   linkType: hard
 
-"@codemirror/lang-javascript@npm:^0.20.0, @codemirror/lang-javascript@npm:^0.20.1":
-  version: 0.20.1
-  resolution: "@codemirror/lang-javascript@npm:0.20.1"
+"@codemirror/lang-json@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "@codemirror/lang-json@npm:6.0.1"
   dependencies:
-    "@codemirror/autocomplete": ^0.20.0
-    "@codemirror/language": ^0.20.0
-    "@codemirror/lint": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
-    "@lezer/common": ^0.16.1
-    "@lezer/javascript": ^0.16.0
-  checksum: 169ed50ec2ef0171cc0719c48a971371a12b2a36180d42151f592bae3611f13331f422f67dd0cbbfc6938a5840fe8a96c90278de5606234896345391f15eff46
+    "@codemirror/language": ^6.0.0
+    "@lezer/json": ^1.0.0
+  checksum: e9e87d50ff7b81bd56a6ab50740b1dd54e9a93f1be585e1d59d0642e2148842ea1528ac7b7221eb4ddc7fe84bbc28065144cc3ab86f6e06c6aeb2d4b4e62acf1
   languageName: node
   linkType: hard
 
-"@codemirror/lang-json@npm:0.20.0":
-  version: 0.20.0
-  resolution: "@codemirror/lang-json@npm:0.20.0"
+"@codemirror/lang-sql@npm:^6.5.4":
+  version: 6.5.4
+  resolution: "@codemirror/lang-sql@npm:6.5.4"
   dependencies:
-    "@codemirror/language": ^0.20.0
-    "@lezer/json": ^0.16.0
-  checksum: 20bbf0a480852fd11b0904561d4c7fe151f7a5cbe49b36516890ce7d729b4fd51e7c0443fb27463fd25e69e5ed693c3ce5e346ba60669a012f313cf8b06db13e
+    "@codemirror/autocomplete": ^6.0.0
+    "@codemirror/language": ^6.0.0
+    "@codemirror/state": ^6.0.0
+    "@lezer/highlight": ^1.0.0
+    "@lezer/lr": ^1.0.0
+  checksum: face21b0231ac5a7981949b5bf6a99ed092d0d6f7eb83f35dcd31d56ecf07dafa19d21623e0bad36cec7a12e3149df7b45c3588aeee31eae41e9b05942c4fdd7
   languageName: node
   linkType: hard
 
-"@codemirror/lang-sql@npm:^0.20.4":
-  version: 0.20.4
-  resolution: "@codemirror/lang-sql@npm:0.20.4"
+"@codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.4.0, @codemirror/language@npm:^6.6.0":
+  version: 6.9.3
+  resolution: "@codemirror/language@npm:6.9.3"
   dependencies:
-    "@codemirror/autocomplete": ^0.20.0
-    "@codemirror/language": ^0.20.0
-    "@codemirror/state": ^0.20.0
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
-  checksum: 15b29e017357a8e62a34cc1e7fe498db385e98ed257d313b05c026f4d0b5c0bf41d03e0a185612bda0d28ce33720f98539f2ca7baaa85df4866a9819959b0303
-  languageName: node
-  linkType: hard
-
-"@codemirror/language@npm:^0.20.0":
-  version: 0.20.2
-  resolution: "@codemirror/language@npm:0.20.2"
-  dependencies:
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
-    "@lezer/common": ^0.16.0
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.0.0
+    "@lezer/common": ^1.1.0
+    "@lezer/highlight": ^1.0.0
+    "@lezer/lr": ^1.0.0
     style-mod: ^4.0.0
-  checksum: 144d360e3172a5f72641da327e303ef6a8ef3f60923d942adeb10710d524f1b85e0bfcdebc288fba8619b007b7a790f8a0ffbc20b4f54fe5c8bf24755481ad2f
+  checksum: 774a40bc91c748d418a9a774161a5b083061124e4439bb753072bc657ec4c4784f595161c10c7c3935154b22291bf6dc74c9abe827033db32e217ac3963478f3
   languageName: node
   linkType: hard
 
-"@codemirror/lint@npm:^0.20.0":
-  version: 0.20.3
-  resolution: "@codemirror/lint@npm:0.20.3"
+"@codemirror/lint@npm:^6.0.0":
+  version: 6.4.2
+  resolution: "@codemirror/lint@npm:6.4.2"
   dependencies:
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.2
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.0.0
     crelt: ^1.0.5
-  checksum: df3023ebff7c2c5f763bd5a8810c9967f2bc4ac367e4cbfdccd9e4584ff9a1e06400dad60677e956d30e7fef3a0fc22b35d1bd44a8e369db2dfa8a899ab419f1
+  checksum: 5e699960c1b28dbaa584fe091a3201978907bf4b9e52810fb15d3ceaf310e38053435e0b594da0985266ae812039a5cd6c36023284a6f8568664bdca04db137f
   languageName: node
   linkType: hard
 
-"@codemirror/search@npm:^0.20.0":
-  version: 0.20.1
-  resolution: "@codemirror/search@npm:0.20.1"
+"@codemirror/search@npm:^6.5.5":
+  version: 6.5.5
+  resolution: "@codemirror/search@npm:6.5.5"
   dependencies:
-    "@codemirror/state": ^0.20.0
-    "@codemirror/view": ^0.20.0
+    "@codemirror/state": ^6.0.0
+    "@codemirror/view": ^6.0.0
     crelt: ^1.0.5
-  checksum: eb324d7967183652bc4c636f1b3c7f5bc7266a0d36d1138f03f2aa05585ee17c45666fe4d0e9b8d6e55b39f9338d06b76a333048b5e6ff523400cabad8fbd19f
+  checksum: 825196ef63273494ba9a6153b01eda385edb65e77a1e49980dd3a28d4a692af1e9575e03e4b6c84f6fa2afe72217113ff4c50f58b20d13fe0d277cda5dd7dc81
   languageName: node
   linkType: hard
 
-"@codemirror/state@npm:^0.20.0":
-  version: 0.20.1
-  resolution: "@codemirror/state@npm:0.20.1"
-  checksum: 9ad924314d2b88eecfdf7aac6da89e9c92154ab2fb2afb8b4de1581bdc24fcafbd3cdf1c435d592042cf4c044815c2306265e39cb22f8041e76f0f7121d7ebd5
+"@codemirror/state@npm:^6.0.0, @codemirror/state@npm:^6.1.4, @codemirror/state@npm:^6.2.0":
+  version: 6.3.3
+  resolution: "@codemirror/state@npm:6.3.3"
+  checksum: 08b075c738cc29391519d3e9b60c4398e7f56ba344983ab9b2263c7ace17d3056e4dcbc2ff651fd49099b48c8b4dc8535404a2f94bd017827f5f90c1045a1b05
   languageName: node
   linkType: hard
 
-"@codemirror/view@npm:^0.20.0, @codemirror/view@npm:^0.20.2":
-  version: 0.20.7
-  resolution: "@codemirror/view@npm:0.20.7"
+"@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0":
+  version: 6.22.3
+  resolution: "@codemirror/view@npm:6.22.3"
   dependencies:
-    "@codemirror/state": ^0.20.0
-    style-mod: ^4.0.0
+    "@codemirror/state": ^6.1.4
+    style-mod: ^4.1.0
     w3c-keyname: ^2.2.4
-  checksum: 51799e4e53d0ec0c2cee28e4462abef5542b7dee2551b0fe1c69c1fe3622033243130c04c2b7bc6080561d74950188814660b1bc8eebdb4ce2ea173a9e48f11a
+  checksum: 89d011afa87b754a4207d18393109c1972c9403762d288711e96c77f51c693a825431c8e35c26268a6eb0889f7184602080d8dcf27fa21354a87dff80636d971
   languageName: node
   linkType: hard
 
@@ -2824,68 +2817,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lezer/common@npm:^0.16.0, @lezer/common@npm:^0.16.1":
-  version: 0.16.1
-  resolution: "@lezer/common@npm:0.16.1"
-  checksum: ee27598a8c2a4e5bcba285cf091b7c1aee36e5a5e8352b63ce65520e7279f6305e1272d8adede150fc4aee0073c1e3e93fb11271d538815db72bdff341c4be65
+"@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.0.2, @lezer/common@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "@lezer/common@npm:1.1.2"
+  checksum: 2d08c67f467d9625eac1cd79618f964353b63305f17822067c9aa7586c4983bfeaa4e6712f0e5685cf1de679fda5d707a4389a0dd01337397757d2cde0b070ea
   languageName: node
   linkType: hard
 
-"@lezer/css@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "@lezer/css@npm:0.16.0"
+"@lezer/css@npm:^1.0.0, @lezer/css@npm:^1.1.0":
+  version: 1.1.4
+  resolution: "@lezer/css@npm:1.1.4"
   dependencies:
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
-  checksum: c88151f2d0f3cbc00e21a9f2f18960298ffe566a321996fa0e2b676b804535c1b20053bc8f81f8510c8523169a00cbbabe808775b5e980c371b64912d19c6dc9
+    "@lezer/highlight": ^1.0.0
+    "@lezer/lr": ^1.0.0
+  checksum: 13ffe83e7aaf4213b6a86d01cd68ac02a22e96e9b8ac91368f5f79572cf5e494cee1dc039dc4ed331ba38754681d6013397d06d8c319f1fcb6852b5625eba055
   languageName: node
   linkType: hard
 
-"@lezer/highlight@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "@lezer/highlight@npm:0.16.0"
+"@lezer/highlight@npm:^1.0.0, @lezer/highlight@npm:^1.1.3":
+  version: 1.2.0
+  resolution: "@lezer/highlight@npm:1.2.0"
   dependencies:
-    "@lezer/common": ^0.16.0
-  checksum: f1be44044096c6e58d7f48b8eb50eb3c6b561d72b1537e239e50df3c7686ea46fce3c068cb95ef4a79bb1eb939caf700ff4a3dcddb39dd0ae6bce46aeccbdaf3
+    "@lezer/common": ^1.0.0
+  checksum: 5b9dfe741f95db13f6124cb9556a43011cb8041ecf490be98d44a86b04d926a66e912bcd3a766f6a3d79e064410f1a2f60ab240b50b645a12c56987bf4870086
   languageName: node
   linkType: hard
 
-"@lezer/html@npm:^0.16.0":
-  version: 0.16.1
-  resolution: "@lezer/html@npm:0.16.1"
+"@lezer/html@npm:^1.3.0":
+  version: 1.3.7
+  resolution: "@lezer/html@npm:1.3.7"
   dependencies:
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
-  checksum: a94ad6561e5effc21eaee24e141e566ed247c18a52ee5ab9e7a100bc9317ad068219934adae8054be318fc89652ead28de989b94e322c5d71799a2687eb5db3d
+    "@lezer/common": ^1.0.0
+    "@lezer/highlight": ^1.0.0
+    "@lezer/lr": ^1.0.0
+  checksum: 7145c0eae4f5cf79e34c6bf2fe3f812460969b58dd8923adeb2d14ddfbd6111fed91eaee24d914430c1dcca711a0aac144afc71df00abb750ed7b9d96a6b6f84
   languageName: node
   linkType: hard
 
-"@lezer/javascript@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "@lezer/javascript@npm:0.16.0"
+"@lezer/javascript@npm:^1.0.0":
+  version: 1.4.11
+  resolution: "@lezer/javascript@npm:1.4.11"
   dependencies:
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
-  checksum: 164c1dcadc47610e588fee1e1c1f1cb478a296373ab3654e04b41dd6feb375f0abe0df6b5d339e70aaa444df573873cf2302d21abe3f372cbaa0bebfd1cf7f5a
+    "@lezer/highlight": ^1.1.3
+    "@lezer/lr": ^1.3.0
+  checksum: aeae5cd01702054593740deb66ed246d82cd8fc9d9788b2724d71a0ddce00743fdf710a2598c244e74d67efc32fa9147d5c0cf5a8d1da7be36a5994bf518cf6f
   languageName: node
   linkType: hard
 
-"@lezer/json@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "@lezer/json@npm:0.16.0"
+"@lezer/json@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "@lezer/json@npm:1.0.1"
   dependencies:
-    "@lezer/highlight": ^0.16.0
-    "@lezer/lr": ^0.16.0
-  checksum: 3fe14dcd8879c9318dc74e77c3543fff21e2f7b45b344b93e58e67eae48ea0c603c6b602129967d85a8ade1fa88b2c6abe43b3772b57829890fd91b111676f13
+    "@lezer/highlight": ^1.0.0
+    "@lezer/lr": ^1.0.0
+  checksum: fcd17178f6a58e71c83e08fdc047e3708528b28591ba8f08ed35268f370d1ec9b63af0afa9d82a77fec26e9eb477ab3cfdc31c951e080d118ef607f9f9bb52e3
   languageName: node
   linkType: hard
 
-"@lezer/lr@npm:^0.16.0":
-  version: 0.16.3
-  resolution: "@lezer/lr@npm:0.16.3"
+"@lezer/lr@npm:^1.0.0, @lezer/lr@npm:^1.3.0":
+  version: 1.3.14
+  resolution: "@lezer/lr@npm:1.3.14"
   dependencies:
-    "@lezer/common": ^0.16.0
-  checksum: ac6d494d1affa74d1490c52dbafa2009d43fc28165eb17e7389b1678b9783c4aa4030f5f0f825f174c6ddc983cbea671f37e0eac01bd1ce48eb23be497abd77b
+    "@lezer/common": ^1.0.0
+  checksum: 07be41edcb6c332a3567436d2c626131544181c4d680811baf23f6157db3dce4ebfef325cbd0b88dc8b128b83fbe6363c5dcf3e0a4ff369ddfae05d9f207daee
   languageName: node
   linkType: hard
 
@@ -11606,13 +11600,14 @@ __metadata:
   resolution: "lowcoder@workspace:packages/lowcoder"
   dependencies:
     "@ant-design/icons": ^4.7.0
-    "@codemirror/autocomplete": ^0.20.3
-    "@codemirror/basic-setup": ^0.20.0
-    "@codemirror/lang-css": 0.20
-    "@codemirror/lang-html": 0.20
-    "@codemirror/lang-javascript": ^0.20.1
-    "@codemirror/lang-json": 0.20.0
-    "@codemirror/lang-sql": ^0.20.4
+    "@codemirror/autocomplete": ^6.11.1
+    "@codemirror/commands": ^6.3.2
+    "@codemirror/lang-css": ^6.2.1
+    "@codemirror/lang-html": ^6.4.7
+    "@codemirror/lang-javascript": ^6.2.1
+    "@codemirror/lang-json": ^6.0.1
+    "@codemirror/lang-sql": ^6.5.4
+    "@codemirror/search": ^6.5.5
     "@dnd-kit/core": ^5.0.1
     "@dnd-kit/modifiers": ^5.0.0
     "@dnd-kit/sortable": ^6.0.0
@@ -16383,7 +16378,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-mod@npm:^4.0.0":
+"style-mod@npm:^4.0.0, style-mod@npm:^4.1.0":
   version: 4.1.0
   resolution: "style-mod@npm:4.1.0"
   checksum: 8402b14ca11113a3640d46b3cf7ba49f05452df7846bc5185a3535d9b6a64a3019e7fb636b59ccbb7816aeb0725b24723e77a85b05612a9360e419958e13b4e6

From e0b7c17281da0ee293af6293cfc6e56063661053 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Thu, 21 Dec 2023 12:34:15 +0500
Subject: [PATCH 6/8] remove @testing-library/react

---
 client/config/test/jest.config.js             |   2 +-
 client/package.json                           |   2 +-
 client/packages/lowcoder-comps/jest.config.js |   2 +-
 client/packages/lowcoder-comps/package.json   |   1 -
 client/yarn.lock                              | 135 ++----------------
 5 files changed, 11 insertions(+), 131 deletions(-)

diff --git a/client/config/test/jest.config.js b/client/config/test/jest.config.js
index 958f1d2538..90fb745727 100644
--- a/client/config/test/jest.config.js
+++ b/client/config/test/jest.config.js
@@ -36,7 +36,7 @@ export default {
     path.resolve(currentDir, "../../packages/lowcoder-design/src"),
   ],
   setupFiles: [path.resolve(currentDir, "./jest.setup.js")],
-  setupFilesAfterEnv: [path.resolve(currentDir, "./jest.setup-after-env.js")],
+  setupFilesAfterEnv: [path.resolve(currentDir, "./jest.setup-after-env.js"), 'jest-canvas-mock'],
   transform: {
     "^.+\\.(js|jsx|mjs|cjs|ts|tsx)$": path.resolve(currentDir, "./transform/babelTransform.js"),
     "^.+\\.css$": path.resolve(currentDir, "./transform/cssTransform.js"),
diff --git a/client/package.json b/client/package.json
index 22d38afc91..511702550c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -25,7 +25,6 @@
     "@babel/preset-typescript": "^7.18.6",
     "@rollup/plugin-typescript": "^8.5.0",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^12.0.0",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.2.2",
     "@types/mime": "^2.0.3",
@@ -45,6 +44,7 @@
     "babel-preset-react-app": "^10.0.1",
     "husky": "^8.0.1",
     "jest": "^29.5.0",
+    "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^13.0.1",
     "lowcoder-cli": "workspace:^",
diff --git a/client/packages/lowcoder-comps/jest.config.js b/client/packages/lowcoder-comps/jest.config.js
index 89a76bd411..23b80ec574 100644
--- a/client/packages/lowcoder-comps/jest.config.js
+++ b/client/packages/lowcoder-comps/jest.config.js
@@ -2,5 +2,5 @@ import config from "../../config/test/jest.config.js";
 
 export default {
   ...config,
-  setupFiles: [...config.setupFiles, 'jest-canvas-mock'],
+  setupFiles: [...config.setupFiles],
 };
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
index 65e132cd5f..62712754bf 100644
--- a/client/packages/lowcoder-comps/package.json
+++ b/client/packages/lowcoder-comps/package.json
@@ -69,7 +69,6 @@
   },
   "devDependencies": {
     "jest": "29.3.0",
-    "jest-canvas-mock": "^2.5.2",
     "vite": "^4.3.9",
     "vite-tsconfig-paths": "^3.6.0"
   }
diff --git a/client/yarn.lock b/client/yarn.lock
index ad6f48e62f..d7c259ac06 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -3675,22 +3675,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^8.0.0":
-  version: 8.20.1
-  resolution: "@testing-library/dom@npm:8.20.1"
-  dependencies:
-    "@babel/code-frame": ^7.10.4
-    "@babel/runtime": ^7.12.5
-    "@types/aria-query": ^5.0.1
-    aria-query: 5.1.3
-    chalk: ^4.1.0
-    dom-accessibility-api: ^0.5.9
-    lz-string: ^1.5.0
-    pretty-format: ^27.0.2
-  checksum: 06fc8dc67849aadb726cbbad0e7546afdf8923bd39acb64c576d706249bd7d0d05f08e08a31913fb621162e3b9c2bd0dce15964437f030f9fa4476326fdd3007
-  languageName: node
-  linkType: hard
-
 "@testing-library/jest-dom@npm:^5.16.5":
   version: 5.17.0
   resolution: "@testing-library/jest-dom@npm:5.17.0"
@@ -3708,20 +3692,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:^12.0.0":
-  version: 12.1.5
-  resolution: "@testing-library/react@npm:12.1.5"
-  dependencies:
-    "@babel/runtime": ^7.12.5
-    "@testing-library/dom": ^8.0.0
-    "@types/react-dom": <18.0.0
-  peerDependencies:
-    react: <18.0.0
-    react-dom: <18.0.0
-  checksum: 4abd0490405e709a7df584a0db604e508a4612398bb1326e8fa32dd9393b15badc826dcf6d2f7525437886d507871f719f127b9860ed69ddd204d1fa834f576a
-  languageName: node
-  linkType: hard
-
 "@tootallnate/once@npm:2":
   version: 2.0.0
   resolution: "@tootallnate/once@npm:2.0.0"
@@ -3736,13 +3706,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/aria-query@npm:^5.0.1":
-  version: 5.0.4
-  resolution: "@types/aria-query@npm:5.0.4"
-  checksum: ad8b87e4ad64255db5f0a73bc2b4da9b146c38a3a8ab4d9306154334e0fc67ae64e76bfa298eebd1e71830591fb15987e5de7111bdb36a2221bdc379e3415fb0
-  languageName: node
-  linkType: hard
-
 "@types/axios@npm:^0.14.0":
   version: 0.14.0
   resolution: "@types/axios@npm:0.14.0"
@@ -4082,7 +4045,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:17, @types/react-dom@npm:<18.0.0, @types/react-dom@npm:^17.0.9":
+"@types/react-dom@npm:17, @types/react-dom@npm:^17.0.9":
   version: 17.0.25
   resolution: "@types/react-dom@npm:17.0.25"
   dependencies:
@@ -4999,15 +4962,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.1.3":
-  version: 5.1.3
-  resolution: "aria-query@npm:5.1.3"
-  dependencies:
-    deep-equal: ^2.0.5
-  checksum: 929ff95f02857b650fb4cbcd2f41072eee2f46159a6605ea03bf63aa572e35ffdff43d69e815ddc462e16e07de8faba3978afc2813650b4448ee18c9895d982b
-  languageName: node
-  linkType: hard
-
 "aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
@@ -5805,7 +5759,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:4, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1":
+"chalk@npm:4, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.1":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -7105,32 +7059,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal@npm:^2.0.5":
-  version: 2.2.3
-  resolution: "deep-equal@npm:2.2.3"
-  dependencies:
-    array-buffer-byte-length: ^1.0.0
-    call-bind: ^1.0.5
-    es-get-iterator: ^1.1.3
-    get-intrinsic: ^1.2.2
-    is-arguments: ^1.1.1
-    is-array-buffer: ^3.0.2
-    is-date-object: ^1.0.5
-    is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
-    isarray: ^2.0.5
-    object-is: ^1.1.5
-    object-keys: ^1.1.1
-    object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.5.1
-    side-channel: ^1.0.4
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.13
-  checksum: ee8852f23e4d20a5626c13b02f415ba443a1b30b4b3d39eaf366d59c4a85e6545d7ec917db44d476a85ae5a86064f7e5f7af7479f38f113995ba869f3a1ddc53
-  languageName: node
-  linkType: hard
-
 "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3":
   version: 0.1.4
   resolution: "deep-is@npm:0.1.4"
@@ -7282,7 +7210,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9":
+"dom-accessibility-api@npm:^0.5.6":
   version: 0.5.16
   resolution: "dom-accessibility-api@npm:0.5.16"
   checksum: 005eb283caef57fc1adec4d5df4dd49189b628f2f575af45decb210e04d634459e3f1ee64f18b41e2dcf200c844bc1d9279d80807e686a30d69a4756151ad248
@@ -7653,23 +7581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
-    has-symbols: ^1.0.3
-    is-arguments: ^1.1.1
-    is-map: ^2.0.2
-    is-set: ^2.0.2
-    is-string: ^1.0.7
-    isarray: ^2.0.5
-    stop-iteration-iterator: ^1.0.0
-  checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d
-  languageName: node
-  linkType: hard
-
 "es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15":
   version: 1.0.15
   resolution: "es-iterator-helpers@npm:1.0.15"
@@ -9541,7 +9452,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
+"internal-slot@npm:^1.0.5":
   version: 1.0.6
   resolution: "internal-slot@npm:1.0.6"
   dependencies:
@@ -9806,7 +9717,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
+"is-map@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-map@npm:2.0.2"
   checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728
@@ -9906,7 +9817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
+"is-set@npm:^2.0.1":
   version: 2.0.2
   resolution: "is-set@npm:2.0.2"
   checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57
@@ -11434,7 +11345,6 @@ __metadata:
     echarts-extension-gmap: ^1.6.0
     echarts-wordcloud: ^2.1.0
     jest: 29.3.0
-    jest-canvas-mock: ^2.5.2
     lowcoder-cli: "workspace:^"
     lowcoder-sdk: "workspace:^"
     mermaid: ^10.6.1
@@ -11527,7 +11437,6 @@ __metadata:
     "@lottiefiles/react-lottie-player": ^3.5.3
     "@rollup/plugin-typescript": ^8.5.0
     "@testing-library/jest-dom": ^5.16.5
-    "@testing-library/react": ^12.0.0
     "@types/file-saver": ^2.0.5
     "@types/jest": ^29.2.2
     "@types/mime": ^2.0.3
@@ -11549,6 +11458,7 @@ __metadata:
     chalk: 4
     husky: ^8.0.1
     jest: ^29.5.0
+    jest-canvas-mock: ^2.5.2
     jest-environment-jsdom: ^29.5.0
     lint-staged: ^13.0.1
     lowcoder-cli: "workspace:^"
@@ -11764,15 +11674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lz-string@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "lz-string@npm:1.5.0"
-  bin:
-    lz-string: bin/bin.js
-  checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
-  languageName: node
-  linkType: hard
-
 "magic-string@npm:^0.22.5":
   version: 0.22.5
   resolution: "magic-string@npm:0.22.5"
@@ -13516,17 +13417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^27.0.2":
-  version: 27.5.1
-  resolution: "pretty-format@npm:27.5.1"
-  dependencies:
-    ansi-regex: ^5.0.1
-    ansi-styles: ^5.0.0
-    react-is: ^17.0.1
-  checksum: cf610cffcb793885d16f184a62162f2dd0df31642d9a18edf4ca298e909a8fe80bdbf556d5c9573992c102ce8bf948691da91bf9739bee0ffb6e79c8a8a6e088
-  languageName: node
-  linkType: hard
-
 "pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
   version: 29.7.0
   resolution: "pretty-format@npm:29.7.0"
@@ -14498,7 +14388,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^17.0.1, react-is@npm:^17.0.2":
+"react-is@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
   checksum: 9d6d111d8990dc98bc5402c1266a808b0459b5d54830bbea24c12d908b536df7883f268a7868cfaedde3dd9d4e0d574db456f84d2e6df9c4526f99bb4b5344d8
@@ -16172,15 +16062,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: ^1.0.4
-  checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42
-  languageName: node
-  linkType: hard
-
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"

From c975e538bf595e7113ae6a4be5ea77a5c8758d46 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Thu, 21 Dec 2023 13:58:45 +0500
Subject: [PATCH 7/8] fix tests

---
 client/packages/lowcoder/src/comps/index.tsx                   | 3 ++-
 .../src/comps/queries/queryComp/queryNotificationControl.tsx   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/index.tsx b/client/packages/lowcoder/src/comps/index.tsx
index 71de8f6fdc..0de77fadca 100644
--- a/client/packages/lowcoder/src/comps/index.tsx
+++ b/client/packages/lowcoder/src/comps/index.tsx
@@ -144,7 +144,7 @@ const builtInRemoteComps: Omit<RemoteCompInfo, "compName"> = {
   packageName: "lowcoder-comps",
 };
 
-const uiCompMap: Registry = {
+var uiCompMap: Registry = {
 
   // Dashboards
 
@@ -1084,6 +1084,7 @@ const uiCompMap: Registry = {
 };
 
 export function loadComps() {
+  if(!uiCompMap) return;
   const entries = Object.entries(uiCompMap);
   for (const [compType, manifest] of entries) {
     registerComp(compType as UICompType, manifest);
diff --git a/client/packages/lowcoder/src/comps/queries/queryComp/queryNotificationControl.tsx b/client/packages/lowcoder/src/comps/queries/queryComp/queryNotificationControl.tsx
index 263dbef14f..089845d027 100644
--- a/client/packages/lowcoder/src/comps/queries/queryComp/queryNotificationControl.tsx
+++ b/client/packages/lowcoder/src/comps/queries/queryComp/queryNotificationControl.tsx
@@ -131,7 +131,7 @@ const QueryNotificationTmpControl = new MultiCompBuilder(
 
       // Execute system notification when triggered manually and without custom notification and query is successful
       if (result.success && !hasNoticed) {
-        messageInstance.success(trans("query.successMessageWithName", { name }), duration);
+        messageInstance?.success(trans("query.successMessageWithName", { name }), duration);
       }
     }
   }

From ea12bc543aacfe3e409367af716fc279e3bce2a4 Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Wed, 27 Dec 2023 16:04:41 +0500
Subject: [PATCH 8/8] upgrade react, react-dom, @types/react, @types/react-dom
 and fixes

---
 client/package.json                           |  2 +-
 .../index.tsx                                 |  6 +-
 client/packages/lowcoder-cli/package.json     |  4 +-
 client/packages/lowcoder-comps/index.tsx      |  6 +-
 client/packages/lowcoder-comps/package.json   |  8 +-
 client/packages/lowcoder-core/lib/index.d.ts  |  2 +-
 .../src/components/CustomModal.tsx            | 34 ++++----
 .../src/components/toolTip.tsx                |  2 +-
 .../packages/lowcoder-plugin-demo/index.tsx   |  6 +-
 .../lowcoder-plugin-demo/package.json         |  8 +-
 client/packages/lowcoder-sdk/package.json     |  4 +-
 client/packages/lowcoder/package.json         |  8 +-
 client/packages/lowcoder/src/app.tsx          |  9 +-
 .../lowcoder/src/appView/AppViewInstance.tsx  |  8 +-
 .../codeEditor/extensions/iconExtension.tsx   |  5 +-
 .../containerBase/containerCompBuilder.tsx    |  3 +-
 .../comps/containerComp/containerView.tsx     |  9 +-
 .../src/comps/comps/customComp/customComp.tsx |  3 +-
 .../src/comps/comps/formComp/createForm.tsx   | 19 ++++-
 .../comps/tableComp/selectionControl.tsx      |  2 +-
 .../comps/comps/tableComp/tableCompView.tsx   | 16 +++-
 .../src/comps/comps/tableComp/tableTypes.tsx  |  2 +
 .../src/comps/comps/treeComp/treeComp.tsx     |  6 +-
 .../comps/comps/treeComp/treeSelectComp.tsx   |  2 +-
 .../triContainerCompBuilder.tsx               |  3 +-
 .../lowcoder/src/comps/generators/multi.tsx   |  2 +-
 .../lowcoder/src/comps/hooks/messageComp.ts   |  2 +-
 .../lowcoder/src/comps/queries/esQuery.tsx    |  4 +-
 .../comps/queries/httpQuery/streamQuery.tsx   |  2 +-
 client/packages/lowcoder/src/debug.tsx        |  8 +-
 .../src/pages/ApplicationV2/index.tsx         |  8 +-
 .../pages/datasource/datasourceEditPage.tsx   |  2 +-
 .../lowcoder/src/pages/editor/LeftContent.tsx | 12 ++-
 .../pages/editor/bottom/BottomMetaDrawer.tsx  |  2 +-
 .../src/pages/editor/styledComponents.tsx     |  4 +-
 .../pages/setting/idSource/detail/index.tsx   |  2 +-
 .../src/redux/sagas/commonSettingsSagas.ts    | 12 ++-
 .../lowcoder/src/redux/sagas/userSagas.ts     |  6 +-
 .../packages/lowcoder/src/util/cacheUtils.ts  |  2 +-
 client/packages/lowcoder/src/util/hotkeys.tsx |  1 +
 .../packages/lowcoder/src/util/keyUtils.tsx   |  1 +
 client/yarn.lock                              | 82 ++++++++-----------
 42 files changed, 190 insertions(+), 139 deletions(-)

diff --git a/client/package.json b/client/package.json
index 511702550c..0b64d0cd5a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -63,7 +63,7 @@
   },
   "packageManager": "yarn@3.6.4",
   "resolutions": {
-    "@types/react": "^17",
+    "@types/react": "^18",
     "moment": "2.29.2",
     "canvas": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.1.tgz",
     "react-virtualized@^9.22.3": "patch:react-virtualized@npm%3A9.22.3#./.yarn/patches/react-virtualized-npm-9.22.3-0fff3cbf64.patch",
diff --git a/client/packages/lowcoder-cli-template-typescript/index.tsx b/client/packages/lowcoder-cli-template-typescript/index.tsx
index b446b08b82..a424ca6bdb 100644
--- a/client/packages/lowcoder-cli-template-typescript/index.tsx
+++ b/client/packages/lowcoder-cli-template-typescript/index.tsx
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { CompIDE } from "lowcoder-sdk";
 import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
   );
 }
 
-ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
+const container = document.querySelector("#root");
+const root = createRoot(container!);
+root.render(<CompDevApp />);
diff --git a/client/packages/lowcoder-cli/package.json b/client/packages/lowcoder-cli/package.json
index fd106f6ab6..ebc038749b 100644
--- a/client/packages/lowcoder-cli/package.json
+++ b/client/packages/lowcoder-cli/package.json
@@ -29,8 +29,8 @@
     "commander": "^9.4.1",
     "cross-spawn": "^7.0.3",
     "fs-extra": "^10.1.0",
-    "react": "^17",
-    "react-dom": "^17",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-json-view": "^1.21.3",
     "rollup-plugin-external-globals": "^0.7.1",
     "vite": "^4.3.9",
diff --git a/client/packages/lowcoder-comps/index.tsx b/client/packages/lowcoder-comps/index.tsx
index b446b08b82..a424ca6bdb 100644
--- a/client/packages/lowcoder-comps/index.tsx
+++ b/client/packages/lowcoder-comps/index.tsx
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { CompIDE } from "lowcoder-sdk";
 import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
   );
 }
 
-ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
+const container = document.querySelector("#root");
+const root = createRoot(container!);
+root.render(<CompDevApp />);
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
index 62712754bf..b054a2df77 100644
--- a/client/packages/lowcoder-comps/package.json
+++ b/client/packages/lowcoder-comps/package.json
@@ -11,16 +11,16 @@
     "@fullcalendar/moment": "^6.1.6",
     "@fullcalendar/react": "^6.1.6",
     "@fullcalendar/timegrid": "^6.1.6",
-    "@types/react": "17",
-    "@types/react-dom": "17",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.18",
     "big.js": "^6.2.1",
     "echarts-extension-gmap": "^1.6.0",
     "echarts-wordcloud": "^2.1.0",
     "lowcoder-cli": "workspace:^",
     "lowcoder-sdk": "workspace:^",
     "mermaid": "^10.6.1",
-    "react": "17",
-    "react-dom": "17",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "typescript": "4.8.4"
   },
   "lowcoder": {
diff --git a/client/packages/lowcoder-core/lib/index.d.ts b/client/packages/lowcoder-core/lib/index.d.ts
index 80c95aa33e..da0b0a4aec 100644
--- a/client/packages/lowcoder-core/lib/index.d.ts
+++ b/client/packages/lowcoder-core/lib/index.d.ts
@@ -664,7 +664,7 @@ declare class Translator<Messages extends object> {
     readonly language: string;
     constructor(fileData: object, filterLocales?: string, locales?: string[]);
     trans(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): string;
-    transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): {};
+    transToNode(key: NestedKey<Messages> | GlobalMessageKey, variables?: Record<string, VariableValue>): ReactNode;
     private getMessage;
 }
 declare function getI18nObjects<I18nObjects>(fileData: object, filterLocales?: string): I18nObjects;
diff --git a/client/packages/lowcoder-design/src/components/CustomModal.tsx b/client/packages/lowcoder-design/src/components/CustomModal.tsx
index 9b13d8b431..54bb8389aa 100644
--- a/client/packages/lowcoder-design/src/components/CustomModal.tsx
+++ b/client/packages/lowcoder-design/src/components/CustomModal.tsx
@@ -218,24 +218,26 @@ function CustomModalRender(props: CustomModalProps & ModalFuncProps) {
   return (
     <Draggable handle=".handle" disabled={!props.draggable}>
       <ModalWrapper width={props.width}>
-        <ModalHeaderWrapper className="handle" $draggable={props.draggable}>
-          <ModalHeader
-            title={props.title}
-            onCancel={props.onCancel}
-            showBackLink={props.showBackLink}
-            onBack={props.onBack}
-          />
-        </ModalHeaderWrapper>
+        <>
+          <ModalHeaderWrapper className="handle" $draggable={props.draggable}>
+            <ModalHeader
+              title={props.title}
+              onCancel={props.onCancel}
+              showBackLink={props.showBackLink}
+              onBack={props.onBack}
+            />
+          </ModalHeaderWrapper>
 
-        <div style={{ padding: "0 16px", ...props.styles?.body }}>{props.children}</div>
+          <div style={{ padding: "0 16px", ...props.styles?.body }}>{props.children}</div>
 
-        {props.footer === null || props.footer ? (
-          props.footer
-        ) : (
-          <ModalFooterWrapper>
-            <ModalFooter {...props} />
-          </ModalFooterWrapper>
-        )}
+          {props.footer === null || props.footer ? (
+            props.footer
+          ) : (
+            <ModalFooterWrapper>
+              <ModalFooter {...props} />
+            </ModalFooterWrapper>
+          )}
+        </>
       </ModalWrapper>
     </Draggable>
   );
diff --git a/client/packages/lowcoder-design/src/components/toolTip.tsx b/client/packages/lowcoder-design/src/components/toolTip.tsx
index 6e7ea4eb66..892ea9d92e 100644
--- a/client/packages/lowcoder-design/src/components/toolTip.tsx
+++ b/client/packages/lowcoder-design/src/components/toolTip.tsx
@@ -180,7 +180,7 @@ function ToolTipLabel(
   return (
     <AntdTooltip
       color="#2c2c2c"
-      title={title && <TooltipTitleWrapper>{title}</TooltipTitleWrapper>}
+      title={title && <TooltipTitleWrapper><>{title}</></TooltipTitleWrapper>}
       overlayInnerStyle={{ maxWidth: "232px", whiteSpace: "break-spaces" }}
       arrow={{
         pointAtCenter: true
diff --git a/client/packages/lowcoder-plugin-demo/index.tsx b/client/packages/lowcoder-plugin-demo/index.tsx
index 682c73d4f4..3da32f80e7 100644
--- a/client/packages/lowcoder-plugin-demo/index.tsx
+++ b/client/packages/lowcoder-plugin-demo/index.tsx
@@ -1,4 +1,4 @@
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { CompIDE } from "lowcoder-sdk";
 import { name, version, lowcoder } from "./package.json";
 import compMap from "./src/index";
@@ -16,4 +16,6 @@ function CompDevApp() {
   );
 }
 
-ReactDOM.render(<CompDevApp />, document.querySelector("#root"));
+const container = document.querySelector("#root");
+const root = createRoot(container!);
+root.render(<CompDevApp />);
diff --git a/client/packages/lowcoder-plugin-demo/package.json b/client/packages/lowcoder-plugin-demo/package.json
index 5ed0e9d7e2..357c4dee8e 100644
--- a/client/packages/lowcoder-plugin-demo/package.json
+++ b/client/packages/lowcoder-plugin-demo/package.json
@@ -6,8 +6,8 @@
   "dependencies": {
     "lowcoder-core": "^0.0.1",
     "lowcoder-design": "^0.0.1",
-    "react": "17",
-    "react-dom": "17"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.com"
@@ -30,8 +30,8 @@
     "build": "lowcoder-cli build"
   },
   "devDependencies": {
-    "@types/react": "17",
-    "@types/react-dom": "17",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.18",
     "lowcoder-cli": "workspace:^",
     "lowcoder-sdk": "workspace:^",
     "typescript": "4.8.4",
diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json
index 039db169c3..00564e5800 100644
--- a/client/packages/lowcoder-sdk/package.json
+++ b/client/packages/lowcoder-sdk/package.json
@@ -48,8 +48,8 @@
     "vite-tsconfig-paths": "^3.6.0"
   },
   "peerDependencies": {
-    "react": ">=17",
-    "react-dom": ">=17"
+    "react": ">=18",
+    "react-dom": ">=18"
   },
   "keywords": [
     "lowcoder"
diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
index a460b45296..10c70a263a 100644
--- a/client/packages/lowcoder/package.json
+++ b/client/packages/lowcoder/package.json
@@ -30,8 +30,8 @@
     "@rjsf/validator-ajv8": "^5.10.0",
     "@types/lodash": "^4.14.194",
     "@types/node": "^16.7.13",
-    "@types/react": "^17.0.20",
-    "@types/react-dom": "^17.0.9",
+    "@types/react": "^18.2.45",
+    "@types/react-dom": "^18.2.18",
     "@types/react-signature-canvas": "^1.0.2",
     "@types/react-test-renderer": "^18.0.0",
     "@types/react-virtualized": "^9.21.21",
@@ -63,10 +63,10 @@
     "papaparse": "^5.3.2",
     "qrcode.react": "^3.1.0",
     "rc-trigger": "^5.3.1",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-colorful": "^5.5.1",
     "react-documents": "^1.2.1",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "react-draggable": "^4.4.4",
     "react-grid-layout": "^1.3.0",
     "react-helmet": "^6.1.0",
diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx
index e05cb576e3..6cfbb7735d 100644
--- a/client/packages/lowcoder/src/app.tsx
+++ b/client/packages/lowcoder/src/app.tsx
@@ -21,7 +21,7 @@ import {
   USER_AUTH_URL,
 } from "constants/routesURL";
 import React from "react";
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { Helmet } from "react-helmet";
 import { connect, Provider } from "react-redux";
 import { Redirect, Route, Router, Switch } from "react-router-dom";
@@ -187,10 +187,11 @@ const AppIndexWithProps = connect(mapStateToProps, mapDispatchToProps)(AppIndex)
 export function bootstrap() {
   initApp();
   loadComps();
-  ReactDOM.render(
+  const container = document.getElementById("root");
+  const root = createRoot(container!);
+  root.render(
     <Provider store={reduxStore}>
       <AppIndexWithProps />
-    </Provider>,
-    document.getElementById("root")
+    </Provider>
   );
 }
diff --git a/client/packages/lowcoder/src/appView/AppViewInstance.tsx b/client/packages/lowcoder/src/appView/AppViewInstance.tsx
index 2bbbfbc057..b9e8457bed 100644
--- a/client/packages/lowcoder/src/appView/AppViewInstance.tsx
+++ b/client/packages/lowcoder/src/appView/AppViewInstance.tsx
@@ -4,7 +4,7 @@ import { RootComp } from "comps/comps/rootComp";
 import { setGlobalSettings } from "comps/utils/globalSettings";
 import { sdkConfig } from "constants/sdkConfig";
 import _ from "lodash";
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import { StyleSheetManager } from "styled-components";
 import { ModuleDSL, ModuleDSLIoInput } from "types/dsl";
 import { AppView } from "./AppView";
@@ -137,7 +137,8 @@ export class AppViewInstance<I = any, O = any> {
 
   private async render() {
     const data = await this.dataPromise;
-    ReactDOM.render(
+    const root = createRoot(this.node);
+    root.render(
       <StyleSheetManager target={this.node as HTMLElement}>
         <AppView
           appId={this.appId}
@@ -147,8 +148,7 @@ export class AppViewInstance<I = any, O = any> {
           onCompChange={(comp) => this.handleCompChange(comp)}
           onModuleEventTriggered={(eventName) => this.emit("moduleEventTriggered", [eventName])}
         />
-      </StyleSheetManager>,
-      this.node
+      </StyleSheetManager>
     );
   }
 
diff --git a/client/packages/lowcoder/src/base/codeEditor/extensions/iconExtension.tsx b/client/packages/lowcoder/src/base/codeEditor/extensions/iconExtension.tsx
index ab1c3539d2..4982c0ec95 100644
--- a/client/packages/lowcoder/src/base/codeEditor/extensions/iconExtension.tsx
+++ b/client/packages/lowcoder/src/base/codeEditor/extensions/iconExtension.tsx
@@ -8,7 +8,7 @@ import {
   WidgetType,
 } from "@codemirror/view";
 import { useIcon } from "lowcoder-design";
-import ReactDOM from "react-dom";
+import { createRoot } from "react-dom/client";
 import styled from "styled-components";
 
 const IconContainer = styled.div`
@@ -47,7 +47,8 @@ class IconWidget extends WidgetType {
 
   toDOM() {
     let wrap = document.createElement("span");
-    ReactDOM.render(<IconElement value={this.value} />, wrap);
+    const root = createRoot(wrap);
+    root.render(<IconElement value={this.value} />);
     return wrap;
   }
 
diff --git a/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx b/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx
index cfb635157c..df858afcdd 100644
--- a/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx
+++ b/client/packages/lowcoder/src/comps/comps/containerBase/containerCompBuilder.tsx
@@ -12,6 +12,7 @@ import { NameGenerator } from "comps/utils";
 import { IContainer } from "./iContainer";
 import { SimpleContainerComp } from "./simpleContainerComp";
 import { CompTree, oldContainerParamsToNew } from "./utils";
+import { ReactNode } from "react";
 
 // type UiChildren<ChildrenCompMap extends Record<string, Comp<unknown>>> = ChildrenCompMap;
 
@@ -56,7 +57,7 @@ export class ContainerCompBuilder<
     }
     const newChildrenMap = containerChildren(this.childrenMap);
     const TmpComp = new UICompBuilder(newChildrenMap, (props, dispatch) => {
-      return this.viewFn(props as any, dispatch);
+      return this.viewFn(props as any, dispatch) as ReactNode;
     })
       .setPropertyViewFn(this.propertyViewFn as any)
       .build();
diff --git a/client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx b/client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx
index 81ae2efb7e..5d2cd30130 100644
--- a/client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx
+++ b/client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx
@@ -356,7 +356,9 @@ export function InnerGrid(props: ViewPropsWithSelect) {
 
   const dispatchPositionParamsTimerRef = useRef(0);
   const onResize = useCallback(
-    (width, height) => {
+    (width?: number, height?: number) => {
+      if(!width || !height) return;
+
       if (width !== positionParams.containerWidth) {
         const newPositionParams: PositionParams = {
           margin: [0, 0],
@@ -426,7 +428,10 @@ export function InnerGrid(props: ViewPropsWithSelect) {
   }, [props.items]);
 
   const clickItem = useCallback(
-    (e, name) => selectItem(e, name, canAddSelect, containerSelectNames, setSelectedNames),
+    (
+      e: React.MouseEvent<HTMLDivElement,
+      globalThis.MouseEvent>, name: string
+    ) => selectItem(e, name, canAddSelect, containerSelectNames, setSelectedNames),
     [canAddSelect, containerSelectNames, setSelectedNames]
   );
 
diff --git a/client/packages/lowcoder/src/comps/comps/customComp/customComp.tsx b/client/packages/lowcoder/src/comps/comps/customComp/customComp.tsx
index 85ebb19144..d35c916229 100644
--- a/client/packages/lowcoder/src/comps/comps/customComp/customComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/customComp/customComp.tsx
@@ -60,7 +60,8 @@ const defaultCode = `
   
   const ConnectedComponent = ${trans("customComp.sdkGlobalVarName")}.connect(MyCustomComponent);
   
-  const root = ReactDOM.createRoot(document.getElementById("root"));
+  const container = document.getElementById("root");
+  const root = createRoot(container);
   root.render(<ConnectedComponent />);
   
   </script>
diff --git a/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx b/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
index f8092a6eee..beb2c7b4a1 100644
--- a/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
+++ b/client/packages/lowcoder/src/comps/comps/formComp/createForm.tsx
@@ -421,7 +421,10 @@ const CustomEditText = (props: {
 
 const DragHandle = SortableHandle(() => <StyledDragIcon />);
 
-const SortableItem = SortableElement((props: { item: RowItem; form: FormInstance }) => {
+const SortableItem = SortableElement<{
+  item: RowItem,
+  form: FormInstance,
+}>((props: { item: RowItem; form: FormInstance }) => {
   const { item, form } = props;
   const { columnName, columnType, compItems } = item;
   const disabled = !Form.useWatch(["columns", columnName, "enabled"], form);
@@ -474,12 +477,22 @@ const SortableItem = SortableElement((props: { item: RowItem; form: FormInstance
   );
 });
 
-const SortableBody = SortableContainer((props: { items: RowItem[]; form: FormInstance }) => {
+const SortableBody = SortableContainer<{
+  items: RowItem[],
+  form: FormInstance,
+}>((props: { items: RowItem[]; form: FormInstance }) => {
   return (
     <DataBody>
       {props.items.map((t, index) => {
         // Use the column name as the key here to ensure that the useState is correct when dragging
-        return <SortableItem key={t.columnName} index={index} item={t} form={props.form} />;
+        return (
+          <SortableItem
+            key={t.columnName}
+            index={index}
+            item={t}
+            form={props.form} 
+          />
+        );
       })}
     </DataBody>
   );
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx
index 07d7e5fc60..a7cb00b248 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/selectionControl.tsx
@@ -83,7 +83,7 @@ export const SelectionControl = (function () {
         selectedRowKeys: props.selectedRowKeys,
         preserveSelectedRowKeys: true,
         onChange: (selectedRowKeys) => {
-          dispatch(changeChildAction("selectedRowKeys", selectedRowKeys, false));
+          dispatch(changeChildAction("selectedRowKeys", selectedRowKeys as string[], false));
           onEvent("rowSelectChange");
         },
         // click checkbox also trigger row click event
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
index e9ceb6d95b..38603b81b8 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
@@ -2,7 +2,7 @@ import { Table } from "antd";
 import { TableProps } from "antd/es/table";
 import { TableCellContext, TableRowContext } from "comps/comps/tableComp/tableContext";
 import { TableToolbar } from "comps/comps/tableComp/tableToolbarComp";
-import { RowColorViewType, RowHeightViewType } from "comps/comps/tableComp/tableTypes";
+import { RowColorViewType, RowHeightViewType, TableEventOptionValues } from "comps/comps/tableComp/tableTypes";
 import {
   COL_MIN_WIDTH,
   COLUMN_CHILDREN_KEY,
@@ -584,11 +584,19 @@ function ResizeableTable<RecordType extends object>(props: CustomTableProps<Reco
         width: resizeWidth,
         title: col.titleText,
         viewModeResizable: props.viewModeResizable,
-        onResize: (width: number) => {
+        // onResize: (width: number) => {
+        //   if (width) {
+        //     setResizeData({
+        //       index: index,
+        //       width: width,
+        //     });
+        //   }
+        // },
+        onResize: (width: React.SyntheticEvent) => {
           if (width) {
             setResizeData({
               index: index,
-              width: width,
+              width: width as unknown as number,
             });
           }
         },
@@ -714,7 +722,7 @@ export function TableCompView(props: {
   }, [pagination, data]);
 
   const handleChangeEvent = useCallback(
-    (eventName) => {
+    (eventName: TableEventOptionValues) => {
       if (eventName === "saveChanges" && !compChildren.onEvent.isBind(eventName)) {
         !viewMode && messageInstance.warning(trans("table.saveChangesNotBind"));
         return;
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx
index 4eb2331d5a..58d0b4974d 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/tableTypes.tsx
@@ -100,6 +100,8 @@ export const TableEventOptions = [
   },
 ] as const;
 
+export type TableEventOptionValues = typeof TableEventOptions[number]['value'];
+
 export type SortValue = {
   column?: string;
   desc?: boolean;
diff --git a/client/packages/lowcoder/src/comps/comps/treeComp/treeComp.tsx b/client/packages/lowcoder/src/comps/comps/treeComp/treeComp.tsx
index 04db8fcc65..ccd5b46715 100644
--- a/client/packages/lowcoder/src/comps/comps/treeComp/treeComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/treeComp/treeComp.tsx
@@ -122,15 +122,15 @@ const TreeCompView = (props: RecordConstructorToView<typeof childrenMap>) => {
             expandedKeys={expanded.value}
             autoExpandParent={props.autoExpandParent}
             onSelect={(keys) => {
-              value.onChange(keys);
+              value.onChange(keys as (string | number)[]);
               props.onEvent("change");
             }}
             onCheck={(keys) => {
-              value.onChange(Array.isArray(keys) ? keys : keys.checked);
+              value.onChange(Array.isArray(keys) ? keys as (string | number)[] : keys.checked as (string | number)[]);
               props.onEvent("change");
             }}
             onExpand={(keys) => {
-              expanded.onChange(keys);
+              expanded.onChange(keys as (string | number)[]);
             }}
             onFocus={() => props.onEvent("focus")}
             onBlur={() => props.onEvent("blur")}
diff --git a/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx b/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx
index 69cba0946e..e154131bba 100644
--- a/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/treeComp/treeSelectComp.tsx
@@ -115,7 +115,7 @@ const TreeCompView = (
         // fix expand issue when searching
         treeExpandedKeys={inputValue ? undefined : expanded.value}
         onTreeExpand={(keys) => {
-          expanded.onChange(keys);
+          expanded.onChange(keys as (string | number)[]);
         }}
         onChange={(keys) => {
           const nextValue = Array.isArray(keys) ? keys : keys !== undefined ? [keys] : [];
diff --git a/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx b/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx
index cb0ed48b95..8a3a9346c9 100644
--- a/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx
+++ b/client/packages/lowcoder/src/comps/comps/triContainerComp/triContainerCompBuilder.tsx
@@ -12,6 +12,7 @@ import { NameGenerator } from "comps/utils";
 import { CompTree, IContainer } from "../containerBase";
 import { SimpleContainerComp } from "../containerBase/simpleContainerComp";
 import { TriContainerComp } from "./triContainerComp";
+import { ReactNode } from "react";
 
 export type ContainerChildren<ChildrenCompMap extends Record<string, Comp<unknown>>> =
   UiChildren<ChildrenCompMap> & {
@@ -56,7 +57,7 @@ export class ContainerCompBuilder<
     }
     const newChildrenMap = containerChildren(this.childrenMap);
     const TmpComp = new UICompBuilder(newChildrenMap, (props, dispatch) => {
-      return this.viewFn(props as any, dispatch);
+      return this.viewFn(props as any, dispatch) as ReactNode;
     })
       .setPropertyViewFn(this.propertyViewFn as any)
       .build();
diff --git a/client/packages/lowcoder/src/comps/generators/multi.tsx b/client/packages/lowcoder/src/comps/generators/multi.tsx
index 02a2e49b31..ff8c914221 100644
--- a/client/packages/lowcoder/src/comps/generators/multi.tsx
+++ b/client/packages/lowcoder/src/comps/generators/multi.tsx
@@ -158,7 +158,7 @@ export function childrenToProps<ChildrenCompMap extends Record<string, Comp<unkn
 export function simpleMultiComp<ChildrenCompMap extends Record<string, Comp<unknown>>>(
   childrenMap: ToConstructor<ChildrenCompMap>
 ) {
-  return new MultiCompBuilder(childrenMap, () => null as ReactNode)
+  return new MultiCompBuilder(childrenMap, () => null as any)
     .setPropertyViewFn(() => <></>)
     .build();
 }
diff --git a/client/packages/lowcoder/src/comps/hooks/messageComp.ts b/client/packages/lowcoder/src/comps/hooks/messageComp.ts
index e41f6d54b1..e0e6451cbb 100644
--- a/client/packages/lowcoder/src/comps/hooks/messageComp.ts
+++ b/client/packages/lowcoder/src/comps/hooks/messageComp.ts
@@ -15,7 +15,7 @@ const showMessage = (params: EvalParamType[], level: "info" | "success" | "warni
   const text = params?.[0];
   const options = params?.[1] as JSONObject;
   const duration = options?.["duration"] ?? 3;
-  text && messageInstance[level](text, duration as number);
+  text && messageInstance[level](text as any, duration as number);
 };
 
 const MessageCompBase = simpleMultiComp({});
diff --git a/client/packages/lowcoder/src/comps/queries/esQuery.tsx b/client/packages/lowcoder/src/comps/queries/esQuery.tsx
index 9222231bd6..de933e46dd 100644
--- a/client/packages/lowcoder/src/comps/queries/esQuery.tsx
+++ b/client/packages/lowcoder/src/comps/queries/esQuery.tsx
@@ -255,7 +255,9 @@ const EsQueryPropertyView = (props: {
             {children.esMethod.getView() === "RAW" ? (
               children.path.propertyView({})
             ) : (
-              <ReadOnlyField>{children.path.toJsonValue()}</ReadOnlyField>
+              <ReadOnlyField>
+                <>{children.path.toJsonValue()}</>
+              </ReadOnlyField>
             )}
           </InputField>
 
diff --git a/client/packages/lowcoder/src/comps/queries/httpQuery/streamQuery.tsx b/client/packages/lowcoder/src/comps/queries/httpQuery/streamQuery.tsx
index 62d4ef5334..04ceacb846 100644
--- a/client/packages/lowcoder/src/comps/queries/httpQuery/streamQuery.tsx
+++ b/client/packages/lowcoder/src/comps/queries/httpQuery/streamQuery.tsx
@@ -68,7 +68,7 @@ StreamTmpQuery = withMethodExposing(StreamTmpQuery, [
     },
     execute: (comp, params) => {
       return new Promise((resolve, reject) => {
-        const tmpComp = (comp as StreamQuery);
+        const tmpComp = (comp as unknown as StreamQuery);
         if(!tmpComp.getSocket()) {
           return reject('Socket message send failed')
         }
diff --git a/client/packages/lowcoder/src/debug.tsx b/client/packages/lowcoder/src/debug.tsx
index 792fe24ccc..1ef51485fd 100644
--- a/client/packages/lowcoder/src/debug.tsx
+++ b/client/packages/lowcoder/src/debug.tsx
@@ -101,9 +101,11 @@ const DebugComp = withViewFn(simpleMultiComp(childrenMap), (debugComp) => {
         </Menu>
       </Layout.Sider>
       <Layout.Content>
-        <div>CANVAS:</div>
-        {comp && comp.getView()}
-        {compDataToString(comp)}
+        <>
+          <div>CANVAS:</div>
+          {comp && comp.getView()}
+          {compDataToString(comp)}
+        </>
       </Layout.Content>
       <Layout.Sider theme="light" width={300}>
         <div>PROPERTY PANE:</div>
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
index ed02f6cdf6..21ceba6402 100644
--- a/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
+++ b/client/packages/lowcoder/src/pages/ApplicationV2/index.tsx
@@ -291,8 +291,8 @@ export default function ApplicationHome() {
       const path = FOLDER_URL_PREFIX + `/${folder.folderId}`;
       return {
         onSelected: (_, currentPath) => currentPath === path,
-        text: (props: { selected: boolean }) => (
-          <FolderNameWrapper selected={props.selected}>
+        text: (props: { selected?: boolean }) => (
+          <FolderNameWrapper selected={Boolean(props.selected)}>
             <FolderName name={folder.name} id={folder.folderId} />
           </FolderNameWrapper>
         ),
@@ -309,8 +309,8 @@ export default function ApplicationHome() {
     folderItems = [
       ...folderItems,
       {
-        text: (props: { selected: boolean }) => (
-          <MoreFoldersWrapper selected={props.selected}>{trans("more")}</MoreFoldersWrapper>
+        text: (props: { selected?: boolean }) => (
+          <MoreFoldersWrapper selected={Boolean(props.selected)}>{trans("more")}</MoreFoldersWrapper>
         ),
         routePath: FOLDERS_URL,
         routeComp: RootFolderListView,
diff --git a/client/packages/lowcoder/src/pages/datasource/datasourceEditPage.tsx b/client/packages/lowcoder/src/pages/datasource/datasourceEditPage.tsx
index 28416c0524..29f00bc891 100644
--- a/client/packages/lowcoder/src/pages/datasource/datasourceEditPage.tsx
+++ b/client/packages/lowcoder/src/pages/datasource/datasourceEditPage.tsx
@@ -176,7 +176,7 @@ export const DatasourceEditPage = () => {
   const { testLoading, createLoading, form, genRequest, resolveTest, resolveCreate } =
     useDatasourceForm();
 
-  const handleFormReadyStatusChange = useCallback((isReady) => {
+  const handleFormReadyStatusChange = useCallback((isReady: boolean) => {
     setIsReady(isReady);
   }, []);
 
diff --git a/client/packages/lowcoder/src/pages/editor/LeftContent.tsx b/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
index 179e2b293f..7772a52738 100644
--- a/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
+++ b/client/packages/lowcoder/src/pages/editor/LeftContent.tsx
@@ -240,7 +240,7 @@ const LeftContentWrapper = styled.div`
 export const LeftContent = (props: LeftContentProps) => {
   const { uiComp } = props;
   const editorState = useContext(EditorContext);
-  const [expandedKeys, setExpandedKeys] = useState<Array<string | number>>([]);
+  const [expandedKeys, setExpandedKeys] = useState<Array<React.Key>>([]);
   const [showData, setShowData] = useState<NodeInfo[]>([]);
 
   const getTree = (tree: CompTree, result: NodeItem[], key?: string) => {
@@ -434,9 +434,13 @@ export const LeftContent = (props: LeftContentProps) => {
     return (
       <DirectoryTreeStyle
         treeData={explorerData}
-        icon={(props: NodeItem) => props.type && (CompStateIcon[props.type] || <LeftCommon />)}
-        switcherIcon={({ expanded }: { expanded: boolean }) =>
-          expanded ? <FoldedIcon /> : <UnfoldIcon />
+        // icon={(props: NodeItem) => props.type && (CompStateIcon[props.type] || <LeftCommon />)}
+        icon={(props: any) => props.type && (CompStateIcon[props.type as UICompType] || <LeftCommon />)}
+        // switcherIcon={({ expanded }: { expanded: boolean }) =>
+        //   expanded ? <FoldedIcon /> : <UnfoldIcon />
+        // }
+        switcherIcon={(props: any) =>
+          props.expanded ? <FoldedIcon /> : <UnfoldIcon />
         }
         expandedKeys={expandedKeys}
         onExpand={(keys) => setExpandedKeys(keys)}
diff --git a/client/packages/lowcoder/src/pages/editor/bottom/BottomMetaDrawer.tsx b/client/packages/lowcoder/src/pages/editor/bottom/BottomMetaDrawer.tsx
index f6940e8d71..126c9a4867 100644
--- a/client/packages/lowcoder/src/pages/editor/bottom/BottomMetaDrawer.tsx
+++ b/client/packages/lowcoder/src/pages/editor/bottom/BottomMetaDrawer.tsx
@@ -140,7 +140,7 @@ export const DataSourceStructureTree = (props: {
   datasourceType: string;
 }) => {
   const { dataSourceId, datasourceType } = props;
-  const [expandedKeys, setExpandedKeys] = useState<Array<string | number>>([]);
+  const [expandedKeys, setExpandedKeys] = useState<Array<React.Key>>([]);
   const [searchValue, setSearchValue] = useState("");
   const [structure, setStructure] = useState<DataNode[]>([]);
 
diff --git a/client/packages/lowcoder/src/pages/editor/styledComponents.tsx b/client/packages/lowcoder/src/pages/editor/styledComponents.tsx
index cfabd6f83f..8ce1bb9f4a 100644
--- a/client/packages/lowcoder/src/pages/editor/styledComponents.tsx
+++ b/client/packages/lowcoder/src/pages/editor/styledComponents.tsx
@@ -1,7 +1,7 @@
-import { Tree } from "antd";
+import DirectoryTree from "antd/es/tree/DirectoryTree";
 import styled from "styled-components";
 
-export const DirectoryTreeStyle = styled(Tree.DirectoryTree)`
+export const DirectoryTreeStyle = styled(DirectoryTree)`
   font-size: 13px;
   color: #333;
   .ant-tree-treenode {
diff --git a/client/packages/lowcoder/src/pages/setting/idSource/detail/index.tsx b/client/packages/lowcoder/src/pages/setting/idSource/detail/index.tsx
index 80b3fd2447..1bdaa5d34d 100644
--- a/client/packages/lowcoder/src/pages/setting/idSource/detail/index.tsx
+++ b/client/packages/lowcoder/src/pages/setting/idSource/detail/index.tsx
@@ -157,7 +157,7 @@ export const IdSourceDetail = (props: IdSourceDetailProps) => {
             required = valueObject ? valueObject.isRequire ?? required : required;
             const hasLock = valueObject && valueObject?.hasLock;
             const tip = valueObject && valueObject.tip;
-            const label = valueObject ? valueObject.label : value;
+            const label = valueObject ? valueObject.label : value as string;
             const isList = valueObject && valueObject.isList;
             const isPassword = valueObject && valueObject.isPassword;
             return (
diff --git a/client/packages/lowcoder/src/redux/sagas/commonSettingsSagas.ts b/client/packages/lowcoder/src/redux/sagas/commonSettingsSagas.ts
index 0dccd048b3..8d2574a8f6 100644
--- a/client/packages/lowcoder/src/redux/sagas/commonSettingsSagas.ts
+++ b/client/packages/lowcoder/src/redux/sagas/commonSettingsSagas.ts
@@ -28,7 +28,11 @@ export function* fetchCommonSettingsSaga(action: ReduxAction<FetchCommonSettingP
       });
     }
   } catch (error) {
-    messageInstance.error(error instanceof Error ? error.message : error);
+    messageInstance.error(
+      error instanceof Error
+        ? (error.message) as string
+        : error as string
+    );
     log.debug("fetch event type error: ", error);
   }
 }
@@ -50,7 +54,11 @@ export function* setCommonSettingsSaga(action: ReduxAction<SetCommonSettingPaylo
       });
     }
   } catch (error) {
-    messageInstance.error(error instanceof Error ? error.message : error);
+    messageInstance.error(
+      error instanceof Error
+        ? (error.message) as string
+        : error as string
+    );
     log.debug("fetch event type error: ", error);
   }
 }
diff --git a/client/packages/lowcoder/src/redux/sagas/userSagas.ts b/client/packages/lowcoder/src/redux/sagas/userSagas.ts
index 7a78622cd5..46657b9f1e 100644
--- a/client/packages/lowcoder/src/redux/sagas/userSagas.ts
+++ b/client/packages/lowcoder/src/redux/sagas/userSagas.ts
@@ -109,7 +109,11 @@ export function* getRawCurrentUserSaga() {
       });
     }
   } catch (error: any) {
-    messageInstance.error(error instanceof Error ? error.message : error);
+    messageInstance.error(
+      error instanceof Error
+        ? (error.message) as string
+        : error as string
+    );
     log.error("getRawCurrentUser error:", error);
   }
 }
diff --git a/client/packages/lowcoder/src/util/cacheUtils.ts b/client/packages/lowcoder/src/util/cacheUtils.ts
index f098b817d1..667217abe7 100644
--- a/client/packages/lowcoder/src/util/cacheUtils.ts
+++ b/client/packages/lowcoder/src/util/cacheUtils.ts
@@ -27,7 +27,7 @@ export function memo(target: any, propertyKey: string, descriptor: PropertyDescr
  */
 export const profilerCallback = (
   id: string,
-  phase: "mount" | "update",
+  phase: "mount" | "update" | "nested-update",
   actualDuration: number,
   baseDuration: number,
   startTime: number,
diff --git a/client/packages/lowcoder/src/util/hotkeys.tsx b/client/packages/lowcoder/src/util/hotkeys.tsx
index 058793b673..12262c9f53 100644
--- a/client/packages/lowcoder/src/util/hotkeys.tsx
+++ b/client/packages/lowcoder/src/util/hotkeys.tsx
@@ -21,6 +21,7 @@ export interface IReactHotkeysProps {
   splitKey?: string;
   global?: boolean;
   wrapperStyle?: CSSProperties;
+  children?: React.ReactNode;
 }
 
 export default class ReactHotkeys extends React.Component<
diff --git a/client/packages/lowcoder/src/util/keyUtils.tsx b/client/packages/lowcoder/src/util/keyUtils.tsx
index 22f477f467..8d506843c7 100644
--- a/client/packages/lowcoder/src/util/keyUtils.tsx
+++ b/client/packages/lowcoder/src/util/keyUtils.tsx
@@ -203,6 +203,7 @@ export function ShortcutsWrapper(props: HTMLAttributes<HTMLDivElement> & { disab
 
 type GlobalWrapperProps = {
   disabled?: boolean;
+  children?: React.ReactNode;
   onKeyDownCapture?: (e: KeyboardEvent) => void;
   onKeyUpCapture?: (e: KeyboardEvent) => void;
   onMouseMoveCapture?: (e: MouseEvent) => void;
diff --git a/client/yarn.lock b/client/yarn.lock
index d7c259ac06..a322d1b062 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4045,12 +4045,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:17, @types/react-dom@npm:^17.0.9":
-  version: 17.0.25
-  resolution: "@types/react-dom@npm:17.0.25"
+"@types/react-dom@npm:^18.2.18":
+  version: 18.2.18
+  resolution: "@types/react-dom@npm:18.2.18"
   dependencies:
-    "@types/react": ^17
-  checksum: d1e582682478e0848c8d54ea3e89d02047bac6d916266b85ce63731b06987575919653ea7159d98fda47ade3362b8c4d5796831549564b83088e7aa9ce8b60ed
+    "@types/react": "*"
+  checksum: 8e3da404c980e2b2a76da3852f812ea6d8b9d0e7f5923fbaf3bfbbbfa1d59116ff91c129de8f68e9b7668a67ae34484fe9df74d5a7518cf8591ec07a0c4dad57
   languageName: node
   linkType: hard
 
@@ -4143,14 +4143,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^17":
-  version: 17.0.73
-  resolution: "@types/react@npm:17.0.73"
+"@types/react@npm:^18":
+  version: 18.2.45
+  resolution: "@types/react@npm:18.2.45"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 08107645acdd734c8ddb4d26f1b43dfa0d75f7a8d268eaacb897337e103eaa620fe8c3c6972dab9860aaa47bbee1da587cf06b11bb4e655588e38485daf48a6c
+  checksum: 40b256bdce67b026348022b4f8616a693afdad88cf493b77f7b4e6c5f4b0e4ba13a6068e690b9b94572920840ff30d501ea3d8518e1f21cc8fb8204d4b140c8a
   languageName: node
   linkType: hard
 
@@ -11313,8 +11313,8 @@ __metadata:
     commander: ^9.4.1
     cross-spawn: ^7.0.3
     fs-extra: ^10.1.0
-    react: ^17
-    react-dom: ^17
+    react: ^18.2.0
+    react-dom: ^18.2.0
     react-json-view: ^1.21.3
     rollup-plugin-external-globals: ^0.7.1
     typescript: ^4.8.4
@@ -11339,8 +11339,8 @@ __metadata:
     "@fullcalendar/moment": ^6.1.6
     "@fullcalendar/react": ^6.1.6
     "@fullcalendar/timegrid": ^6.1.6
-    "@types/react": 17
-    "@types/react-dom": 17
+    "@types/react": ^18.2.45
+    "@types/react-dom": ^18.2.18
     big.js: ^6.2.1
     echarts-extension-gmap: ^1.6.0
     echarts-wordcloud: ^2.1.0
@@ -11348,8 +11348,8 @@ __metadata:
     lowcoder-cli: "workspace:^"
     lowcoder-sdk: "workspace:^"
     mermaid: ^10.6.1
-    react: 17
-    react-dom: 17
+    react: ^18.2.0
+    react-dom: ^18.2.0
     typescript: 4.8.4
     vite: ^4.3.9
     vite-tsconfig-paths: ^3.6.0
@@ -11415,14 +11415,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "lowcoder-plugin-demo@workspace:packages/lowcoder-plugin-demo"
   dependencies:
-    "@types/react": 17
-    "@types/react-dom": 17
+    "@types/react": ^18.2.45
+    "@types/react-dom": ^18.2.18
     lowcoder-cli: "workspace:^"
     lowcoder-core: ^0.0.1
     lowcoder-design: ^0.0.1
     lowcoder-sdk: "workspace:^"
-    react: 17
-    react-dom: 17
+    react: ^18.2.0
+    react-dom: ^18.2.0
     typescript: 4.8.4
     vite: ^4.3.9
   languageName: unknown
@@ -11500,8 +11500,8 @@ __metadata:
     vite-plugin-svgr: ^2.2.2
     vite-tsconfig-paths: ^3.6.0
   peerDependencies:
-    react: ">=17"
-    react-dom: ">=17"
+    react: ">=18"
+    react-dom: ">=18"
   languageName: unknown
   linkType: soft
 
@@ -11536,8 +11536,8 @@ __metadata:
     "@types/lodash": ^4.14.194
     "@types/node": ^16.7.13
     "@types/papaparse": ^5.3.5
-    "@types/react": ^17.0.20
-    "@types/react-dom": ^17.0.9
+    "@types/react": ^18.2.45
+    "@types/react-dom": ^18.2.18
     "@types/react-signature-canvas": ^1.0.2
     "@types/react-test-renderer": ^18.0.0
     "@types/react-virtualized": ^9.21.21
@@ -11577,10 +11577,10 @@ __metadata:
     papaparse: ^5.3.2
     qrcode.react: ^3.1.0
     rc-trigger: ^5.3.1
-    react: ^17.0.2
+    react: ^18.2.0
     react-colorful: ^5.5.1
     react-documents: ^1.2.1
-    react-dom: ^17.0.2
+    react-dom: ^18.2.0
     react-draggable: ^4.4.4
     react-grid-layout: ^1.3.0
     react-helmet: ^6.1.0
@@ -14273,16 +14273,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:17, react-dom@npm:^17, react-dom@npm:^17.0.2":
-  version: 17.0.2
-  resolution: "react-dom@npm:17.0.2"
+"react-dom@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react-dom@npm:18.2.0"
   dependencies:
     loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-    scheduler: ^0.20.2
+    scheduler: ^0.23.0
   peerDependencies:
-    react: 17.0.2
-  checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c
+    react: ^18.2.0
+  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
   languageName: node
   linkType: hard
 
@@ -14752,13 +14751,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react@npm:17, react@npm:^17, react@npm:^17.0.2":
-  version: 17.0.2
-  resolution: "react@npm:17.0.2"
+"react@npm:^18.2.0":
+  version: 18.2.0
+  resolution: "react@npm:18.2.0"
   dependencies:
     loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b
+  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
   languageName: node
   linkType: hard
 
@@ -15575,16 +15573,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "scheduler@npm:0.20.2"
-  dependencies:
-    loose-envify: ^1.1.0
-    object-assign: ^4.1.1
-  checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc
-  languageName: node
-  linkType: hard
-
 "scheduler@npm:^0.23.0":
   version: 0.23.0
   resolution: "scheduler@npm:0.23.0"
