yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: resolve issue with Upload component not working correctly inside Form (#4916)

pull/48/MERGE
Vben 2024-11-17 21:37:37 +08:00 committed by GitHub
parent fe58af2e78
commit dbcb7138f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 896 additions and 887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/lint-configs/eslint-config/src/configs/unicorn.ts
View File

@ -18,6 +18,7 @@ export async function unicorn(): Promise<Linter.Config[]> {
'unicorn/better-regex': 'off', 'unicorn/better-regex': 'off',
'unicorn/consistent-destructuring': 'off', 'unicorn/consistent-destructuring': 'off',
'unicorn/consistent-function-scoping': 'off', 'unicorn/consistent-function-scoping': 'off',
'unicorn/expiring-todo-comments': 'off',
'unicorn/filename-case': 'off', 'unicorn/filename-case': 'off',
'unicorn/import-style': 'off', 'unicorn/import-style': 'off',
'unicorn/no-array-for-each': 'off', 'unicorn/no-array-for-each': 'off',

2
package.json
View File

@ -99,7 +99,7 @@
"node": ">=20.10.0", "node": ">=20.10.0",
"pnpm": ">=9.12.0" "pnpm": ">=9.12.0"
}, },
"packageManager": "pnpm@9.13.0", "packageManager": "pnpm@9.13.2",
"pnpm": { "pnpm": {
"peerDependencyRules": { "peerDependencyRules": {
"allowedVersions": { "allowedVersions": {

4
packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
View File

@ -209,8 +209,9 @@ function fieldBindEvent(slotProps: Record<string, any>) {
if (modelValue && isObject(modelValue) && bindEventField) { if (modelValue && isObject(modelValue) && bindEventField) {
value = isEventObjectLike(modelValue) value = isEventObjectLike(modelValue)
? modelValue?.target?.[bindEventField] ? modelValue?.target?.[bindEventField]
: modelValue; : (modelValue?.[bindEventField] ?? modelValue);
} }
if (bindEventField) { if (bindEventField) {
return { return {
[`onUpdate:${bindEventField}`]: handler, [`onUpdate:${bindEventField}`]: handler,
@ -223,6 +224,7 @@ function fieldBindEvent(slotProps: Record<string, any>) {
if (!shouldUnwrap) { if (!shouldUnwrap) {
return onChange?.(e); return onChange?.(e);
} }
return onChange?.(e?.target?.[bindEventField] ?? e); return onChange?.(e?.target?.[bindEventField] ?? e);
}, },
onInput: () => {}, onInput: () => {},

1736
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

40
pnpm-workspace.yaml
View File

@ -17,17 +17,17 @@ catalog:
'@changesets/changelog-github': ^0.5.0 '@changesets/changelog-github': ^0.5.0
'@changesets/cli': ^2.27.9 '@changesets/cli': ^2.27.9
'@changesets/git': ^3.0.1 '@changesets/git': ^3.0.1
'@clack/prompts': ^0.7.0 '@clack/prompts': ^0.8.1
'@commitlint/cli': ^19.5.0 '@commitlint/cli': ^19.5.0
'@commitlint/config-conventional': ^19.5.0 '@commitlint/config-conventional': ^19.5.0
'@ctrl/tinycolor': ^4.1.0 '@ctrl/tinycolor': ^4.1.0
'@eslint/js': ^9.14.0 '@eslint/js': ^9.15.0
'@faker-js/faker': ^9.2.0 '@faker-js/faker': ^9.2.0
'@iconify/json': ^2.2.271 '@iconify/json': ^2.2.273
'@iconify/tailwind': ^1.1.3 '@iconify/tailwind': ^1.1.3
'@iconify/vue': ^4.1.2 '@iconify/vue': ^4.1.2
'@intlify/core-base': ^10.0.4 '@intlify/core-base': ^10.0.4
'@intlify/unplugin-vue-i18n': ^5.3.1 '@intlify/unplugin-vue-i18n': ^6.0.0
'@jspm/generator': ^2.4.1 '@jspm/generator': ^2.4.1
'@manypkg/get-packages': ^2.2.2 '@manypkg/get-packages': ^2.2.2
'@nolebase/vitepress-plugin-git-changelog': ^2.9.0 '@nolebase/vitepress-plugin-git-changelog': ^2.9.0
@ -36,7 +36,7 @@ catalog:
'@stylistic/stylelint-plugin': ^3.1.1 '@stylistic/stylelint-plugin': ^3.1.1
'@tailwindcss/nesting': 0.0.0-insiders.565cd3e '@tailwindcss/nesting': 0.0.0-insiders.565cd3e
'@tailwindcss/typography': ^0.5.15 '@tailwindcss/typography': ^0.5.15
'@tanstack/vue-query': ^5.59.20 '@tanstack/vue-query': ^5.60.5
'@tanstack/vue-store': ^0.5.7 '@tanstack/vue-store': ^0.5.7
'@types/archiver': ^6.0.3 '@types/archiver': ^6.0.3
'@types/eslint': ^9.6.1 '@types/eslint': ^9.6.1
@ -55,8 +55,8 @@ catalog:
'@vite-pwa/vitepress': ^0.5.3 '@vite-pwa/vitepress': ^0.5.3
'@vitejs/plugin-vue': ^5.2.0 '@vitejs/plugin-vue': ^5.2.0
'@vitejs/plugin-vue-jsx': ^4.1.0 '@vitejs/plugin-vue-jsx': ^4.1.0
'@vue/reactivity': ^3.5.12 '@vue/reactivity': ^3.5.13
'@vue/shared': ^3.5.12 '@vue/shared': ^3.5.13
'@vue/test-utils': ^2.4.6 '@vue/test-utils': ^2.4.6
'@vueuse/core': ^11.2.0 '@vueuse/core': ^11.2.0
'@vueuse/integrations': ^11.2.0 '@vueuse/integrations': ^11.2.0
@ -83,19 +83,19 @@ catalog:
depcheck: ^1.4.7 depcheck: ^1.4.7
dotenv: ^16.4.5 dotenv: ^16.4.5
echarts: ^5.5.1 echarts: ^5.5.1
element-plus: ^2.8.7 element-plus: ^2.8.8
eslint: ^9.14.0 eslint: ^9.15.0
eslint-config-turbo: ^2.2.3 eslint-config-turbo: ^2.3.0
eslint-plugin-command: ^0.2.6 eslint-plugin-command: ^0.2.6
eslint-plugin-eslint-comments: ^3.2.0 eslint-plugin-eslint-comments: ^3.2.0
eslint-plugin-import-x: ^4.4.2 eslint-plugin-import-x: ^4.4.2
eslint-plugin-jsdoc: ^50.5.0 eslint-plugin-jsdoc: ^50.5.0
eslint-plugin-jsonc: ^2.18.1 eslint-plugin-jsonc: ^2.18.1
eslint-plugin-n: ^17.13.1 eslint-plugin-n: ^17.13.2
eslint-plugin-no-only-tests: ^3.3.0 eslint-plugin-no-only-tests: ^3.3.0
eslint-plugin-perfectionist: ^3.9.1 eslint-plugin-perfectionist: ^3.9.1
eslint-plugin-prettier: ^5.2.1 eslint-plugin-prettier: ^5.2.1
eslint-plugin-regexp: ^2.6.0 eslint-plugin-regexp: ^2.7.0
eslint-plugin-unicorn: ^56.0.0 eslint-plugin-unicorn: ^56.0.0
eslint-plugin-unused-imports: ^4.1.4 eslint-plugin-unused-imports: ^4.1.4
eslint-plugin-vitest: ^0.5.4 eslint-plugin-vitest: ^0.5.4
@ -105,7 +105,7 @@ catalog:
get-port: ^7.1.0 get-port: ^7.1.0
globals: ^15.12.0 globals: ^15.12.0
h3: ^1.13.0 h3: ^1.13.0
happy-dom: ^15.11.4 happy-dom: ^15.11.6
html-minifier-terser: ^7.2.0 html-minifier-terser: ^7.2.0
husky: ^9.1.6 husky: ^9.1.6
is-ci: ^3.0.1 is-ci: ^3.0.1
@ -114,7 +114,7 @@ catalog:
lint-staged: ^15.2.10 lint-staged: ^15.2.10
lodash.clonedeep: ^4.5.0 lodash.clonedeep: ^4.5.0
lodash.get: ^4.4.2 lodash.get: ^4.4.2
lucide-vue-next: ^0.456.0 lucide-vue-next: ^0.460.0
medium-zoom: ^1.1.0 medium-zoom: ^1.1.0
naive-ui: ^2.40.1 naive-ui: ^2.40.1
nitropack: ^2.10.4 nitropack: ^2.10.4
@ -137,7 +137,7 @@ catalog:
radix-vue: ^1.9.9 radix-vue: ^1.9.9
resolve.exports: ^2.0.2 resolve.exports: ^2.0.2
rimraf: ^6.0.1 rimraf: ^6.0.1
rollup: ^4.26.0 rollup: ^4.27.2
rollup-plugin-visualizer: ^5.12.0 rollup-plugin-visualizer: ^5.12.0
sass: 1.80.6 sass: 1.80.6
sortablejs: ^1.15.3 sortablejs: ^1.15.3
@ -151,10 +151,10 @@ catalog:
stylelint-prettier: ^5.0.2 stylelint-prettier: ^5.0.2
stylelint-scss: ^6.9.0 stylelint-scss: ^6.9.0
tailwind-merge: ^2.5.4 tailwind-merge: ^2.5.4
tailwindcss: ^3.4.14 tailwindcss: ^3.4.15
tailwindcss-animate: ^1.0.7 tailwindcss-animate: ^1.0.7
theme-colors: ^0.1.0 theme-colors: ^0.1.0
turbo: ^2.2.3 turbo: ^2.3.0
typescript: ^5.6.3 typescript: ^5.6.3
unbuild: ^3.0.0-rc.11 unbuild: ^3.0.0-rc.11
unplugin-element-plus: ^0.8.0 unplugin-element-plus: ^0.8.0
@ -168,13 +168,13 @@ catalog:
vite-plugin-vue-devtools: ^7.6.4 vite-plugin-vue-devtools: ^7.6.4
vitepress: ^1.5.0 vitepress: ^1.5.0
vitepress-plugin-group-icons: ^1.3.0 vitepress-plugin-group-icons: ^1.3.0
vitest: ^2.1.4 vitest: ^2.1.5
vue: ^3.5.12 vue: ^3.5.13
vue-eslint-parser: ^9.4.3 vue-eslint-parser: ^9.4.3
vue-i18n: ^10.0.4 vue-i18n: ^10.0.4
vue-router: ^4.4.5 vue-router: ^4.4.5
vue-tsc: ^2.1.10 vue-tsc: ^2.1.10
vxe-pc-ui: ^4.2.53 vxe-pc-ui: ^4.2.55
vxe-table: ^4.8.14 vxe-table: ^4.8.14
watermark-js-plus: ^1.5.7 watermark-js-plus: ^1.5.7
zod: ^3.23.8 zod: ^3.23.8