diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index ed940fcdb..71bf0dc2e 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -59,7 +59,7 @@ "devDependencies": { "@commitlint/cli": "^17.2.0", "@commitlint/config-conventional": "^17.2.0", - "@iconify/json": "^2.1.138", + "@iconify/json": "^2.1.139", "@intlify/vite-plugin-vue-i18n": "^6.0.3", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", @@ -95,7 +95,7 @@ "stylelint-order": "^5.0.0", "typescript": "4.8.4", "unplugin-vue-macros": "^0.16.3", - "vite": "3.2.3", + "vite": "3.2.4", "vite-plugin-compression": "^0.5.1", "vite-plugin-eslint": "^1.8.1", "vite-plugin-html": "^3.2.0", diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index 544f6e394..5f86e4bd7 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -4,7 +4,7 @@ specifiers: '@commitlint/cli': ^17.2.0 '@commitlint/config-conventional': ^17.2.0 '@iconify/iconify': ^3.0.0 - '@iconify/json': ^2.1.138 + '@iconify/json': ^2.1.139 '@intlify/vite-plugin-vue-i18n': ^6.0.3 '@purge-icons/generated': ^0.9.0 '@types/intro.js': ^5.1.0 @@ -61,7 +61,7 @@ specifiers: typescript: 4.8.4 unplugin-vue-macros: ^0.16.3 url: ^0.11.0 - vite: 3.2.3 + vite: 3.2.4 vite-plugin-compression: ^0.5.1 vite-plugin-eslint: ^1.8.1 vite-plugin-html: ^3.2.0 @@ -115,8 +115,8 @@ dependencies: devDependencies: '@commitlint/cli': 17.2.0 '@commitlint/config-conventional': 17.2.0 - '@iconify/json': 2.1.138 - '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.2.3+vue-i18n@9.2.2 + '@iconify/json': 2.1.139 + '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.2.4+vue-i18n@9.2.2 '@purge-icons/generated': 0.9.0 '@types/intro.js': 5.1.0 '@types/lodash-es': 4.17.6 @@ -126,8 +126,8 @@ devDependencies: '@types/qs': 6.9.7 '@typescript-eslint/eslint-plugin': 5.43.0_yy4vf4gcvxiubmg7fqa55dqe2i '@typescript-eslint/parser': 5.43.0_rmayb2veg2btbq6mbmnyivgasy - '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.45 - '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.3+vue@3.2.45 + '@vitejs/plugin-vue': 3.2.0_vite@3.2.4+vue@3.2.45 + '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.4+vue@3.2.45 autoprefixer: 10.4.13_postcss@8.4.19 eslint: 8.27.0 eslint-config-prettier: 8.5.0_eslint@8.27.0 @@ -150,15 +150,15 @@ devDependencies: stylelint-config-standard: 29.0.0_stylelint@14.15.0 stylelint-order: 5.0.0_stylelint@14.15.0 typescript: 4.8.4 - unplugin-vue-macros: 0.16.3_mghlipbkxnxld5kp6aysmuv2fa - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi - vite-plugin-compression: 0.5.1_vite@3.2.3 - vite-plugin-eslint: 1.8.1_eslint@8.27.0+vite@3.2.3 - vite-plugin-html: 3.2.0_vite@3.2.3 - vite-plugin-purge-icons: 0.9.1_vite@3.2.3 - vite-plugin-style-import: 2.0.0_vite@3.2.3 - vite-plugin-svg-icons: 2.0.1_vite@3.2.3 - vite-plugin-windicss: 1.8.8_vite@3.2.3 + unplugin-vue-macros: 0.16.3_drqowttw7xgwfzqyhu6wuedde4 + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite-plugin-compression: 0.5.1_vite@3.2.4 + vite-plugin-eslint: 1.8.1_eslint@8.27.0+vite@3.2.4 + vite-plugin-html: 3.2.0_vite@3.2.4 + vite-plugin-purge-icons: 0.9.1_vite@3.2.4 + vite-plugin-style-import: 2.0.0_vite@3.2.4 + vite-plugin-svg-icons: 2.0.1_vite@3.2.4 + vite-plugin-windicss: 1.8.8_vite@3.2.4 vue-tsc: 1.0.9_typescript@4.8.4 windicss: 3.5.6 @@ -574,11 +574,11 @@ packages: '@types/node': 14.18.31 chalk: 4.1.2 cosmiconfig: 7.0.1 - cosmiconfig-typescript-loader: 4.1.1_gpl3msxjb2n3qdkii2jvdrcxxe + cosmiconfig-typescript-loader: 4.1.1_kjtesrzmdzjxgbmvhf7rq2qmfi lodash: 4.17.21 resolve-from: 5.0.0 - ts-node: 10.9.1_fk6arlf3j7tudlucddpzvj2plq - typescript: 4.8.4 + ts-node: 10.9.1_zdwmxzc3s32eishk7hircltqdy + typescript: 4.9.3 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -760,8 +760,8 @@ packages: dependencies: '@iconify/types': 2.0.0 - /@iconify/json/2.1.138: - resolution: {integrity: sha512-migiXo9NKjkc3ob3qRzjdfecyFo39eziD9IY+LbNooQwyU8CS+WoeNtoI34Sf2+3DrV69H0kxeLf3bFQ+nKvew==} + /@iconify/json/2.1.139: + resolution: {integrity: sha512-H/DQ/yVgdUk4x4hU696fy0mZOkvLQaR6REQU/okFLgaiIFOS+EWw6GV5JDSKbbkh0YVaxUrAUaqB8XTSFVrFeA==} dependencies: '@iconify/types': 2.0.0 pathe: 0.3.9 @@ -829,7 +829,7 @@ packages: engines: {node: '>= 14'} dev: true - /@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.2.3+vue-i18n@9.2.2: + /@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.2.4+vue-i18n@9.2.2: resolution: {integrity: sha512-6SgNzPAOCR90wvt368lKzi7f/5ZEWJn22UCGvhFsP3XvKqlF3cVzojahgQ6o+LTdCkExeM6wPgd+haFf28E9VQ==} engines: {node: '>= 14.6'} peerDependencies: @@ -850,7 +850,7 @@ packages: debug: 4.3.4 fast-glob: 3.2.12 source-map: 0.6.1 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi vue-i18n: 9.2.2_vue@3.2.45 transitivePeerDependencies: - supports-color @@ -1263,7 +1263,7 @@ packages: nanoid: 3.3.4 dev: false - /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.45: + /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.4+vue@3.2.45: resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -1273,20 +1273,20 @@ packages: '@babel/core': 7.19.6 '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.19.6 '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.19.6 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi vue: 3.2.45 transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue/3.2.0_vite@3.2.3+vue@3.2.45: + /@vitejs/plugin-vue/3.2.0_vite@3.2.4+vue@3.2.45: resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi vue: 3.2.45 dev: true @@ -1418,16 +1418,16 @@ packages: unplugin: 0.10.2 dev: true - /@vue-macros/named-template/0.0.5_poefzxy2vtculed3kqru6isufm: + /@vue-macros/named-template/0.0.5_ygspmtsr7jejaf6wke2f4dns5a: resolution: {integrity: sha512-bZRUljNyvOOqeE9dyqXvKPQCLUCcPt1EkThmXqSbxagV29ohyviF8+CCs/8OdmNygLTBIChjP8DexQ3nUIFzUg==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.45 + '@vitejs/plugin-vue': 3.2.0_vite@3.2.4+vue@3.2.45 '@vue-macros/common': 0.13.3 '@vue/compiler-dom': 3.2.45 unplugin: 0.10.2 - unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.3 + unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.4 transitivePeerDependencies: - esbuild - rollup @@ -1436,14 +1436,14 @@ packages: - webpack dev: true - /@vue-macros/setup-component/0.12.7_rollup@3.3.0+vite@3.2.3: + /@vue-macros/setup-component/0.12.7_rollup@3.3.0+vite@3.2.4: resolution: {integrity: sha512-L0WkJgw0QDwZh4tOjjKIDR0DMIybiOunsaxVqkJjicTb2YaiRUSLq4Wadl8Ttrsd0IEfI51CSlg7Sx0/dKLrlQ==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 '@vue-macros/common': 0.13.3 unplugin: 0.10.2 - unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.3 + unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.4 transitivePeerDependencies: - esbuild - rollup @@ -2615,7 +2615,7 @@ packages: vary: 1.1.2 dev: true - /cosmiconfig-typescript-loader/4.1.1_gpl3msxjb2n3qdkii2jvdrcxxe: + /cosmiconfig-typescript-loader/4.1.1_kjtesrzmdzjxgbmvhf7rq2qmfi: resolution: {integrity: sha512-9DHpa379Gp0o0Zefii35fcmuuin6q92FnLDffzdZ0l9tVd3nEobG3O+MZ06+kuBvFTSVScvNb/oHA13Nd4iipg==} engines: {node: '>=12', npm: '>=6'} peerDependencies: @@ -2626,8 +2626,8 @@ packages: dependencies: '@types/node': 14.18.31 cosmiconfig: 7.0.1 - ts-node: 10.9.1_fk6arlf3j7tudlucddpzvj2plq - typescript: 4.8.4 + ts-node: 10.9.1_zdwmxzc3s32eishk7hircltqdy + typescript: 4.9.3 dev: true /cosmiconfig/7.0.1: @@ -6673,7 +6673,7 @@ packages: engines: {node: '>=8'} dev: true - /ts-node/10.9.1_fk6arlf3j7tudlucddpzvj2plq: + /ts-node/10.9.1_zdwmxzc3s32eishk7hircltqdy: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -6699,7 +6699,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.8.4 + typescript: 4.9.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -6771,6 +6771,12 @@ packages: engines: {node: '>=4.2.0'} hasBin: true + /typescript/4.9.3: + resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /uglify-js/3.17.3: resolution: {integrity: sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==} engines: {node: '>=0.8.0'} @@ -6799,7 +6805,7 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin-combine/0.2.8_rollup@3.3.0+vite@3.2.3: + /unplugin-combine/0.2.8_rollup@3.3.0+vite@3.2.4: resolution: {integrity: sha512-Z38AC/TEjXbVyZ5HjVqo+lADj0/dcfwWC0Z4y0LNhybJzJQwmcMxm+ZsqHY3faauj4YigmlRMdptR5JEW9RuLg==} engines: {node: '>=14.19.0'} peerDependencies: @@ -6820,7 +6826,7 @@ packages: '@antfu/utils': 0.6.0 rollup: 3.3.0 unplugin: 0.10.2 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi dev: true /unplugin-vue-define-options/0.12.7: @@ -6833,7 +6839,7 @@ packages: unplugin: 0.10.2 dev: true - /unplugin-vue-macros/0.16.3_mghlipbkxnxld5kp6aysmuv2fa: + /unplugin-vue-macros/0.16.3_drqowttw7xgwfzqyhu6wuedde4: resolution: {integrity: sha512-ADdDS5EjHRZ2esEHSNBw7CS7QLWpqvNJIW0H5EqKgSvtQ+2Hnb8IeRVT0f4mR+wyQvl/ZrlpTs1GvZdsh8eSlw==} engines: {node: '>=14.19.0'} peerDependencies: @@ -6846,12 +6852,12 @@ packages: '@vue-macros/define-render': 0.13.8_vue@3.2.45 '@vue-macros/define-slots': 0.0.5_vue@3.2.45 '@vue-macros/hoist-static': 0.12.7 - '@vue-macros/named-template': 0.0.5_poefzxy2vtculed3kqru6isufm - '@vue-macros/setup-component': 0.12.7_rollup@3.3.0+vite@3.2.3 + '@vue-macros/named-template': 0.0.5_ygspmtsr7jejaf6wke2f4dns5a + '@vue-macros/setup-component': 0.12.7_rollup@3.3.0+vite@3.2.4 '@vue-macros/setup-sfc': 0.12.7 '@vue-macros/short-emits': 0.12.8 local-pkg: 0.4.2 - unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.3 + unplugin-combine: 0.2.8_rollup@3.3.0+vite@3.2.4 unplugin-vue-define-options: 0.12.7 vue: 3.2.45 transitivePeerDependencies: @@ -6954,7 +6960,7 @@ packages: engines: {node: '>= 0.8'} dev: true - /vite-plugin-compression/0.5.1_vite@3.2.3: + /vite-plugin-compression/0.5.1_vite@3.2.4: resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -6962,12 +6968,12 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi transitivePeerDependencies: - supports-color dev: true - /vite-plugin-eslint/1.8.1_eslint@8.27.0+vite@3.2.3: + /vite-plugin-eslint/1.8.1_eslint@8.27.0+vite@3.2.4: resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -6977,10 +6983,10 @@ packages: '@types/eslint': 8.4.6 eslint: 8.27.0 rollup: 2.79.1 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi dev: true - /vite-plugin-html/3.2.0_vite@3.2.3: + /vite-plugin-html/3.2.0_vite@3.2.4: resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==} peerDependencies: vite: '>=2.0.0' @@ -6997,10 +7003,10 @@ packages: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi dev: true - /vite-plugin-purge-icons/0.9.1_vite@3.2.3: + /vite-plugin-purge-icons/0.9.1_vite@3.2.4: resolution: {integrity: sha512-oS0Y9Iq6vGnTDVRzB8xJNhA/gGlyR0lfCICU6+9FRKdrO5PnT34fRjvd8YWEsegCrk91+w3GVZc0HJDj/dPp5Q==} engines: {node: '>= 12'} peerDependencies: @@ -7009,13 +7015,13 @@ packages: '@purge-icons/core': 0.9.1 '@purge-icons/generated': 0.9.0 rollup-plugin-purge-icons: 0.9.1 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi transitivePeerDependencies: - encoding - supports-color dev: true - /vite-plugin-style-import/2.0.0_vite@3.2.3: + /vite-plugin-style-import/2.0.0_vite@3.2.4: resolution: {integrity: sha512-qtoHQae5dSUQPo/rYz/8p190VU5y19rtBaeV7ryLa/AYAU/e9CG89NrN/3+k7MR8mJy/GPIu91iJ3zk9foUOSA==} peerDependencies: vite: '>=2.0.0' @@ -7027,10 +7033,10 @@ packages: fs-extra: 10.1.0 magic-string: 0.25.9 pathe: 0.2.0 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi dev: true - /vite-plugin-svg-icons/2.0.1_vite@3.2.3: + /vite-plugin-svg-icons/2.0.1_vite@3.2.4: resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -7043,12 +7049,12 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi transitivePeerDependencies: - supports-color dev: true - /vite-plugin-windicss/1.8.8_vite@3.2.3: + /vite-plugin-windicss/1.8.8_vite@3.2.4: resolution: {integrity: sha512-iyu+ZX0NmhNEUaLPv7xtC+EFRBpWMmw0nhd9a9upayfuNG/thwslKiQKmRB7U/dG0k/2oWLvPDvN/B9i7oRgSA==} peerDependencies: vite: ^2.0.1 || ^3.0.0 @@ -7056,14 +7062,14 @@ packages: '@windicss/plugin-utils': 1.8.8 debug: 4.3.4 kolorist: 1.6.0 - vite: 3.2.3_mp5lu76ee5qtwstsyca37sdhqi + vite: 3.2.4_mp5lu76ee5qtwstsyca37sdhqi windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true - /vite/3.2.3_mp5lu76ee5qtwstsyca37sdhqi: - resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==} + /vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi: + resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts index 4938dd852..fd32aab38 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts @@ -74,6 +74,7 @@ const crudSchemas = reactive({ { title: '最后登录时间', field: 'loginDate', + formatter: 'formatDate', isForm: false }, {