You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/05/01 05:19:14 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Beta] Fix the problem that there is no prompt for selecting users. (#9858)
This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f9f91000fd [Fix][UI Next][V1.0.0-Beta] Fix the problem that there is no prompt for selecting users. (#9858)
f9f91000fd is described below
commit f9f91000fd69caa8f70a9ea12993f7c432d6d30b
Author: songjianet <17...@qq.com>
AuthorDate: Sun May 1 13:19:07 2022 +0800
[Fix][UI Next][V1.0.0-Beta] Fix the problem that there is no prompt for selecting users. (#9858)
* [Fix][UI Next][V1.0.0-Beta] Fix the problem that there is no prompt for selecting users.
* [Fix][UI Next][V1.0.0-Beta] Change update user to edit user.
* [Fix][UI Next][V1.0.0-Beta] Change update user to edit user.
---
dolphinscheduler-ui-next/package.json | 1 +
dolphinscheduler-ui-next/pnpm-lock.yaml | 596 +++++++++------------
.../src/locales/modules/en_US.ts | 2 +-
.../src/locales/modules/zh_CN.ts | 2 +-
.../token-manage/components/token-modal.tsx | 4 +-
.../security/token-manage/components/use-modal.ts | 6 +-
6 files changed, 274 insertions(+), 337 deletions(-)
diff --git a/dolphinscheduler-ui-next/package.json b/dolphinscheduler-ui-next/package.json
index c004ad58a2..cf2fbcf443 100644
--- a/dolphinscheduler-ui-next/package.json
+++ b/dolphinscheduler-ui-next/package.json
@@ -32,6 +32,7 @@
},
"devDependencies": {
"@types/js-cookie": "^3.0.1",
+ "@types/lodash": "^4.14.182",
"@types/node": "^16.11.25",
"@types/nprogress": "^0.2.0",
"@types/qs": "^6.9.7",
diff --git a/dolphinscheduler-ui-next/pnpm-lock.yaml b/dolphinscheduler-ui-next/pnpm-lock.yaml
index c5eabb63e8..768989e55e 100644
--- a/dolphinscheduler-ui-next/pnpm-lock.yaml
+++ b/dolphinscheduler-ui-next/pnpm-lock.yaml
@@ -21,6 +21,7 @@ specifiers:
'@antv/layout': ^0.1.31
'@antv/x6': ^1.30.1
'@types/js-cookie': ^3.0.1
+ '@types/lodash': ^4.14.182
'@types/node': ^16.11.25
'@types/nprogress': ^0.2.0
'@types/qs': ^6.9.7
@@ -85,6 +86,7 @@ dependencies:
devDependencies:
'@types/js-cookie': 3.0.1
+ '@types/lodash': 4.14.182
'@types/node': 16.11.25
'@types/nprogress': 0.2.0
'@types/qs': 6.9.7
@@ -576,7 +578,7 @@ packages:
engines: {node: '>= 12'}
dependencies:
'@intlify/shared': 9.2.0-beta.30
- source-map: registry.npmmirror.com/source-map/0.6.1
+ source-map: 0.6.1
dev: false
/@intlify/shared/9.2.0-beta.30:
@@ -678,12 +680,11 @@ packages:
/@types/lodash-es/4.17.6:
resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
dependencies:
- '@types/lodash': 4.14.178
+ '@types/lodash': 4.14.182
dev: false
- /@types/lodash/4.14.178:
- resolution: {integrity: sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==}
- dev: false
+ /@types/lodash/4.14.182:
+ resolution: {integrity: sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==}
/@types/node/14.14.45:
resolution: {integrity: sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==}
@@ -929,7 +930,7 @@ packages:
'@babel/parser': 7.17.3
'@vue/shared': 3.2.31
estree-walker: 2.0.2
- source-map: registry.npmmirror.com/source-map/0.6.1
+ source-map: 0.6.1
/@vue/compiler-dom/3.2.31:
resolution: {integrity: sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==}
@@ -1239,7 +1240,7 @@ packages:
normalize-path: 3.0.0
readdirp: 3.6.0
optionalDependencies:
- fsevents: registry.npmmirror.com/fsevents/2.3.2
+ fsevents: 2.3.2
dev: true
/color-convert/1.9.3:
@@ -1318,7 +1319,7 @@ packages:
resolution: {integrity: sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==}
dependencies:
inherits: 2.0.4
- source-map: registry.npmmirror.com/source-map/0.6.1
+ source-map: 0.6.1
source-map-resolve: 0.5.3
urix: 0.1.0
dev: true
@@ -1500,31 +1501,211 @@ packages:
engines: {node: '>=0.12'}
dev: true
+ /errno/0.1.8:
+ resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
+ hasBin: true
+ requiresBuild: true
+ dependencies:
+ prr: 1.0.1
+ dev: true
+ optional: true
+
+ /esbuild-android-arm64/0.14.23:
+ resolution: {integrity: sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [android]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-darwin-64/0.14.23:
+ resolution: {integrity: sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [darwin]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-darwin-arm64/0.14.23:
+ resolution: {integrity: sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [darwin]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-freebsd-64/0.14.23:
+ resolution: {integrity: sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [freebsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-freebsd-arm64/0.14.23:
+ resolution: {integrity: sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [freebsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-32/0.14.23:
+ resolution: {integrity: sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-64/0.14.23:
+ resolution: {integrity: sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-arm/0.14.23:
+ resolution: {integrity: sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==}
+ engines: {node: '>=12'}
+ cpu: [arm]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-arm64/0.14.23:
+ resolution: {integrity: sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-mips64le/0.14.23:
+ resolution: {integrity: sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==}
+ engines: {node: '>=12'}
+ cpu: [mips64el]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-ppc64le/0.14.23:
+ resolution: {integrity: sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==}
+ engines: {node: '>=12'}
+ cpu: [ppc64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-riscv64/0.14.23:
+ resolution: {integrity: sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==}
+ engines: {node: '>=12'}
+ cpu: [riscv64]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-linux-s390x/0.14.23:
+ resolution: {integrity: sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==}
+ engines: {node: '>=12'}
+ cpu: [s390x]
+ os: [linux]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-netbsd-64/0.14.23:
+ resolution: {integrity: sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [netbsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-openbsd-64/0.14.23:
+ resolution: {integrity: sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [openbsd]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-sunos-64/0.14.23:
+ resolution: {integrity: sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [sunos]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-windows-32/0.14.23:
+ resolution: {integrity: sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==}
+ engines: {node: '>=12'}
+ cpu: [ia32]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-windows-64/0.14.23:
+ resolution: {integrity: sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==}
+ engines: {node: '>=12'}
+ cpu: [x64]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
+ /esbuild-windows-arm64/0.14.23:
+ resolution: {integrity: sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==}
+ engines: {node: '>=12'}
+ cpu: [arm64]
+ os: [win32]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/esbuild/0.14.23:
resolution: {integrity: sha512-XjnIcZ9KB6lfonCa+jRguXyRYcldmkyZ99ieDksqW/C8bnyEX299yA4QH2XcgijCgaddEZePPTgvx/2imsq7Ig==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
optionalDependencies:
- esbuild-android-arm64: registry.npmmirror.com/esbuild-android-arm64/0.14.23
- esbuild-darwin-64: registry.npmmirror.com/esbuild-darwin-64/0.14.23
- esbuild-darwin-arm64: registry.npmmirror.com/esbuild-darwin-arm64/0.14.23
- esbuild-freebsd-64: registry.npmmirror.com/esbuild-freebsd-64/0.14.23
- esbuild-freebsd-arm64: registry.npmmirror.com/esbuild-freebsd-arm64/0.14.23
- esbuild-linux-32: registry.npmmirror.com/esbuild-linux-32/0.14.23
- esbuild-linux-64: registry.npmmirror.com/esbuild-linux-64/0.14.23
- esbuild-linux-arm: registry.npmmirror.com/esbuild-linux-arm/0.14.23
- esbuild-linux-arm64: registry.npmmirror.com/esbuild-linux-arm64/0.14.23
- esbuild-linux-mips64le: registry.npmmirror.com/esbuild-linux-mips64le/0.14.23
- esbuild-linux-ppc64le: registry.npmmirror.com/esbuild-linux-ppc64le/0.14.23
- esbuild-linux-riscv64: registry.npmmirror.com/esbuild-linux-riscv64/0.14.23
- esbuild-linux-s390x: registry.npmmirror.com/esbuild-linux-s390x/0.14.23
- esbuild-netbsd-64: registry.npmmirror.com/esbuild-netbsd-64/0.14.23
- esbuild-openbsd-64: registry.npmmirror.com/esbuild-openbsd-64/0.14.23
- esbuild-sunos-64: registry.npmmirror.com/esbuild-sunos-64/0.14.23
- esbuild-windows-32: registry.npmmirror.com/esbuild-windows-32/0.14.23
- esbuild-windows-64: registry.npmmirror.com/esbuild-windows-64/0.14.23
- esbuild-windows-arm64: registry.npmmirror.com/esbuild-windows-arm64/0.14.23
+ esbuild-android-arm64: 0.14.23
+ esbuild-darwin-64: 0.14.23
+ esbuild-darwin-arm64: 0.14.23
+ esbuild-freebsd-64: 0.14.23
+ esbuild-freebsd-arm64: 0.14.23
+ esbuild-linux-32: 0.14.23
+ esbuild-linux-64: 0.14.23
+ esbuild-linux-arm: 0.14.23
+ esbuild-linux-arm64: 0.14.23
+ esbuild-linux-mips64le: 0.14.23
+ esbuild-linux-ppc64le: 0.14.23
+ esbuild-linux-riscv64: 0.14.23
+ esbuild-linux-s390x: 0.14.23
+ esbuild-netbsd-64: 0.14.23
+ esbuild-openbsd-64: 0.14.23
+ esbuild-sunos-64: 0.14.23
+ esbuild-windows-32: 0.14.23
+ esbuild-windows-64: 0.14.23
+ esbuild-windows-arm64: 0.14.23
dev: true
/escalade/3.1.1:
@@ -1798,6 +1979,14 @@ packages:
resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=}
dev: true
+ /fsevents/2.3.2:
+ resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+ engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+ os: [darwin]
+ requiresBuild: true
+ dev: true
+ optional: true
+
/function-bind/1.1.1:
resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
@@ -1972,6 +2161,14 @@ packages:
engines: {node: '>= 4'}
dev: true
+ /image-size/0.5.5:
+ resolution: {integrity: sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=}
+ engines: {node: '>=0.10.0'}
+ hasBin: true
+ requiresBuild: true
+ dev: true
+ optional: true
+
/immutable/4.0.0:
resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==}
dev: true
@@ -2159,7 +2356,7 @@ packages:
dependencies:
universalify: 2.0.0
optionalDependencies:
- graceful-fs: registry.npmmirror.com/graceful-fs/4.2.9
+ graceful-fs: 4.2.9
dev: true
/jstransformer/1.0.0:
@@ -2183,13 +2380,13 @@ packages:
parse-node-version: 1.0.1
tslib: 2.3.1
optionalDependencies:
- errno: registry.npmmirror.com/errno/0.1.8
- graceful-fs: registry.npmmirror.com/graceful-fs/4.2.9
- image-size: registry.npmmirror.com/image-size/0.5.5
- make-dir: registry.npmmirror.com/make-dir/2.1.0
- mime: registry.npmmirror.com/mime/1.6.0
- needle: registry.npmmirror.com/needle/2.9.1
- source-map: registry.npmmirror.com/source-map/0.6.1
+ errno: 0.1.8
+ graceful-fs: 4.2.9
+ image-size: 0.5.5
+ make-dir: 2.1.0
+ mime: 1.6.0
+ needle: 2.9.1
+ source-map: 0.6.1
dev: true
/levn/0.4.1:
@@ -2242,6 +2439,16 @@ packages:
sourcemap-codec: 1.4.8
dev: false
+ /make-dir/2.1.0:
+ resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
+ engines: {node: '>=6'}
+ requiresBuild: true
+ dependencies:
+ pify: 4.0.1
+ semver: 5.7.1
+ dev: true
+ optional: true
+
/merge2/1.4.1:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'}
@@ -2255,6 +2462,14 @@ packages:
picomatch: 2.3.1
dev: true
+ /mime/1.6.0:
+ resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+ engines: {node: '>=4'}
+ hasBin: true
+ requiresBuild: true
+ dev: true
+ optional: true
+
/minimatch/3.1.2:
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
dependencies:
@@ -2325,7 +2540,7 @@ packages:
dependencies:
'@css-render/plugin-bem': 0.15.8_css-render@0.15.8
'@css-render/vue3-ssr': 0.15.8_vue@3.2.31
- '@types/lodash': 4.14.178
+ '@types/lodash': 4.14.182
'@types/lodash-es': 4.17.6
async-validator: 4.0.7
css-render: 0.15.8
@@ -2353,6 +2568,18 @@ packages:
resolution: {integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=}
dev: true
+ /needle/2.9.1:
+ resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==}
+ engines: {node: '>= 4.4.x'}
+ hasBin: true
+ requiresBuild: true
+ dependencies:
+ debug: 3.2.7
+ iconv-lite: 0.4.24
+ sax: 1.2.4
+ dev: true
+ optional: true
+
/neo-async/2.6.2:
resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
dev: true
@@ -2526,7 +2753,7 @@ packages:
engines: {node: '>=4.0.0'}
dependencies:
chalk: 2.4.2
- source-map: registry.npmmirror.com/source-map/0.6.1
+ source-map: 0.6.1
supports-color: 5.5.0
dev: true
@@ -2768,7 +2995,7 @@ packages:
engines: {node: '>=10.0.0'}
hasBin: true
optionalDependencies:
- fsevents: registry.npmmirror.com/fsevents/2.3.2
+ fsevents: 2.3.2
dev: true
/run-parallel/1.2.0:
@@ -2901,7 +3128,6 @@ packages:
/source-map/0.6.1:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
engines: {node: '>=0.10.0'}
- dev: false
/source-map/0.7.3:
resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==}
@@ -3143,7 +3369,7 @@ packages:
rollup: 2.68.0
sass: 1.49.8
optionalDependencies:
- fsevents: registry.npmmirror.com/fsevents/2.3.2
+ fsevents: 2.3.2
dev: true
/void-elements/3.1.0:
@@ -3420,299 +3646,9 @@ packages:
date-fns: 2.28.0
dev: false
- registry.npmmirror.com/errno/0.1.8:
- resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz}
- name: errno
- version: 0.1.8
- hasBin: true
- requiresBuild: true
- dependencies:
- prr: 1.0.1
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-android-arm64/0.14.23:
- resolution: {integrity: sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.23.tgz}
- name: esbuild-android-arm64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [android]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-darwin-64/0.14.23:
- resolution: {integrity: sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.23.tgz}
- name: esbuild-darwin-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-darwin-arm64/0.14.23:
- resolution: {integrity: sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.23.tgz}
- name: esbuild-darwin-arm64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-freebsd-64/0.14.23:
- resolution: {integrity: sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.23.tgz}
- name: esbuild-freebsd-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [freebsd]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-freebsd-arm64/0.14.23:
- resolution: {integrity: sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.23.tgz}
- name: esbuild-freebsd-arm64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [freebsd]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-32/0.14.23:
- resolution: {integrity: sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.23.tgz}
- name: esbuild-linux-32
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-64/0.14.23:
- resolution: {integrity: sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.23.tgz}
- name: esbuild-linux-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-arm/0.14.23:
- resolution: {integrity: sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.23.tgz}
- name: esbuild-linux-arm
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-arm64/0.14.23:
- resolution: {integrity: sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.23.tgz}
- name: esbuild-linux-arm64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-mips64le/0.14.23:
- resolution: {integrity: sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.23.tgz}
- name: esbuild-linux-mips64le
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [mips64el]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-ppc64le/0.14.23:
- resolution: {integrity: sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.23.tgz}
- name: esbuild-linux-ppc64le
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-riscv64/0.14.23:
- resolution: {integrity: sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.23.tgz}
- name: esbuild-linux-riscv64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [riscv64]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-linux-s390x/0.14.23:
- resolution: {integrity: sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.23.tgz}
- name: esbuild-linux-s390x
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [s390x]
- os: [linux]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-netbsd-64/0.14.23:
- resolution: {integrity: sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.23.tgz}
- name: esbuild-netbsd-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [netbsd]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-openbsd-64/0.14.23:
- resolution: {integrity: sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.23.tgz}
- name: esbuild-openbsd-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [openbsd]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-sunos-64/0.14.23:
- resolution: {integrity: sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.23.tgz}
- name: esbuild-sunos-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [sunos]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-windows-32/0.14.23:
- resolution: {integrity: sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.23.tgz}
- name: esbuild-windows-32
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-windows-64/0.14.23:
- resolution: {integrity: sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.23.tgz}
- name: esbuild-windows-64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [x64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/esbuild-windows-arm64/0.14.23:
- resolution: {integrity: sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.23.tgz}
- name: esbuild-windows-arm64
- version: 0.14.23
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [win32]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/fsevents/2.3.2:
- resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz}
- name: fsevents
- version: 2.3.2
- engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
- os: [darwin]
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/graceful-fs/4.2.9:
- resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.9.tgz}
- name: graceful-fs
- version: 4.2.9
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/image-size/0.5.5:
- resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz}
- name: image-size
- version: 0.5.5
- engines: {node: '>=0.10.0'}
- hasBin: true
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/make-dir/2.1.0:
- resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz}
- name: make-dir
- version: 2.1.0
- engines: {node: '>=6'}
- requiresBuild: true
- dependencies:
- pify: 4.0.1
- semver: 5.7.1
- dev: true
- optional: true
-
- registry.npmmirror.com/mime/1.6.0:
- resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz}
- name: mime
- version: 1.6.0
- engines: {node: '>=4'}
- hasBin: true
- requiresBuild: true
- dev: true
- optional: true
-
- registry.npmmirror.com/needle/2.9.1:
- resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/needle/-/needle-2.9.1.tgz}
- name: needle
- version: 2.9.1
- engines: {node: '>= 4.4.x'}
- hasBin: true
- requiresBuild: true
- dependencies:
- debug: 3.2.7
- iconv-lite: 0.4.24
- sax: 1.2.4
- dev: true
- optional: true
-
registry.npmmirror.com/screenfull/6.0.1:
resolution: {integrity: sha512-yzQW+j4zMUBQC51xxWaoDYjxOtl8Kn+xvue3p6v/fv2pIi1jH4AldgVLU8TBfFVgH2x3VXlf3+YiA/AYIPlaew==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/screenfull/-/screenfull-6.0.1.tgz}
name: screenfull
version: 6.0.1
engines: {node: ^14.13.1 || >=16.0.0}
dev: false
-
- registry.npmmirror.com/source-map/0.6.1:
- resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz}
- name: source-map
- version: 0.6.1
- engines: {node: '>=0.10.0'}
diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index 8be53ab7b3..8ba27c7349 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@@ -1035,7 +1035,7 @@ const security = {
user: 'User',
user_tips: 'Please select user',
token: 'Token',
- token_tips: 'Please enter your token',
+ token_tips: 'Please click to get token',
expiration_time: 'Expiration Time',
expiration_time_tips: 'Please select expiration time',
create_time: 'Create Time',
diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
index 3f898a7943..73dbacbc4b 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@@ -1023,7 +1023,7 @@ const security = {
user: '用户',
user_tips: '请选择用户',
token: '令牌',
- token_tips: '请输入令牌',
+ token_tips: '请点击获取令牌',
expiration_time: '失效时间',
expiration_time_tips: '请选择失效时间',
create_time: '创建时间',
diff --git a/dolphinscheduler-ui-next/src/views/security/token-manage/components/token-modal.tsx b/dolphinscheduler-ui-next/src/views/security/token-manage/components/token-modal.tsx
index 559e8fe3b4..4fe99eaeb8 100644
--- a/dolphinscheduler-ui-next/src/views/security/token-manage/components/token-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/token-manage/components/token-modal.tsx
@@ -64,7 +64,7 @@ const TokenModal = defineComponent({
variables.model.userId =
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
- : ''
+ : null
variables.model.expireTime = Date.now()
variables.model.token = ''
} else {
@@ -101,7 +101,7 @@ const TokenModal = defineComponent({
variables.model.userId =
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
- : ''
+ : null
variables.model.expireTime = Date.now()
variables.model.token = ''
} else {
diff --git a/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts b/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts
index abbaa19a3f..1a05ee5cb2 100644
--- a/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts
+++ b/dolphinscheduler-ui-next/src/views/security/token-manage/components/use-modal.ts
@@ -42,7 +42,7 @@ export function useModal(
userId: ref(
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
- : ''
+ : null
),
expireTime: ref(Date.now()),
token: ref(''),
@@ -54,7 +54,7 @@ export function useModal(
required: true,
trigger: ['input', 'blur'],
validator() {
- if (variables.model.userId === '') {
+ if (!variables.model.userId) {
return new Error(t('security.token.user_tips'))
}
}
@@ -137,7 +137,7 @@ export function useModal(
variables.model.userId =
(userStore.getUserInfo as UserInfoRes).userType === 'GENERAL_USER'
? (userStore.getUserInfo as UserInfoRes).id
- : ''
+ : null
variables.model.expireTime = Date.now()
variables.model.token = ''
ctx.emit('confirmModal', props.showModalRef)