From 0a5520d716e8efe80e8becf8d91307b6deaeeead Mon Sep 17 00:00:00 2001 From: qfl <790872612@qq.com> Date: Wed, 15 May 2024 14:28:51 +0800 Subject: [PATCH] support code submit and i18n for graph (#60) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * support code submit for graph * add i18n for flow-graph --------- Co-authored-by: 乔风鳞 --- flow-graph/index.html | 5 + flow-graph/pnpm-lock.yaml | 704 +- flow-graph/src/common/flowService.ts | 66 +- .../src/common/graphCellRenderService.ts | 7 +- .../src/common/inputSchemaStyleHandler.ts | 237 + flow-graph/src/common/outputToTree.ts | 4 +- .../src/common/replaceJsonSchemaConfig.ts | 34 +- flow-graph/src/common/transform.ts | 19 +- flow-graph/src/components/NodesBar/index.vue | 11 +- .../components/ToolBar/DagExecutionModal.vue | 34 +- .../src/components/ToolBar/DagTestRun.vue | 57 +- .../src/components/ToolBar/EditDagMeta.vue | 20 +- flow-graph/src/components/ToolBar/SaveDag.vue | 10 +- flow-graph/src/components/ToolBar/ShowDag.vue | 4 +- flow-graph/src/components/ToolBar/data.ts | 142 +- flow-graph/src/components/ToolBar/index.vue | 37 +- .../src/components/Widget/CodeEditWidget.vue | 34 + .../components/modals/NodeDefinitionModal.vue | 217 +- .../components/modals/NodeExecutionModal.vue | 48 +- flow-graph/src/components/modals/nodeModal.ts | 35 - .../src/components/shape/NodeTemplate.vue | 1 - flow-graph/src/locales/i18n.ts | 16 + flow-graph/src/locales/index.ts | 7 + flow-graph/src/locales/lang/en.ts | 109 + flow-graph/src/locales/lang/zh-CN.ts | 109 + flow-graph/src/main.ts | 4 +- flow-graph/src/models/X6FlowGraph.ts | 53 +- .../src/models/enums/InputSchemaTypeEnum.ts | 8 + flow-graph/src/models/enums/flowApiEnum.ts | 2 +- flow-graph/src/models/enums/nodeCategory.ts | 6 +- flow-graph/src/models/flowGraph.ts | 6 +- flow-graph/src/models/task/baseTask.ts | 1 + .../src/store/modules/flowGraphStore.ts | 10 + flow-graph/src/store/modules/i18nStore.ts | 26 + .../core/model/task/ChoiceTask.java | 3 +- .../core/model/task/ForeachTask.java | 3 +- .../olympicene/core/model/task/PassTask.java | 3 +- .../core/model/task/ReturnTask.java | 3 +- .../core/model/task/SuspenseTask.java | 3 +- .../core/helper/DAGWalkHelperTest.groovy | 2 +- .../resources/metadata/fields/foreach.json | 6 + .../resources/metadata/fields/function.json | 6 + .../main/resources/metadata/fields/pass.json | 6 + .../resources/metadata/fields/return.json | 6 + .../resources/metadata/fields/suspense.json | 6 + .../flow/interfaces/model/task/BaseTask.java | 1 + .../interfaces/model/task/FunctionTask.java | 3 +- rill-flow-ui/pnpm-lock.yaml | 20684 +++++++--------- .../default/header/components/Github.vue | 9 +- .../flow-definition/node-templetes/index.vue | 4 +- .../node-templetes/tableData.tsx | 4 +- rill-flow-ui/src/views/micro/SubContainer.vue | 2 + .../src/main/resources/application.properties | 2 +- 53 files changed, 10641 insertions(+), 12198 deletions(-) create mode 100644 flow-graph/src/common/inputSchemaStyleHandler.ts create mode 100644 flow-graph/src/components/Widget/CodeEditWidget.vue delete mode 100644 flow-graph/src/components/modals/nodeModal.ts create mode 100644 flow-graph/src/locales/i18n.ts create mode 100644 flow-graph/src/locales/index.ts create mode 100644 flow-graph/src/locales/lang/en.ts create mode 100644 flow-graph/src/locales/lang/zh-CN.ts create mode 100644 flow-graph/src/models/enums/InputSchemaTypeEnum.ts create mode 100644 flow-graph/src/store/modules/i18nStore.ts diff --git a/flow-graph/index.html b/flow-graph/index.html index 7414fc15a..b68c3774e 100644 --- a/flow-graph/index.html +++ b/flow-graph/index.html @@ -5,6 +5,11 @@ FlowGraph +
diff --git a/flow-graph/pnpm-lock.yaml b/flow-graph/pnpm-lock.yaml index f397b8aff..c4dee43cd 100644 --- a/flow-graph/pnpm-lock.yaml +++ b/flow-graph/pnpm-lock.yaml @@ -1,9 +1,5 @@ lockfileVersion: '6.0' -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - dependencies: '@ant-design/icons-vue': specifier: ^6.1.0 @@ -37,7 +33,7 @@ dependencies: version: 3.2.20(vue@3.3.4) antd: specifier: ^4.23.5 - version: 4.23.5(react-dom@18.2.0)(react@18.2.0) + version: 4.23.5(react-dom@18.3.1)(react@18.3.1) axios: specifier: ^1.4.0 version: 1.4.0 @@ -147,7 +143,7 @@ packages: vue: 3.3.4 dev: false - /@ant-design/icons@4.8.3(react-dom@18.2.0)(react@18.2.0): + /@ant-design/icons@4.8.3(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-HGlIQZzrEbAhpJR6+IGdzfbPym94Owr6JZkJ2QCCnOkPVIWMO2xgIVcOKnl8YcpijIo39V7l2qQL5fmtw56cMw==} engines: {node: '>=8'} peerDependencies: @@ -156,24 +152,24 @@ packages: dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-svg': 4.4.2 - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 lodash: 4.17.21 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /@ant-design/react-slick@0.29.2(react@18.2.0): + /@ant-design/react-slick@0.29.2(react@18.3.1): resolution: {integrity: sha512-kgjtKmkGHa19FW21lHnAfyyH9AAoh35pBdcJ53rHmQ3O+cfFHGHnUbj/HFrRNJ5vIts09FKJVAD8RpaC+RaWfA==} peerDependencies: react: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 json2mq: 0.2.0 lodash: 4.17.21 - react: 18.2.0 + react: 18.3.1 resize-observer-polyfill: 1.5.1 dev: false @@ -261,7 +257,7 @@ packages: resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.24.2 + '@babel/highlight': 7.24.5 picocolors: 1.0.0 dev: false @@ -269,47 +265,47 @@ packages: resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.24.5 dev: false /@babel/helper-string-parser@7.24.1: resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} engines: {node: '>=6.9.0'} - /@babel/helper-validator-identifier@7.22.20: - resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} + /@babel/helper-validator-identifier@7.24.5: + resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} engines: {node: '>=6.9.0'} - /@babel/highlight@7.24.2: - resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} + /@babel/highlight@7.24.5: + resolution: {integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-validator-identifier': 7.24.5 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.0.0 dev: false - /@babel/parser@7.24.1: - resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==} + /@babel/parser@7.24.5: + resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.24.5 - /@babel/runtime@7.24.1: - resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} + /@babel/runtime@7.24.5: + resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.1 dev: false - /@babel/types@7.24.0: - resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} + /@babel/types@7.24.5: + resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.1 - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-validator-identifier': 7.24.5 to-fast-properties: 2.0.0 /@ctrl/tinycolor@3.6.1: @@ -536,20 +532,20 @@ packages: /@probe.gl/env@3.6.0: resolution: {integrity: sha512-4tTZYUg/8BICC3Yyb9rOeoKeijKbZHRXBEKObrfPmX4sQmYB15ZOUpoVBhAyJkOYVAM8EkPci6Uw5dLCwx2BEQ==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 dev: false /@probe.gl/log@3.6.0: resolution: {integrity: sha512-hjpyenpEvOdowgZ1qMeCJxfRD4JkKdlXz0RC14m42Un62NtOT+GpWyKA4LssT0+xyLULCByRAtG2fzZorpIAcA==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 '@probe.gl/env': 3.6.0 dev: false /@probe.gl/stats@3.6.0: resolution: {integrity: sha512-JdALQXB44OP4kUBN/UrQgzbJe4qokbVF4Y8lkIA8iVCFnjVowWIgkD/z/0QO65yELT54tTrtepw1jScjKB+rhQ==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 dev: false /@purge-icons/generated@0.9.0: @@ -561,7 +557,7 @@ packages: /@simonwep/pickr@1.8.2: resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==} dependencies: - core-js: 3.36.1 + core-js: 3.37.0 nanopop: 2.4.2 dev: false @@ -632,8 +628,8 @@ packages: vscode-languageserver: 8.1.0 dev: true - /@vscode/emmet-helper@2.9.2: - resolution: {integrity: sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==} + /@vscode/emmet-helper@2.9.3: + resolution: {integrity: sha512-rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==} dependencies: emmet: 2.4.7 jsonc-parser: 2.3.1 @@ -645,7 +641,7 @@ packages: /@vue/compiler-core@3.2.20: resolution: {integrity: sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/shared': 3.2.20 estree-walker: 2.0.2 source-map: 0.6.1 @@ -654,17 +650,17 @@ packages: /@vue/compiler-core@3.3.4: resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/shared': 3.3.4 estree-walker: 2.0.2 source-map-js: 1.2.0 dev: false - /@vue/compiler-core@3.4.21: - resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} + /@vue/compiler-core@3.4.27: + resolution: {integrity: sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==} dependencies: - '@babel/parser': 7.24.1 - '@vue/shared': 3.4.21 + '@babel/parser': 7.24.5 + '@vue/shared': 3.4.27 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.2.0 @@ -684,17 +680,17 @@ packages: '@vue/shared': 3.3.4 dev: false - /@vue/compiler-dom@3.4.21: - resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} + /@vue/compiler-dom@3.4.27: + resolution: {integrity: sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==} dependencies: - '@vue/compiler-core': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/compiler-core': 3.4.27 + '@vue/shared': 3.4.27 dev: true /@vue/compiler-sfc@3.2.20: resolution: {integrity: sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/compiler-core': 3.2.20 '@vue/compiler-dom': 3.2.20 '@vue/compiler-ssr': 3.2.20 @@ -709,14 +705,14 @@ packages: /@vue/compiler-sfc@3.3.4: resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/compiler-core': 3.3.4 '@vue/compiler-dom': 3.3.4 '@vue/compiler-ssr': 3.3.4 '@vue/reactivity-transform': 3.3.4 '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.30.8 + magic-string: 0.30.10 postcss: 8.4.38 source-map-js: 1.2.0 dev: false @@ -742,11 +738,11 @@ packages: /@vue/reactivity-transform@3.3.4: resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/compiler-core': 3.3.4 '@vue/shared': 3.3.4 estree-walker: 2.0.2 - magic-string: 0.30.8 + magic-string: 0.30.10 dev: false /@vue/reactivity@3.3.4: @@ -755,16 +751,16 @@ packages: '@vue/shared': 3.3.4 dev: false - /@vue/reactivity@3.4.21: - resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==} + /@vue/reactivity@3.4.27: + resolution: {integrity: sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==} dependencies: - '@vue/shared': 3.4.21 + '@vue/shared': 3.4.27 dev: true /@vue/ref-transform@3.2.20: resolution: {integrity: sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==} dependencies: - '@babel/parser': 7.24.1 + '@babel/parser': 7.24.5 '@vue/compiler-core': 3.2.20 '@vue/shared': 3.2.20 estree-walker: 2.0.2 @@ -804,8 +800,8 @@ packages: resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} dev: false - /@vue/shared@3.4.21: - resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} + /@vue/shared@3.4.27: + resolution: {integrity: sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==} dev: true /acorn@7.4.1: @@ -838,12 +834,12 @@ packages: dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-vue': 6.1.0(vue@3.3.4) - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 '@ctrl/tinycolor': 3.6.1 '@simonwep/pickr': 1.8.2 array-tree-filter: 2.1.0 async-validator: 4.2.5 - dayjs: 1.11.10 + dayjs: 1.11.11 dom-align: 1.12.4 dom-scroll-into-view: 2.0.1 lodash: 4.17.21 @@ -856,57 +852,57 @@ packages: warning: 4.0.3 dev: false - /antd@4.23.5(react-dom@18.2.0)(react@18.2.0): + /antd@4.23.5(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-AMea5NYoMeGvRxZ/rslGvRqaiuzBgQMpOdlQfNjOfMd+0ZGi+E4AiwXilR99muFOttPcr3ebeIsKiUS5p/cnig==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: '@ant-design/colors': 6.0.0 - '@ant-design/icons': 4.8.3(react-dom@18.2.0)(react@18.2.0) - '@ant-design/react-slick': 0.29.2(react@18.2.0) - '@babel/runtime': 7.24.1 + '@ant-design/icons': 4.8.3(react-dom@18.3.1)(react@18.3.1) + '@ant-design/react-slick': 0.29.2(react@18.3.1) + '@babel/runtime': 7.24.5 '@ctrl/tinycolor': 3.6.1 classnames: 2.5.1 copy-to-clipboard: 3.3.3 lodash: 4.17.21 memoize-one: 6.0.0 moment: 2.29.4 - rc-cascader: 3.7.3(react-dom@18.2.0)(react@18.2.0) - rc-checkbox: 2.3.2(react-dom@18.2.0)(react@18.2.0) - rc-collapse: 3.3.1(react-dom@18.2.0)(react@18.2.0) - rc-dialog: 8.9.0(react-dom@18.2.0)(react@18.2.0) - rc-drawer: 5.1.0(react-dom@18.2.0)(react@18.2.0) - rc-dropdown: 4.0.1(react-dom@18.2.0)(react@18.2.0) - rc-field-form: 1.27.4(react-dom@18.2.0)(react@18.2.0) - rc-image: 5.7.1(react-dom@18.2.0)(react@18.2.0) - rc-input: 0.1.4(react-dom@18.2.0)(react@18.2.0) - rc-input-number: 7.3.11(react-dom@18.2.0)(react@18.2.0) - rc-mentions: 1.10.0(react-dom@18.2.0)(react@18.2.0) - rc-menu: 9.6.4(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-notification: 4.6.1(react-dom@18.2.0)(react@18.2.0) - rc-pagination: 3.1.17(react-dom@18.2.0)(react@18.2.0) - rc-picker: 2.6.11(react-dom@18.2.0)(react@18.2.0) - rc-progress: 3.3.3(react-dom@18.2.0)(react@18.2.0) - rc-rate: 2.9.3(react-dom@18.2.0)(react@18.2.0) - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-segmented: 2.1.2(react-dom@18.2.0)(react@18.2.0) - rc-select: 14.1.18(react-dom@18.2.0)(react@18.2.0) - rc-slider: 10.0.1(react-dom@18.2.0)(react@18.2.0) - rc-steps: 4.1.4(react-dom@18.2.0)(react@18.2.0) - rc-switch: 3.2.2(react-dom@18.2.0)(react@18.2.0) - rc-table: 7.26.0(react-dom@18.2.0)(react@18.2.0) - rc-tabs: 12.1.0-alpha.1(react-dom@18.2.0)(react@18.2.0) - rc-textarea: 0.4.7(react-dom@18.2.0)(react@18.2.0) - rc-tooltip: 5.2.2(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.7.12(react-dom@18.2.0)(react@18.2.0) - rc-tree-select: 5.5.5(react-dom@18.2.0)(react@18.2.0) - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-upload: 4.3.6(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-cascader: 3.7.3(react-dom@18.3.1)(react@18.3.1) + rc-checkbox: 2.3.2(react-dom@18.3.1)(react@18.3.1) + rc-collapse: 3.3.1(react-dom@18.3.1)(react@18.3.1) + rc-dialog: 8.9.0(react-dom@18.3.1)(react@18.3.1) + rc-drawer: 5.1.0(react-dom@18.3.1)(react@18.3.1) + rc-dropdown: 4.0.1(react-dom@18.3.1)(react@18.3.1) + rc-field-form: 1.27.4(react-dom@18.3.1)(react@18.3.1) + rc-image: 5.7.1(react-dom@18.3.1)(react@18.3.1) + rc-input: 0.1.4(react-dom@18.3.1)(react@18.3.1) + rc-input-number: 7.3.11(react-dom@18.3.1)(react@18.3.1) + rc-mentions: 1.10.0(react-dom@18.3.1)(react@18.3.1) + rc-menu: 9.6.4(react-dom@18.3.1)(react@18.3.1) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-notification: 4.6.1(react-dom@18.3.1)(react@18.3.1) + rc-pagination: 3.1.17(react-dom@18.3.1)(react@18.3.1) + rc-picker: 2.6.11(react-dom@18.3.1)(react@18.3.1) + rc-progress: 3.3.3(react-dom@18.3.1)(react@18.3.1) + rc-rate: 2.9.3(react-dom@18.3.1)(react@18.3.1) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-segmented: 2.1.2(react-dom@18.3.1)(react@18.3.1) + rc-select: 14.1.18(react-dom@18.3.1)(react@18.3.1) + rc-slider: 10.0.1(react-dom@18.3.1)(react@18.3.1) + rc-steps: 4.1.4(react-dom@18.3.1)(react@18.3.1) + rc-switch: 3.2.2(react-dom@18.3.1)(react@18.3.1) + rc-table: 7.26.0(react-dom@18.3.1)(react@18.3.1) + rc-tabs: 12.1.0-alpha.1(react-dom@18.3.1)(react@18.3.1) + rc-textarea: 0.4.7(react-dom@18.3.1)(react@18.3.1) + rc-tooltip: 5.2.2(react-dom@18.3.1)(react@18.3.1) + rc-tree: 5.7.12(react-dom@18.3.1)(react@18.3.1) + rc-tree-select: 5.5.5(react-dom@18.3.1)(react@18.3.1) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-upload: 4.3.6(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) scroll-into-view-if-needed: 2.2.31 dev: false @@ -954,7 +950,7 @@ packages: resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==} engines: {node: '>= 10.0.0'} dependencies: - '@babel/types': 7.24.0 + '@babel/types': 7.24.5 dev: true /boolbase@1.0.0: @@ -1067,8 +1063,8 @@ packages: /constantinople@4.0.1: resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==} dependencies: - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 + '@babel/parser': 7.24.5 + '@babel/types': 7.24.5 dev: true /copy-anything@2.0.6: @@ -1082,8 +1078,8 @@ packages: toggle-selection: 1.0.6 dev: false - /core-js@3.36.1: - resolution: {integrity: sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA==} + /core-js@3.37.0: + resolution: {integrity: sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==} requiresBuild: true dev: false @@ -1162,11 +1158,11 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 dev: false - /dayjs@1.11.10: - resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} + /dayjs@1.11.11: + resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==} dev: false /define-data-property@1.1.4: @@ -1605,7 +1601,6 @@ packages: /iconv-lite@0.6.3: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} - requiresBuild: true dependencies: safer-buffer: 2.1.2 optional: true @@ -1628,7 +1623,7 @@ packages: /import-html-entry@1.15.2: resolution: {integrity: sha512-XXtXpGAq811qBgFVdOU6LoOC67rirwv7qwz/zuz1KxbpAM7QYX6kMvELOdSfhjZ9ntQnsdEOXT2zV7xMYaky6w==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 dev: false /is-any-array@2.0.1: @@ -1783,21 +1778,14 @@ packages: tslib: 2.6.2 dev: false - /lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - dependencies: - yallist: 4.0.0 - /magic-string@0.25.9: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} dependencies: sourcemap-codec: 1.4.8 dev: true - /magic-string@0.30.8: - resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} - engines: {node: '>=12'} + /magic-string@0.30.10: + resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 dev: false @@ -1966,7 +1954,6 @@ packages: /pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} - requiresBuild: true optional: true /pinia@2.1.4(typescript@4.3.2)(vue@3.3.4): @@ -2003,7 +1990,7 @@ packages: cosmiconfig: 9.0.0(typescript@4.3.2) jiti: 1.21.0 postcss: 8.4.38 - semver: 7.6.0 + semver: 7.6.2 transitivePeerDependencies: - typescript dev: false @@ -2040,7 +2027,7 @@ packages: /probe.gl@3.6.0: resolution: {integrity: sha512-19JydJWI7+DtR4feV+pu4Mn1I5TAc0xojuxVgZdXIyfmTLfUaFnk4OloWK1bKbPtkgGKLr2lnbnCXmpZEcEp9g==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 '@probe.gl/env': 3.6.0 '@probe.gl/log': 3.6.0 '@probe.gl/stats': 3.6.0 @@ -2058,7 +2045,6 @@ packages: /prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} - requiresBuild: true optional: true /pug-attrs@3.0.0: @@ -2160,552 +2146,552 @@ packages: /qiankun@2.10.16: resolution: {integrity: sha512-Q3tSVUrPnzx8ckEOKIoPnhb5LE28FPKyan/r6jEuGJGqTbIy+3rp6E2/KfU82ZI4yZpef9LFTrnxdj49jAEsmw==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 import-html-entry: 1.15.2 lodash: 4.17.21 single-spa: 5.9.5 dev: false - /rc-align@4.0.15(react-dom@18.2.0)(react@18.2.0): + /rc-align@4.0.15(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 dom-align: 1.12.4 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) resize-observer-polyfill: 1.5.1 dev: false - /rc-cascader@3.7.3(react-dom@18.2.0)(react@18.2.0): + /rc-cascader@3.7.3(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-KBpT+kzhxDW+hxPiNk4zaKa99+Lie2/8nnI11XF+FIOPl4Bj9VlFZi61GrnWzhLGA7VEN+dTxAkNOjkySDa0dA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 array-tree-filter: 2.1.0 classnames: 2.5.1 - rc-select: 14.1.18(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.7.12(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-select: 14.1.18(react-dom@18.3.1)(react@18.3.1) + rc-tree: 5.7.12(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-checkbox@2.3.2(react-dom@18.2.0)(react@18.2.0): + /rc-checkbox@2.3.2(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-afVi1FYiGv1U0JlpNH/UaEXdh6WUJjcWokj/nUN2TgG80bfG+MDdbfHKlLcNNba94mbjy2/SXJ1HDgrOkXGAjg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-collapse@3.3.1(react-dom@18.2.0)(react@18.2.0): + /rc-collapse@3.3.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-cOJfcSe3R8vocrF8T+PgaHDrgeA1tX+lwfhwSj60NX9QVRidsILIbRNDLD6nAzmcvVC5PWiIRiR4S1OobxdhCg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-dialog@8.9.0(react-dom@18.2.0)(react@18.2.0): + /rc-dialog@8.9.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-Cp0tbJnrvPchJfnwIvOMWmJ4yjX3HWFatO6oBFD1jx8QkgsQCR0p8nUWAKdd3seLJhEC39/v56kZaEjwp9muoQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-drawer@5.1.0(react-dom@18.2.0)(react@18.2.0): + /rc-drawer@5.1.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-pU3Tsn99pxGdYowXehzZbdDVE+4lDXSGb7p8vA9mSmr569oc2Izh4Zw5vLKSe/Xxn2p5MSNbLVqD4tz+pK6SOw==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-dropdown@4.0.1(react-dom@18.2.0)(react@18.2.0): + /rc-dropdown@4.0.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-OdpXuOcme1rm45cR0Jzgfl1otzmU4vuBVb+etXM8vcaULGokAKVpKlw8p6xzspG7jGd/XxShvq+N3VNEfk/l5g==} peerDependencies: react: '>=16.11.0' react-dom: '>=16.11.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-field-form@1.27.4(react-dom@18.2.0)(react@18.2.0): + /rc-field-form@1.27.4(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-PQColQnZimGKArnOh8V2907+VzDCXcqtFvHgevDLtqWc/P7YASb/FqntSmdS8q3VND5SHX3Y1vgMIzY22/f/0Q==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 async-validator: 4.2.5 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-image@5.7.1(react-dom@18.2.0)(react@18.2.0): + /rc-image@5.7.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-QyMfdhoUfb5W14plqXSisaYwpdstcLYnB0MjX5ccIK2rydQM9sDPuekQWu500DDGR2dBaIF5vx9XbWkNFK17Fg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-dialog: 8.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-dialog: 8.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-input-number@7.3.11(react-dom@18.2.0)(react@18.2.0): + /rc-input-number@7.3.11(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-input@0.1.4(react-dom@18.2.0)(react@18.2.0): + /rc-input@0.1.4(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-FqDdNz+fV2dKNgfXzcSLKvC+jEs1709t7nD+WdfjrdSaOcefpgc7BUJYadc3usaING+b7ediMTfKxuJBsEFbXA==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-mentions@1.10.0(react-dom@18.2.0)(react@18.2.0): + /rc-mentions@1.10.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-oMlYWnwXSxP2NQVlgxOTzuG/u9BUc3ySY78K3/t7MNhJWpZzXTao+/Bic6tyZLuNCO89//hVQJBdaR2rnFQl6Q==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-menu: 9.6.4(react-dom@18.2.0)(react@18.2.0) - rc-textarea: 0.4.7(react-dom@18.2.0)(react@18.2.0) - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-menu: 9.6.4(react-dom@18.3.1)(react@18.3.1) + rc-textarea: 0.4.7(react-dom@18.3.1)(react@18.3.1) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-menu@9.6.4(react-dom@18.2.0)(react@18.2.0): + /rc-menu@9.6.4(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-6DiNAjxjVIPLZXHffXxxcyE15d4isRL7iQ1ru4MqYDH2Cqc5bW96wZOdMydFtGLyDdnmEQ9jVvdCE9yliGvzkw==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-overflow: 1.3.2(react-dom@18.3.1)(react@18.3.1) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-motion@2.9.0(react-dom@18.2.0)(react@18.2.0): + /rc-motion@2.9.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-notification@4.6.1(react-dom@18.2.0)(react@18.2.0): + /rc-notification@4.6.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-NSmFYwrrdY3+un1GvDAJQw62Xi9LNMSsoQyo95tuaYrcad5Bn9gJUL8AREufRxSQAQnr64u3LtP3EUyLYT6bhw==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-overflow@1.3.2(react-dom@18.2.0)(react@18.2.0): + /rc-overflow@1.3.2(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-pagination@3.1.17(react-dom@18.2.0)(react@18.2.0): + /rc-pagination@3.1.17(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-picker@2.6.11(react-dom@18.2.0)(react@18.2.0): + /rc-picker@2.6.11(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-INJ7ULu+Kj4UgqbcqE8Q+QpMw55xFf9kkyLBHJFk0ihjJpAV4glialRfqHE7k4KX2BWYPQfpILwhwR14x2EiRQ==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 date-fns: 2.30.0 - dayjs: 1.11.10 + dayjs: 1.11.11 moment: 2.29.4 - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-progress@3.3.3(react-dom@18.2.0)(react@18.2.0): + /rc-progress@3.3.3(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-MDVNVHzGanYtRy2KKraEaWeZLri2ZHWIRyaE1a9MQ2MuJ09m+Wxj5cfcaoaR6z5iRpHpA59YeUxAlpML8N4PJw==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-rate@2.9.3(react-dom@18.2.0)(react@18.2.0): + /rc-rate@2.9.3(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-2THssUSnRhtqIouQIIXqsZGzRczvp4WsH4WvGuhiwm+LG2fVpDUJliP9O1zeDOZvYfBE/Bup4SgHun/eCkbjgQ==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-resize-observer@1.4.0(react-dom@18.2.0)(react@18.2.0): + /rc-resize-observer@1.4.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) resize-observer-polyfill: 1.5.1 dev: false - /rc-segmented@2.1.2(react-dom@18.2.0)(react@18.2.0): + /rc-segmented@2.1.2(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-qGo1bCr83ESXpXVOCXjFe1QJlCAQXyi9KCiy8eX3rIMYlTeJr/ftySIaTnYsitL18SvWf5ZEHsfqIWoX0EMfFQ==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-select@14.1.18(react-dom@18.2.0)(react@18.2.0): + /rc-select@14.1.18(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-4JgY3oG2Yz68ECMUSCON7mtxuJvCSj+LJpHEg/AONaaVBxIIrmI/ZTuMJkyojall/X50YdBe5oMKqHHPNiPzEg==} engines: {node: '>=8.x'} peerDependencies: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-overflow: 1.3.2(react-dom@18.3.1)(react@18.3.1) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + rc-virtual-list: 3.12.0(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-slider@10.0.1(react-dom@18.2.0)(react@18.2.0): + /rc-slider@10.0.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-steps@4.1.4(react-dom@18.2.0)(react@18.2.0): + /rc-steps@4.1.4(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-qoCqKZWSpkh/b03ASGx1WhpKnuZcRWmvuW+ZUu4mvMdfvFzVxblTwUM+9aBd0mlEUFmt6GW8FXhMpHkK3Uzp3w==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-switch@3.2.2(react-dom@18.2.0)(react@18.2.0): + /rc-switch@3.2.2(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-table@7.26.0(react-dom@18.2.0)(react@18.2.0): + /rc-table@7.26.0(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-0cD8e6S+DTGAt5nBZQIPFYEaIukn17sfa5uFL98faHlH/whZzD8ii3dbFL4wmUDEL4BLybhYop+QUfZJ4CPvNQ==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-tabs@12.1.0-alpha.1(react-dom@18.2.0)(react@18.2.0): + /rc-tabs@12.1.0-alpha.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-M+B88WEnGSuE+mR54fpgPbZLAakzxa/H6FmEetLBl5WG4I3AcwSk9amuIPC/tu0KXBl+H6Bg5ZwrrEUOBUvgzg==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-dropdown: 4.0.1(react-dom@18.2.0)(react@18.2.0) - rc-menu: 9.6.4(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-dropdown: 4.0.1(react-dom@18.3.1)(react@18.3.1) + rc-menu: 9.6.4(react-dom@18.3.1)(react@18.3.1) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-textarea@0.4.7(react-dom@18.2.0)(react@18.2.0): + /rc-textarea@0.4.7(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-IQPd1CDI3mnMlkFyzt2O4gQ2lxUsnBAeJEoZGJnkkXgORNqyM9qovdrCj9NzcRfpHgLdzaEbU3AmobNFGUznwQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) shallowequal: 1.1.0 dev: false - /rc-tooltip@5.2.2(react-dom@18.2.0)(react@18.2.0): + /rc-tooltip@5.2.2(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-jtQzU/18S6EI3lhSGoDYhPqNpWajMtS5VV/ld1LwyfrDByQpYmw/LW6U7oFXXLukjfDHQ7Ju705A82PRNFWYhg==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-trigger: 5.3.4(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-tree-select@5.5.5(react-dom@18.2.0)(react@18.2.0): + /rc-tree-select@5.5.5(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-k2av7jF6tW9bIO4mQhaVdV4kJ1c54oxV3/hHVU+oD251Gb5JN+m1RbJFTMf1o0rAFqkvto33rxMdpafaGKQRJw==} peerDependencies: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-select: 14.1.18(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.7.12(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-select: 14.1.18(react-dom@18.3.1)(react@18.3.1) + rc-tree: 5.7.12(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-tree@5.7.12(react-dom@18.2.0)(react@18.2.0): + /rc-tree@5.7.12(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-LXA5nY2hG5koIAlHW5sgXgLpOMz+bFRbnZZ+cCg0tQs4Wv1AmY7EDi1SK7iFXhslYockbqUerQan82jljoaItg==} engines: {node: '>=10.x'} peerDependencies: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + rc-virtual-list: 3.12.0(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-trigger@5.3.4(react-dom@18.2.0)(react@18.2.0): + /rc-trigger@5.3.4(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-align: 4.0.15(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-align: 4.0.15(react-dom@18.3.1)(react@18.3.1) + rc-motion: 2.9.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-upload@4.3.6(react-dom@18.2.0)(react@18.2.0): + /rc-upload@4.3.6(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-Bt7ESeG5tT3IY82fZcP+s0tQU2xmo1W6P3S8NboUUliquJLQYLkUcsaExi3IlBVr43GQMCjo30RA2o0i70+NjA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /rc-util@5.39.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-OW/ERynNDgNr4y0oiFmtes3rbEamXw7GHGbkbNd9iRr7kgT03T6fT0b9WpJ3mbxKhyOcAHnGcIoh5u/cjrC2OQ==} + /rc-util@5.39.3(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-j9wOELkLQ8gC/NkUg3qg9mHZcJf+5mYYv40JrDHqnaf8VSycji4pCf7kJ5fdTXQPDIF0vr5zpb/T2HdrMs9rWA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 + '@babel/runtime': 7.24.5 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-is: 18.3.1 dev: false - /rc-virtual-list@3.11.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-NbBi0fvyIu26gP69nQBiWgUMTPX3mr4FcuBQiVqagU0BnuX8WQkiivnMs105JROeuUIFczLrlgUhLQwTWV1XDA==} + /rc-virtual-list@3.12.0(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-43+/lr7bImpvEwTFw1FTYwSg42VHzRgO5PiCEEUROj8D2+M2SCvANqGIa9QyhoFLVQtc+2QXvgTB7VPGG7oOoQ==} engines: {node: '>=8.x'} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.5 classnames: 2.5.1 - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.3.1)(react@18.3.1) + rc-util: 5.39.3(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false - /react-dom@18.2.0(react@18.2.0): - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + /react-dom@18.3.1(react@18.3.1): + resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} peerDependencies: - react: ^18.2.0 + react: ^18.3.1 dependencies: loose-envify: 1.4.0 - react: 18.2.0 - scheduler: 0.23.0 + react: 18.3.1 + scheduler: 0.23.2 dev: false - /react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + /react-is@18.3.1: + resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} dev: false - /react@18.2.0: - resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} + /react@18.3.1: + resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 @@ -2749,16 +2735,14 @@ packages: /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - requiresBuild: true optional: true /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} - requiresBuild: true optional: true - /scheduler@0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + /scheduler@0.23.2: + resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} dependencies: loose-envify: 1.4.0 dev: false @@ -2772,15 +2756,12 @@ packages: /semver@5.7.2: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} hasBin: true - requiresBuild: true optional: true - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + /semver@7.6.2: + resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 /set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} @@ -3024,7 +3005,7 @@ packages: deprecated: 'WARNING: This project has been renamed to @volar/typescript-language-service. Install using @volar/typescript-language-service instead.' dependencies: '@volar/shared': 0.28.10 - semver: 7.6.0 + semver: 7.6.2 upath: 2.0.1 vscode-languageserver: 8.1.0 vscode-languageserver-textdocument: 1.0.11 @@ -3047,10 +3028,10 @@ packages: '@volar/shared': 0.28.10 '@volar/source-map': 0.28.10 '@volar/transforms': 0.28.10 - '@vscode/emmet-helper': 2.9.2 - '@vue/compiler-dom': 3.4.21 - '@vue/reactivity': 3.4.21 - '@vue/shared': 3.4.21 + '@vscode/emmet-helper': 2.9.3 + '@vue/compiler-dom': 3.4.27 + '@vue/reactivity': 3.4.27 + '@vue/shared': 3.4.27 request-light: 0.5.8 upath: 2.0.1 vscode-css-languageservice: 5.4.2 @@ -3207,11 +3188,8 @@ packages: resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==} engines: {node: '>= 10.0.0'} dependencies: - '@babel/parser': 7.24.1 - '@babel/types': 7.24.0 + '@babel/parser': 7.24.5 + '@babel/types': 7.24.5 assert-never: 1.2.1 babel-walk: 3.0.0-canary-5 dev: true - - /yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} diff --git a/flow-graph/src/common/flowService.ts b/flow-graph/src/common/flowService.ts index 3263de0dc..fe212bfa5 100644 --- a/flow-graph/src/common/flowService.ts +++ b/flow-graph/src/common/flowService.ts @@ -7,7 +7,6 @@ import {getNodeCategoryByNumber, NodeCategory} from "../models/enums/nodeCategor import {TreeData} from "../models/graph/treeData"; import {MappingParameters} from "../models/mappingParameters"; import { - getMappingEditTypeEnumByType, MappingEditTypeEnum } from "../models/enums/mappingEditTypeEnum"; import {Mapping} from "../models/task/mapping"; @@ -18,6 +17,9 @@ import {Channel} from "./transmit"; import {CustomEventTypeEnum} from "./enums"; import {NodePrototype} from "../models/nodeTemplate"; import yaml from 'js-yaml'; +import { useI18nStoreWithOut } from "../store/modules/i18nStore"; +import { InputSchemaHandlerFactory } from "./inputSchemaStyleHandler"; +import { InputSchemaTypeEnum } from "../models/enums/InputSchemaTypeEnum"; // 保存节点分组信息 export function saveNodeGroups(queryTemplateNodesUrls: string[]) { @@ -119,10 +121,11 @@ export function getReferences(nodeId: string): TreeData[] { } const taskName = node.task.name; const nodePath = '$.' + taskName; - const output = JSON.parse(nodePrototype.template.output); + const output = node.task.outputSchema === undefined ? JSON.parse(nodePrototype.template.output): node.task.outputSchema; const treeData = convertSchemaToTreeData(output, nodePath); - treeDataList.push({ title: taskName, value: nodePath, children: treeData }); + let title = node.task.title === undefined ? node.task.name : node.task.title; + treeDataList.push({ title: title, value: nodePath, children: treeData }); }); return treeDataList; } @@ -137,13 +140,15 @@ export function convertInputSchemaToTreeData(inputSchema): TreeData[] { } const treeData = []; const inputSchemaData = new TreeData(); - inputSchemaData.title = 'context'; + const { t } = useI18nStoreWithOut().getI18n().global; + inputSchemaData.title = t('context'); inputSchemaData.value = '$.context'; inputSchemaData.children = []; const inputSchemaDataChildren = []; for (const dataKey in inputSchema) { const treeData = new TreeData(); - treeData.title = inputSchema[dataKey].name + '【' + inputSchema[dataKey].type+ '】'; + const title = (inputSchema[dataKey].desc === '' || inputSchema[dataKey].desc === undefined) ? inputSchema[dataKey].name: inputSchema[dataKey].desc; + treeData.title = title + '【' + inputSchema[dataKey].type+ '】'; treeData.value = '$.context.' + inputSchema[dataKey].name; treeData.children = []; inputSchemaDataChildren.push(treeData); @@ -161,7 +166,6 @@ export function convertInputSchemaToTreeData(inputSchema): TreeData[] { */ export function convertSchemaToTreeData(schema, currentPath = '$'): TreeData[] { const treeData = []; - if (schema.type === 'object') { if (schema?.properties === undefined) { return treeData; @@ -197,14 +201,15 @@ function getQueryUrlByOpt(flowParams: FlowParams) { } } -export function removeOldInputMappings(currentNode: RillNode, parameters: Map, oldSources: Map>) { +export function updateInputMappings(currentNode: RillNode, parameters: Map, oldSources: Map>, oldParameters: Map, outputTasks: Map>) { if (currentNode.task.inputMappings === undefined) { currentNode.task.inputMappings = []; } + // 1. 构建模版默认inputMappings const newMappings = []; for (const mapping of currentNode.task.inputMappings) { if (parameters.has(mapping.target)) { - const sourceInfos = mapping.source.split('.'); + const sourceInfos = mapping.source.toString().split('.'); if (sourceInfos.length < 3) { continue; } @@ -214,11 +219,20 @@ export function removeOldInputMappings(currentNode: RillNode, parameters: Map { - const result = new Map(); +export function convertObjectToMappingParametersMap(nodeSchema: string, obj: any, currentKey = ''): Map { + let result = new Map(); + let nodeTemplateSchema = nodeSchema !== undefined ? JSON.parse(nodeSchema) : {}; for (const key in obj) { + let bizType = nodeTemplateSchema?.properties?.[key]?.bizType !== undefined ? nodeTemplateSchema?.properties?.[key]?.bizType : InputSchemaTypeEnum.NORMAL; + if (Array.isArray(obj[key]) || typeof obj[key] === 'string') { + let arrayToMapResult = InputSchemaHandlerFactory.getHandler(bizType).saveSchemaValueHandle(key, obj[key]) + result = new Map([...result, ...arrayToMapResult]) + continue; + } + if (typeof obj[key] === 'object' && obj[key] !== null && (obj[key]['attr'] === null || typeof obj[key]['attr'] !== 'string')) { const newKey = currentKey ? `${currentKey}.${key}` : key; - const subResult = convertObjectToMappingParametersMap(obj[key], newKey); + const subResult = convertObjectToMappingParametersMap(nodeSchema, obj[key], newKey); subResult.forEach((value, subKey) => { result.set(subKey, value); }); } else { const newKey = currentKey ? `${currentKey}.${key}` : key; - const parameters: MappingParameters = new MappingParameters(); - parameters.key = newKey; - parameters.type = getMappingEditTypeEnumByType(obj[key]['attr']); - if (parameters.type === undefined) { - console.error(`未知的类型：${obj[key]['attr']}`); - continue; - } else if (parameters.type === MappingEditTypeEnum.REFERENCE) { - if (obj[key]['reference'] === undefined) { - continue; - } - parameters.reference = obj[key]['reference']; - } else if (parameters.type === MappingEditTypeEnum.INPUT) { - if (obj[key]['input'] === undefined) { - continue; - } - parameters.input = obj[key]['input']; - } - result.set('$.input.' + newKey, parameters); + let arrayToMapResult = InputSchemaHandlerFactory.getHandler(InputSchemaTypeEnum.REFERENCE).saveSchemaValueHandle(newKey, obj[key]) + result = new Map([...result, ...arrayToMapResult]) } } diff --git a/flow-graph/src/common/graphCellRenderService.ts b/flow-graph/src/common/graphCellRenderService.ts index 9037890dd..e79c4e401 100644 --- a/flow-graph/src/common/graphCellRenderService.ts +++ b/flow-graph/src/common/graphCellRenderService.ts @@ -15,17 +15,18 @@ export class GraphCellRenderService { } private static renderNode(node: RillNode, icon: string): {} { - + const label = (node.task.title === undefined || node.task.title === '') ? node.task.name : node.task.title return getVueNodeConfig({ size: { - width: node.task.name.length * 13 > 180 ? node.task.name.length * 13 : 180, + width: label.length * 20 > 200 ? label.length * 20 : 200, height: 40, }, icon: icon, - label: (node.task.title === undefined || node.task.title === '') ? node.task.name : node.task.title, + label: label, nodePrototype: node.nodePrototypeId, position: '', id: node.id, + name: node.task.name, status: node.task.status, ports: GraphCellRenderService.generatePorts(node), }); diff --git a/flow-graph/src/common/inputSchemaStyleHandler.ts b/flow-graph/src/common/inputSchemaStyleHandler.ts new file mode 100644 index 000000000..ddb8c5ffe --- /dev/null +++ b/flow-graph/src/common/inputSchemaStyleHandler.ts @@ -0,0 +1,237 @@ +import { InputSchemaTypeEnum } from "../models/enums/InputSchemaTypeEnum"; +import TreeSelectWidget from '../components/Widget/TreeSelectWidget.vue'; +import CodeEditWidget from "../components/Widget/CodeEditWidget.vue"; +import { Mapping } from "../models/task/mapping"; +import { FlowGraph } from "../models/flowGraph"; +import { MappingParameters } from "../models/mappingParameters"; +import { getMappingEditTypeEnumByType, MappingEditTypeEnum } from "../models/enums/mappingEditTypeEnum"; +import { useI18nStoreWithOut } from "../store/modules/i18nStore"; + +abstract class NodeInputSchemaHandler { + abstract getBizType(): string; + abstract updateUiWidget(schema: any, data: any); + abstract showSchemaValueHandle(key: string, schema: any, inputMappingMap: Map, flowGraph: FlowGraph): any; + abstract saveSchemaValueHandle(key: string, schemaValue: any): any; +} + +class ReferenceNodeInputSchemaHandler extends NodeInputSchemaHandler { + getBizType(): string { + return InputSchemaTypeEnum.REFERENCE; + } + + updateUiWidget(schema: any, data: any) { + schema['properties'] = this.buildSchemaProperties(schema?.type, data, schema?.bizType); + delete schema['type']; + } + + showSchemaValueHandle(key: string, schema: any, inputMappingMap: Map, flowGraph: FlowGraph): any { + const inputMapping = inputMappingMap.get(key); + if (inputMapping === undefined || inputMapping?.source === undefined) { + return null; + } + + const inputFormData = { + key: key, + value: { + attr: 'input', + input: inputMapping.source, + reference: '', + }, + }; + + const formData = inputMapping.source.toString().startsWith('$.') + ? this.getSchemaFormDataByReference(inputMapping, flowGraph, key) + : inputFormData; + return formData; + } + saveSchemaValueHandle(key: string, schemaValue: any): any { + const result = new Map(); + const parameters: MappingParameters = new MappingParameters(); + parameters.key = key; + parameters.type = getMappingEditTypeEnumByType(schemaValue['attr']); + if (parameters.type === undefined) { + console.error(`未知的类型：`, key, schemaValue); + return result; + } else if (parameters.type === MappingEditTypeEnum.REFERENCE) { + if (schemaValue['reference'] === undefined) { + return result; + } + parameters.reference = schemaValue['reference']; + } else if (parameters.type === MappingEditTypeEnum.INPUT) { + if (schemaValue['input'] === undefined) { + return result; + } + parameters.input = schemaValue['input']; + } + result.set('$.input.' + key, parameters); + + return result; + } + buildSchemaProperties(typeData: any, references: any, bizType: string) { + const { t } = useI18nStoreWithOut().getI18n().global; + return { + attr: { + title: t('inputSchema.attr'), + type: 'string', + enum: ['input', 'reference'], + enumNames: [t('inputSchema.intput'), t('inputSchema.reference')], + 'ui:width': '40%', + }, + input: { + title: t('inputSchema.intput'), + type: typeData, + 'ui:hidden': "{{parentFormData.attr !== 'input'}}", + 'ui:width': '60%', + }, + reference: { + title: t('inputSchema.reference'), + type: 'string', + default: '', + 'ui:hidden': "{{parentFormData.attr !== 'reference'}}", + 'ui:width': '60%', + 'ui:widget': TreeSelectWidget, + 'ui:treeData': references + }, + }; + } + + getSchemaFormDataByReference( + inputMapping: Mapping, + flowGraph: FlowGraph, + inputTargetParam: string, + ): object { + let containNode = false; + if (inputMapping.source.startsWith('$.context.')) { + const maybeTaskName = inputMapping.source.split('.')[2]; + containNode = flowGraph.containNode(maybeTaskName); + } + return { + key: inputTargetParam, + value: { + attr: 'reference', + reference: containNode + ? inputMapping.source.replace('.context', '') + : inputMapping.source, + input: '' + }, + }; + } +} + +class CodeNodeInputSchemaHandler extends NodeInputSchemaHandler { + getBizType(): string { + return InputSchemaTypeEnum.CODE; + } + updateUiWidget(schema: object, data: any) { + schema['ui:widget'] = CodeEditWidget + schema['ui:codeOptions'] = { mode: 'python'} + } + showSchemaValueHandle(key: string, schema: any, inputMappingMap: Map, flowGraph: FlowGraph): any { + const inputMapping = inputMappingMap.get(key); + if (inputMapping === undefined || inputMapping?.source === undefined) { + return null; + } + return { + key: key, + value: inputMapping.source + }; + } + saveSchemaValueHandle(key: string, schemaValue: any): any { + const result = new Map(); + const parameters: MappingParameters = new MappingParameters(); + parameters.key = key + parameters.type = MappingEditTypeEnum.INPUT + parameters.input = schemaValue + result.set('$.input.' + key, parameters); + return result; } +} + +class NormalNodeInputSchemaHandler extends NodeInputSchemaHandler { + getBizType(): string { + return InputSchemaTypeEnum.NORMAL; + } + updateUiWidget(schema: any, data: any) { + schema['ui:width'] = '40%' + } + showSchemaValueHandle(key: string, schema: any, inputMappingMap: Map, flowGraph: FlowGraph): any { + const inputMapping = inputMappingMap.get(key); + if (inputMapping === undefined || inputMapping?.source === undefined) { + return null; + } + return { + key: key, + value: inputMapping.source + }; + } + saveSchemaValueHandle(key: string, schemaValue: any): Map { + const result = new Map(); + const parameters: MappingParameters = new MappingParameters(); + parameters.key = key + parameters.type = MappingEditTypeEnum.INPUT + parameters.input = schemaValue + result.set('$.input.' + key, parameters); + return result; + } +} + + +class ArrayToMapNodeInputSchemaHandler extends NodeInputSchemaHandler { + getBizType(): string { + return InputSchemaTypeEnum.ARRAY_TO_MAP; + } + updateUiWidget(schema: any, data: any) {} + showSchemaValueHandle(key: string, schema: any, inputMappingMap: Map, flowGraph: FlowGraph): any { + const properties = schema[key]?.items?.properties; + const arrayValue = []; + for (const inputMappingKey of inputMappingMap.keys()){ + if (inputMappingKey.split('.')[0] === key) { + const itemKey = inputMappingKey.split('.')[1] + inputMappingMap.set(itemKey, inputMappingMap.get(inputMappingKey)); + const formData = InputSchemaHandlerFactory.getHandler(properties['value']?.bizType).showSchemaValueHandle(itemKey, null, inputMappingMap, flowGraph); + + if (formData === null) { + continue; + } + arrayValue.push(formData) + } + } + return { + key: key, + value: arrayValue, + }; + } + saveSchemaValueHandle(key: string, schemaValue: any): Map { + const result = new Map(); + for (const id in schemaValue) { + const parameters: MappingParameters = new MappingParameters(); + parameters.key = schemaValue[id].key + const editType = typeof schemaValue[id].value === "object" ? getMappingEditTypeEnumByType(schemaValue[id].value.attr) : MappingEditTypeEnum.INPUT + parameters.type = editType + if (editType === undefined) { + continue; + } + parameters[editType] = typeof schemaValue[id].value === "object" ? schemaValue[id].value[editType] : schemaValue[id].value + result.set('$.input.' + key + '.' + schemaValue[id].key, parameters); + } + return result; + } +} + + +export class InputSchemaHandlerFactory { + public static getHandler(type: string) { + switch (type) { + case InputSchemaTypeEnum.NORMAL: + return new NormalNodeInputSchemaHandler(); + case InputSchemaTypeEnum.REFERENCE: + return new ReferenceNodeInputSchemaHandler(); + case InputSchemaTypeEnum.CODE: + return new CodeNodeInputSchemaHandler(); + case InputSchemaTypeEnum.ARRAY_TO_MAP: + return new ArrayToMapNodeInputSchemaHandler(); + default: + return new ReferenceNodeInputSchemaHandler(); + } + } + +} \ No newline at end of file diff --git a/flow-graph/src/common/outputToTree.ts b/flow-graph/src/common/outputToTree.ts index f02bb312e..d0f0e6a43 100644 --- a/flow-graph/src/common/outputToTree.ts +++ b/flow-graph/src/common/outputToTree.ts @@ -1,14 +1,14 @@ export function convertSchemaToTreeData(schema, currentPath = '$') { const treeData = []; - if (schema.type === 'object') { if (schema.properties === undefined) { return treeData; } for (const [key, value] of Object.entries(schema.properties)) { currentPath += '.' + key; + const title = value?.title === undefined ? key : value?.title; const node = { - title: key + '【' + value.type + '】', + title: title + '【' + value.type + '】', value: currentPath, children: convertSchemaToTreeData(value, currentPath), }; diff --git a/flow-graph/src/common/replaceJsonSchemaConfig.ts b/flow-graph/src/common/replaceJsonSchemaConfig.ts index 62d7ddd34..26fef8511 100644 --- a/flow-graph/src/common/replaceJsonSchemaConfig.ts +++ b/flow-graph/src/common/replaceJsonSchemaConfig.ts @@ -1,32 +1,4 @@ -import TreeSelectWidget from '../components/Widget/TreeSelectWidget.vue'; - -function buildSchemaProperties(typeData: any, references: any) { - return { - attr: { - title: '类型', - type: 'string', - enum: ['input', 'reference'], - enumNames: ['input', 'reference'], - 'ui:width': '40%', - }, - input: { - title: '文本', - type: typeData, - 'ui:hidden': "{{parentFormData.attr !== 'input'}}", - 'ui:width': '60%', - }, - reference: { - title: 'reference', - type: 'string', - default: '', - 'ui:hidden': "{{parentFormData.attr !== 'reference'}}", - 'ui:width': '60%', - 'ui:widget': TreeSelectWidget, - 'ui:treeData': references, - }, - }; -} - +import { InputSchemaHandlerFactory } from "./inputSchemaStyleHandler"; export function getBaseTypeSet(): Set { const result: Set = new Set(); result.add('string'); @@ -38,9 +10,7 @@ export function getBaseTypeSet(): Set { export function replaceUIWidget(json, references) { if (typeof json === 'object') { if (getBaseTypeSet().has(json?.type)) { - // 进行替换操作 - json['properties'] = buildSchemaProperties(json?.type, references); - delete json['type']; + InputSchemaHandlerFactory.getHandler(json?.bizType).updateUiWidget(json, references); return; } for (const jsonKey in json) { diff --git a/flow-graph/src/common/transform.ts b/flow-graph/src/common/transform.ts index c1b8cc153..f2204635a 100644 --- a/flow-graph/src/common/transform.ts +++ b/flow-graph/src/common/transform.ts @@ -1,4 +1,5 @@ import { Lang } from '@antv/x6'; +import { InputSchemaTypeEnum } from "../models/enums/InputSchemaTypeEnum"; export function getVueNodeConfig(node) { const { label, width, height, id, data, position, ports, icon, status } = getBaseConfig(node); @@ -41,6 +42,7 @@ function getBaseConfig(node) { status, nodePrototype, label, + name, } = node; let _width, _height, @@ -91,7 +93,7 @@ function getBaseConfig(node) { icon: icon, nodePrototype: nodePrototype, nodeId: id, - name: label, + name: name, status: status, }, icon, @@ -155,11 +157,16 @@ export const getJsonByJsonPaths = (paths) => { export const getJsonPathByJsonSchema = (data) => { // data是一个map，该map的key为string类型，value是map类型。data可以理解为一个树。将其转换成key为非叶子节点以.间隔，value为叶子节点 const list = []; - function isBaseType(type) { return type === 'string' || type === 'boolean' || type === 'number'; } - function addToList(obj, prefix = '') { + function addToList(obj, prefix = '', isFinish = false) { + if (isFinish) { + if (!list.includes(prefix.slice(0, -1))) { + list.push(prefix.slice(0, -1)); + } + return; + } if (typeof obj === 'object') { if (isBaseType(obj?.type)) { // 去重并加入到list中 @@ -170,7 +177,11 @@ export const getJsonPathByJsonSchema = (data) => { } if (obj?.type === 'array') { - addToList(obj.items.properties, prefix + '*.'); + if (obj?.bizType === InputSchemaTypeEnum.ARRAY_TO_MAP) { + addToList(obj.items.properties, prefix, true); + } else { + addToList(obj.items.properties, prefix + '*.'); + } return; } diff --git a/flow-graph/src/components/NodesBar/index.vue b/flow-graph/src/components/NodesBar/index.vue index 40d02b7ab..9493f6ce0 100644 --- a/flow-graph/src/components/NodesBar/index.vue +++ b/flow-graph/src/components/NodesBar/index.vue @@ -1,5 +1,5 @@ - - diff --git a/rill-flow-ui/src/views/flow-definition/node-templetes/index.vue b/rill-flow-ui/src/views/flow-definition/node-templetes/index.vue index 52f62e3dc..6ed81ba80 100644 --- a/rill-flow-ui/src/views/flow-definition/node-templetes/index.vue +++ b/rill-flow-ui/src/views/flow-definition/node-templetes/index.vue @@ -13,14 +13,14 @@ onClick: handleEdit.bind(null, record), }, { - label: t('routes.flow.definitions.node_templates_detail.option.disable'), + label: t('routes.flow.definitions.node_templates_detail.option.enable'), ifShow: (_action) => { return record.node_type !== 'meta' && record.enable === 1; }, onClick: handleEnableDisable.bind(null, record.id, false), }, { - label: t('routes.flow.definitions.node_templates_detail.option.enable'), + label: t('routes.flow.definitions.node_templates_detail.option.disable'), ifShow: (_action) => { return record.node_type !== 'meta' && record.enable === 0; }, diff --git a/rill-flow-ui/src/views/flow-definition/node-templetes/tableData.tsx b/rill-flow-ui/src/views/flow-definition/node-templetes/tableData.tsx index 885528682..e33f954ae 100644 --- a/rill-flow-ui/src/views/flow-definition/node-templetes/tableData.tsx +++ b/rill-flow-ui/src/views/flow-definition/node-templetes/tableData.tsx @@ -144,8 +144,8 @@ export function getFormConfig(): Partial { component: 'Select', componentProps: { options: [ - { label: t('routes.flow.definitions.node_templates_detail.option.disable'), value: 1 }, - { label: t('routes.flow.definitions.node_templates_detail.option.enable'), value: 0 }, + { label: t('routes.flow.definitions.node_templates_detail.option.enable'), value: 1 }, + { label: t('routes.flow.definitions.node_templates_detail.option.disable'), value: 0 }, ], defaultValue: 1, onChange: (e: number) => { diff --git a/rill-flow-ui/src/views/micro/SubContainer.vue b/rill-flow-ui/src/views/micro/SubContainer.vue index 80022b274..c7fb2708e 100644 --- a/rill-flow-ui/src/views/micro/SubContainer.vue +++ b/rill-flow-ui/src/views/micro/SubContainer.vue @@ -9,12 +9,14 @@ import { registerApps } from './qiankun'; import config from './config'; import { useFlowGraphStoreWithOut } from '@/store/modules/flowGraphStore'; + import { useLocale } from '@/locales/useLocale'; const subApps: any[] = []; const { flowGraphApp } = config; onMounted(() => { const flowGraphStore = useFlowGraphStoreWithOut(); flowGraphApp.props['flowParams'] = toRaw(flowGraphStore.getFlowGraphParams); + flowGraphApp.props['language'] = useLocale().getLocale.value; subApps.push(flowGraphApp); if (!window.qiankunStarted) { window.qiankunStarted = true; diff --git a/rill-flow-web/src/main/resources/application.properties b/rill-flow-web/src/main/resources/application.properties index 22c03eb2d..30ae7c15a 100644 --- a/rill-flow-web/src/main/resources/application.properties +++ b/rill-flow-web/src/main/resources/application.properties @@ -22,6 +22,6 @@ rill_flow_auth_secret_key=a819796893fad1350e6bc17548e8f02e weibo.flow.runtime.submit.context.max.size=1048576 spring.mvc.pathmatch.matching-strategy=ant_path_matcher -rill.flow.task.template.datasource.jdbc.master.url=jdbc:mysql://rill-flow-mysql:3306/rill_flow?useSSL=false&autoReconnect=true +rill.flow.task.template.datasource.jdbc.master.url=jdbc:mysql://rill-flow-mysql:3306/rill_flow?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 rill.flow.task.template.datasource.master.user=root rill.flow.task.template.datasource.master.password=secret \ No newline at end of file