From 9d55cb108c9e23ec5799f1c6907488933b1e26b9 Mon Sep 17 00:00:00 2001 From: whyour Date: Fri, 29 Sep 2023 23:16:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E9=A2=9D=E5=A4=96=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 366 +++++++++++++++++++-------------- src/pages/crontab/detail.tsx | 24 +-- src/pages/crontab/index.less | 5 +- src/pages/crontab/index.tsx | 63 +++--- src/pages/env/index.tsx | 11 +- src/pages/login/index.tsx | 3 +- src/pages/setting/loginLog.tsx | 3 +- src/utils/index.ts | 17 +- 8 files changed, 282 insertions(+), 210 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 451c8c42..6d670c90 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -221,7 +221,7 @@ devDependencies: version: 4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/language-data@6.3.1)(@codemirror/language@6.9.0)(@codemirror/legacy-modes@6.3.3)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10) '@uiw/react-codemirror': specifier: ^4.21.9 - version: 4.21.9(@babel/runtime@7.22.3)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0) + version: 4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0) '@umijs/max': specifier: ^4.0.72 version: 4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) @@ -384,12 +384,34 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@emotion/hash': 0.8.0 '@emotion/unitless': 0.7.5 classnames: 2.3.2 csstype: 3.1.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + stylis: 4.2.0 + dev: true + + /@ant-design/cssinjs@1.17.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-MgGCZ6sfD3yQB0XW0hN4jgixMxApTlDYyct+pc7fRZNO4CaqWWm/9iXkkljNR27lyWLZmm+XiDfcIOo1bnrnMA==} + peerDependencies: + react: '>=16.0.0 || 18' + react-dom: '>=16.0.0 || 18' + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@babel/runtime': 7.23.1 + '@emotion/hash': 0.8.0 + '@emotion/unitless': 0.7.5 + classnames: 2.3.2 + csstype: 3.1.2 + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) stylis: 4.2.0 @@ -399,6 +421,10 @@ packages: resolution: {integrity: sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==} dev: true + /@ant-design/icons-svg@4.3.1: + resolution: {integrity: sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==} + dev: true + /@ant-design/icons@4.8.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg==} engines: {node: '>=8'} @@ -420,8 +446,8 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /@ant-design/icons@5.1.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-YHKL7Jx3bM12OxvtiYDon04BsBT/6LGitYEqar3GljzWaAyMOAD8i/uF1Rsi5Us/YNdWWXBGSvZV2OZWMpJlcA==} + /@ant-design/icons@5.2.6(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==} engines: {node: '>=8'} peerDependencies: react: '>=16.0.0 || 18' @@ -433,10 +459,10 @@ packages: optional: true dependencies: '@ant-design/colors': 7.0.0 - '@ant-design/icons-svg': 4.2.1 - '@babel/runtime': 7.22.3 + '@ant-design/icons-svg': 4.3.1 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -456,15 +482,15 @@ packages: react: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 omit.js: 2.0.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 transitivePeerDependencies: - react-dom @@ -494,7 +520,7 @@ packages: '@ant-design/pro-skeleton': 2.1.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-table': 3.7.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -518,10 +544,10 @@ packages: '@ant-design/pro-form': 2.13.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-skeleton': 2.1.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 0.2.6(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 use-json-comparison: 1.0.6(react@18.2.0) transitivePeerDependencies: @@ -541,17 +567,17 @@ packages: react: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@chenshuai2144/sketch-color': 1.0.9(react@18.2.0) antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 dayjs: 1.11.8 lodash.tonumber: 4.0.3 omit.js: 2.0.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 swr: 2.1.5(react@18.2.0) transitivePeerDependencies: @@ -578,11 +604,11 @@ packages: react-dom: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-field': 2.9.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@chenshuai2144/sketch-color': 1.0.9(react@18.2.0) '@umijs/use-params': 1.0.9(react@18.2.0) antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) @@ -590,7 +616,7 @@ packages: lodash.merge: 4.6.2 omit.js: 2.0.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) use-json-comparison: 1.0.6(react@18.2.0) @@ -644,10 +670,10 @@ packages: react-dom: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@umijs/route-utils': 4.0.1 '@umijs/use-params': 1.0.9(react@18.2.0) antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) @@ -656,7 +682,7 @@ packages: omit.js: 2.0.2 path-to-regexp: 2.4.0 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) swr: 2.1.5(react@18.2.0) @@ -679,12 +705,12 @@ packages: react-dom: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-card': 2.4.13(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-field': 2.9.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-table': 3.7.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 dayjs: 1.11.8 @@ -706,9 +732,9 @@ packages: react: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 swr: 1.3.0(react@18.2.0) transitivePeerDependencies: @@ -729,11 +755,11 @@ packages: react-dom: optional: true dependencies: - '@ant-design/cssinjs': 1.10.1(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@ant-design/cssinjs': 1.17.0(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.23.1 '@ctrl/tinycolor': 3.6.0 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) swr: 2.1.5(react@18.2.0) @@ -753,7 +779,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -777,13 +803,13 @@ packages: react-dom: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-card': 2.4.13(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-field': 2.9.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-form': 2.13.5(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-utils': 2.11.3(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@dnd-kit/core': 6.0.8(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/sortable': 7.0.2(@dnd-kit/core@6.0.8)(react@18.2.0) '@dnd-kit/utilities': 3.2.1(react@18.2.0) @@ -792,7 +818,7 @@ packages: dayjs: 1.11.8 omit.js: 2.0.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) use-json-comparison: 1.0.6(react@18.2.0) @@ -813,11 +839,11 @@ packages: dependencies: '@ant-design/icons': 4.8.0(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 1.10.0(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 moment: 2.29.4 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-sortable-hoc: 2.0.0(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) @@ -840,13 +866,13 @@ packages: react-dom: optional: true dependencies: - '@ant-design/icons': 5.1.4(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-provider': 2.10.2(antd@4.24.10)(react-dom@18.2.0)(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 antd: 4.24.10(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 dayjs: 1.11.8 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) swr: 2.1.5(react@18.2.0) @@ -860,7 +886,7 @@ packages: react: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 json2mq: 0.2.0 lodash: 4.17.21 @@ -2694,6 +2720,13 @@ packages: regenerator-runtime: 0.13.11 dev: true + /@babel/runtime@7.23.1: + resolution: {integrity: sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.0 + dev: true + /@babel/template@7.21.9: resolution: {integrity: sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==} engines: {node: '>=6.9.0'} @@ -3974,7 +4007,7 @@ packages: react: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 hoist-non-react-statics: 3.3.2 react: 18.1.0 react-is: 16.13.1 @@ -3989,7 +4022,7 @@ packages: react: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-is: 16.13.1 @@ -4239,9 +4272,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -5383,7 +5416,7 @@ packages: - '@lezer/lr' dev: true - /@uiw/react-codemirror@4.21.9(@babel/runtime@7.22.3)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0): + /@uiw/react-codemirror@4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-aeLegPz2iCvqJjhzXp2WUMqpMZDqxsTnF3rX9kGRlfY6vQLsrjoctj0cQ29uxEtFYJChOVjtCOtnQUlyIuNAHQ==} peerDependencies: '@babel/runtime': '>=7.11.0' @@ -5399,7 +5432,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@codemirror/commands': 6.2.4 '@codemirror/state': 6.2.1 '@codemirror/theme-one-dark': 6.1.2 @@ -5644,7 +5677,7 @@ packages: /@umijs/history@5.3.1: resolution: {integrity: sha512-/e0cEGrR2bIWQD7pRl3dl9dcyRGeC9hoW0OCvUTT/hjY0EfUrkd6G8ZanVghPMpDuY5usxq9GVcvrT8KNXLWvA==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 query-string: 6.14.1 dev: true @@ -6345,7 +6378,7 @@ packages: '@ant-design/colors': 6.0.0 '@ant-design/icons': 4.8.0(react-dom@18.2.0)(react@18.2.0) '@ant-design/react-slick': 0.29.2(react@18.2.0) - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@ctrl/tinycolor': 3.6.0 classnames: 2.3.2 copy-to-clipboard: 3.3.3 @@ -6363,7 +6396,7 @@ packages: rc-input-number: 7.3.11(react-dom@18.2.0)(react@18.2.0) rc-mentions: 1.13.1(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.8.4(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.7.3(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.2.0(react-dom@18.2.0)(react@18.2.0) rc-picker: 2.7.2(react-dom@18.2.0)(react@18.2.0) @@ -6379,11 +6412,11 @@ packages: rc-tabs: 12.5.10(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.4(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.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) scroll-into-view-if-needed: 2.2.31 @@ -6665,7 +6698,7 @@ packages: /babel-plugin-macros@2.8.0: resolution: {integrity: sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 cosmiconfig: 6.0.0 resolve: 1.22.2 dev: true @@ -7782,7 +7815,7 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dev: true /dayjs@1.11.8: @@ -8101,7 +8134,7 @@ packages: redux: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 flatten: 1.0.3 global: 4.4.0 invariant: 2.2.4 @@ -8119,7 +8152,7 @@ packages: dva: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 immer: 8.0.4 dev: true @@ -8128,7 +8161,7 @@ packages: peerDependencies: dva-core: ^1.1.0 || ^1.5.0-0 || ^1.6.0-0 || 2 dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dva-core: 2.0.4(redux@4.2.1) dev: true @@ -9431,7 +9464,7 @@ packages: /history@5.3.0: resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dev: true /hmac-drbg@1.0.1: @@ -9694,7 +9727,7 @@ packages: /import-html-entry@1.14.6: resolution: {integrity: sha512-5MQkbwIr8n/bXOoE05M5/Nm0lnHO46vnb3D6svSvtVwpDqwhd/X14zjLcU31QWZ6gL8rUXNzj6vKHx4yOUL6gQ==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dev: true /import-lazy@4.0.0: @@ -12610,7 +12643,7 @@ packages: /qiankun@2.10.8: resolution: {integrity: sha512-5w6QeM1INFavJdIWfSoDIVv2InV8MEojauvY5tY9Biu8hhE5Rml/HM2t/Y60kZcuOpgy/HGX+tcc6NkQuzDoCg==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 import-html-entry: 1.14.6 lodash: 4.17.21 single-spa: 5.9.4 @@ -12779,10 +12812,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 dom-align: 1.12.4 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 @@ -12799,12 +12832,12 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 array-tree-filter: 2.1.0 classnames: 2.3.2 rc-select: 14.1.17(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.7.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12820,9 +12853,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12838,10 +12871,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 @@ -12858,11 +12891,11 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12878,11 +12911,11 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12898,10 +12931,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12918,9 +12951,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 async-validator: 4.2.5 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12936,12 +12969,12 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@rc-component/portal': 1.1.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.3.2 rc-dialog: 9.0.2(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12957,9 +12990,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12975,9 +13008,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -12993,12 +13026,12 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-menu: 9.8.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.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13014,18 +13047,18 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-overflow: 1.3.0(react-dom@18.2.0)(react@18.2.0) + 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.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /rc-motion@2.7.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-2xUvo8yGHdOHeQbdI8BtBsCIrWKchEmFEIskf0nmHtJsou+meLd/JE+vnvSX2JxcBrJtXY2LuBpxAOxrbY/wMQ==} + /rc-motion@2.9.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==} peerDependencies: react: '>=16.9.0 || 18' react-dom: '>=16.9.0 || 18' @@ -13035,9 +13068,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13054,16 +13087,16 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /rc-overflow@1.3.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-p2Qt4SWPTHAYl4oAao1THy669Fm5q8pYBDBHRaFOekCvcdcrgIx0ByXQMEkyPm8wUDX4BK6aARWecvCRc/7CTA==} + /rc-overflow@1.3.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==} peerDependencies: react: '>=16.9.0 || 18' react-dom: '>=16.9.0 || 18' @@ -13073,10 +13106,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13092,7 +13125,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -13110,13 +13143,13 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 date-fns: 2.30.0 dayjs: 1.11.8 moment: 2.29.4 rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 @@ -13133,9 +13166,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13152,9 +13185,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13170,9 +13203,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 @@ -13189,9 +13222,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 @@ -13208,10 +13241,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13228,12 +13261,12 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-overflow: 1.3.0(react-dom@18.2.0)(react@18.2.0) + 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.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.5.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -13251,9 +13284,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 @@ -13271,9 +13304,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13289,9 +13322,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13308,10 +13341,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 @@ -13329,13 +13362,13 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-dropdown: 4.0.1(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.8.4(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.7.3(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.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13351,10 +13384,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-resize-observer: 1.3.1(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) shallowequal: 1.1.0 @@ -13371,7 +13404,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-trigger: 5.3.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -13389,17 +13422,17 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-select: 14.1.17(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.7.4(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true - /rc-tree@5.7.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-7VfDq4jma+6fvlzfDXvUJ34SaO2EWkcXGBmPgeFmVKsLNNXcKGl4cRAhs6Ts1zqnX994vu/hb3f1dyTjn43RFg==} + /rc-tree@5.7.12(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-LXA5nY2hG5koIAlHW5sgXgLpOMz+bFRbnZZ+cCg0tQs4Wv1AmY7EDi1SK7iFXhslYockbqUerQan82jljoaItg==} engines: {node: '>=10.x'} peerDependencies: react: '*' @@ -13410,10 +13443,10 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) rc-virtual-list: 3.5.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -13431,11 +13464,11 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 rc-align: 4.0.15(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.7.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.33.0(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.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13470,9 +13503,9 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 classnames: 2.3.2 - rc-util: 5.33.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.37.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: true @@ -13498,7 +13531,24 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-is: 16.13.1 + dev: true + + /rc-util@5.37.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-cPMV8DzaHI1KDaS7XPRXAf4J7mtBqjvjikLpQieaeOO7+cEbqY2j7Kso/T0R0OiEZTNcLS/8Zl9YrlXiO9UbjQ==} + peerDependencies: + react: '>=16.9.0 || 18' + react-dom: '>=16.9.0 || 18' + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@babel/runtime': 7.23.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 16.13.1 @@ -13654,7 +13704,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 invariant: 2.2.4 prop-types: 15.8.1 react: 18.1.0 @@ -13674,7 +13724,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -13768,7 +13818,7 @@ packages: redux: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 '@types/hoist-non-react-statics': 3.3.1 '@types/react': 18.2.8 '@types/react-dom': 18.2.4 @@ -13856,7 +13906,7 @@ packages: react-dom: optional: true dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -13985,7 +14035,7 @@ packages: /redux@4.2.1: resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dev: true /reflect-metadata@0.1.13: @@ -14019,10 +14069,14 @@ packages: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} dev: true + /regenerator-runtime@0.14.0: + resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + dev: true + /regenerator-transform@0.15.1: resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 dev: true /regexp.prototype.flags@1.5.0: @@ -15445,7 +15499,7 @@ packages: /tween-one@1.2.6: resolution: {integrity: sha512-kYtWWsZNX5CZvPa5bJsHb5PL9PouhFckiaBaz11Lib4/pMqx9S7M65AYpBam7Di/QslpWJHlqWkjtmtDJNUMqA==} dependencies: - '@babel/runtime': 7.22.3 + '@babel/runtime': 7.23.1 flubber: 0.4.2 raf: 3.4.1 style-utils: 0.3.8 diff --git a/src/pages/crontab/detail.tsx b/src/pages/crontab/detail.tsx index 37b8e949..6bb18423 100644 --- a/src/pages/crontab/detail.tsx +++ b/src/pages/crontab/detail.tsx @@ -33,6 +33,7 @@ import IconFont from '@/components/iconfont'; import { getCommandScript, getEditorMode } from '@/utils'; import VirtualList from 'rc-virtual-list'; import useScrollHeight from '@/hooks/useScrollHeight'; +import dayjs from 'dayjs'; const { Text } = Typography; @@ -52,8 +53,6 @@ interface LogItem { filename: string; } -const language = navigator.language || navigator.languages[0]; - const CronDetailModal = ({ cron = {}, handleCancel, @@ -498,7 +497,12 @@ const CronDetailModal = ({
{intl.get('定时')}
-
{currentCron.schedule}
+
+
{currentCron.schedule}
+ {currentCron.extra_schedules?.map((x) => ( +
{x.schedule}
+ ))} +
@@ -506,11 +510,9 @@ const CronDetailModal = ({
{currentCron.last_execution_time - ? new Date(currentCron.last_execution_time * 1000) - .toLocaleString(language, { - hour12: false, - }) - .replace(' 24:', ' 00:') + ? dayjs(currentCron.last_execution_time * 1000).format( + 'YYYY-MM-DD HH:mm:ss', + ) : '-'}
@@ -530,11 +532,7 @@ const CronDetailModal = ({
{currentCron.nextRunTime && - currentCron.nextRunTime - .toLocaleString(language, { - hour12: false, - }) - .replace(' 24:', ' 00:')} + dayjs(currentCron.nextRunTime).format('YYYY-MM-DD HH:mm:ss')}
diff --git a/src/pages/crontab/index.less b/src/pages/crontab/index.less index 6394fa02..d993d68c 100644 --- a/src/pages/crontab/index.less +++ b/src/pages/crontab/index.less @@ -35,7 +35,7 @@ overflow: auto; .ant-card-body { - min-width: 600px; + min-width: 1000px; } .cron-detail-info-item { @@ -58,7 +58,7 @@ .ant-card-body { display: flex; justify-content: space-between; - min-width: 600px; + min-width: 1000px; } } @@ -78,7 +78,6 @@ display: flex; align-items: center; justify-content: space-between; - margin-right: 32px; .operations { display: flex; diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 7423c4f6..e8f9f98d 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -51,13 +51,14 @@ import ViewManageModal from './viewManageModal'; import { FilterValue, SorterResult } from 'antd/lib/table/interface'; import { SharedContext } from '@/layouts'; import useTableScrollHeight from '@/hooks/useTableScrollHeight'; -import { getCommandScript, parseCrontab } from '@/utils'; +import { getCommandScript, getCrontabsNextDate, parseCrontab } from '@/utils'; import { ColumnProps } from 'antd/lib/table'; import { useVT } from 'virtualizedtableforantd4'; import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type'; import Name from '@/components/name'; +import dayjs from 'dayjs'; -const { Text, Paragraph } = Typography; +const { Text, Paragraph, Link } = Typography; const { Search } = Input; const Crontab = () => { @@ -74,17 +75,18 @@ const Crontab = () => { style={{ wordBreak: 'break-all', marginBottom: 0, + color: '#1890ff' }} ellipsis={{ tooltip: text, rows: 2 }} > - { setDetailCron(record); setIsDetailModalVisible(true); }} > {record.name || '-'} - + ), sorter: { @@ -183,17 +185,29 @@ const Crontab = () => { compare: (a, b) => a.schedule.localeCompare(b.schedule), }, render: (text, record) => { - return record.extra_schedules?.length ? ( - ( -
{x.schedule}
- ))} + return ( + +
{text}
+ {record.extra_schedules?.map((x) => ( +
{x.schedule}
+ ))} + + ), + }, + rows: 2, + }} > {text} - - ) : ( - text + ); }, }, @@ -224,7 +238,6 @@ const Crontab = () => { }, }, render: (text, record) => { - const language = navigator.language || navigator.languages[0]; return ( { }} > {record.last_execution_time - ? new Date(record.last_execution_time * 1000) - .toLocaleString(language, { - hour12: false, - }) - .replace(' 24:', ' 00:') + ? dayjs(record.last_execution_time * 1000).format( + 'YYYY-MM-DD HH:mm:ss', + ) : '-'} ); @@ -251,12 +262,7 @@ const Crontab = () => { }, }, render: (text, record) => { - const language = navigator.language || navigator.languages[0]; - return record.nextRunTime - .toLocaleString(language, { - hour12: false, - }) - .replace(' 24:', ' 00:'); + return dayjs(record.nextRunTime).format('YYYY-MM-DD HH:mm:ss'); }, }, { @@ -389,7 +395,7 @@ const Crontab = () => { data.map((x) => { return { ...x, - nextRunTime: parseCrontab(x.schedule), + nextRunTime: getCrontabsNextDate(x.schedule, x.extra_schedules), }; }), ); @@ -677,7 +683,10 @@ const Crontab = () => { if (code === 200) { const index = value.findIndex((x) => x.id === cron.id); const result = [...value]; - data.nextRunTime = parseCrontab(data.schedule); + data.nextRunTime = getCrontabsNextDate( + data.schedule, + data.extra_schedules, + ); if (index !== -1) { result.splice(index, 1, { ...cron, diff --git a/src/pages/env/index.tsx b/src/pages/env/index.tsx index 15e0f695..30f2b821 100644 --- a/src/pages/env/index.tsx +++ b/src/pages/env/index.tsx @@ -41,6 +41,7 @@ import { SharedContext } from '@/layouts'; import useTableScrollHeight from '@/hooks/useTableScrollHeight'; import Copy from '../../components/copy'; import { useVT } from 'virtualizedtableforantd4'; +import dayjs from 'dayjs'; const { Paragraph } = Typography; const { Search } = Input; @@ -137,13 +138,9 @@ const Env = () => { }, }, render: (text: string, record: any) => { - const language = navigator.language || navigator.languages[0]; - const time = record.updatedAt || record.timestamp; - const date = new Date(time) - .toLocaleString(language, { - hour12: false, - }) - .replace(' 24:', ' 00:'); + const date = dayjs(record.updatedAt || record.timestamp).format( + 'YYYY-MM-DD HH:mm:ss', + ); return ( { <>
{intl.get('上次登录时间：')} - {lastlogon ? new Date(lastlogon).toLocaleString() : '-'} + {lastlogon ? dayjs(lastlogon).format('YYYY-MM-DD HH:mm:ss') : '-'}
{intl.get('上次登录地点：')} diff --git a/src/pages/setting/loginLog.tsx b/src/pages/setting/loginLog.tsx index 8484431f..a3348b65 100644 --- a/src/pages/setting/loginLog.tsx +++ b/src/pages/setting/loginLog.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react'; import { Typography, Table, Tag, Button, Spin, message } from 'antd'; import { request } from '@/utils/http'; import config from '@/utils/config'; +import dayjs from 'dayjs'; const { Text, Link } = Typography; @@ -30,7 +31,7 @@ const columns = [ key: 'timestamp', width: 120, render: (text: string, record: any) => { - return new Date(record.timestamp).toLocaleString(); + return dayjs(record.timestamp).format('YYYY-MM-DD HH:mm:ss'); }, }, { diff --git a/src/utils/index.ts b/src/utils/index.ts index 28866e71..65b71e8c 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -329,7 +329,7 @@ export function getCommandScript( return [s, p]; } -export function parseCrontab(schedule: string): Date { +export function parseCrontab(schedule: string): Date | null { try { const time = cron_parser.parseExpression(schedule); if (time) { @@ -337,7 +337,20 @@ export function parseCrontab(schedule: string): Date { } } catch (error) { } - return new Date('1970'); + return null; +} + +export function getCrontabsNextDate(schedule: string, extra_schedules: string[]): Date | null { + let date = parseCrontab(schedule) + if (extra_schedules?.length) { + extra_schedules.forEach(x => { + const _date = parseCrontab(x) + if (_date && (!date || _date < date)) { + date = _date; + } + }) + } + return date; } export function getExtension(filename: string) {