diff --git a/.vscode/settings.json b/.vscode/settings.json index c6be8a8..4980db4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ "source.fixAll.eslint": "explicit" }, "[vue]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "Vue.volar" }, "i18n-ally.localesPaths": ["src/locales"], "i18n-ally.keystyle": "nested", diff --git a/package.json b/package.json index 8b004fa..abe63e6 100644 --- a/package.json +++ b/package.json @@ -34,81 +34,81 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.4", "animate.css": "^4.1.1", - "axios": "^1.6.7", + "axios": "^1.6.8", "cropperjs": "^1.6.1", "dayjs": "^1.11.10", "driver.js": "^1.3.1", "echarts": "^5.5.0", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.5.6", + "element-plus": "2.6.1", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "nprogress": "^0.2.0", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", "qrcode": "^1.5.3", - "qs": "^6.11.2", + "qs": "^6.12.0", "url": "^0.11.3", - "vue": "3.4.20", + "vue": "3.4.21", "vue-draggable-plus": "^0.3.5", - "vue-i18n": "9.9.1", - "vue-json-pretty": "^2.3.0", + "vue-i18n": "9.10.2", + "vue-json-pretty": "^2.4.0", "vue-router": "^4.3.0", "vue-types": "^5.1.1", - "xgplayer": "^3.0.13" + "xgplayer": "^3.0.14" }, "devDependencies": { - "@commitlint/cli": "^19.0.1", - "@commitlint/config-conventional": "^19.0.0", - "@iconify/json": "^2.2.187", - "@intlify/unplugin-vue-i18n": "^2.0.0", + "@commitlint/cli": "^19.2.1", + "@commitlint/config-conventional": "^19.1.0", + "@iconify/json": "^2.2.194", + "@intlify/unplugin-vue-i18n": "^3.0.1", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.7", "@types/lodash-es": "^4.17.12", "@types/mockjs": "^1.0.10", - "@types/node": "^20.11.21", + "@types/node": "^20.11.30", "@types/nprogress": "^0.2.3", "@types/qrcode": "^1.5.5", - "@types/qs": "^6.9.12", + "@types/qs": "^6.9.14", "@types/sortablejs": "^1.15.8", - "@typescript-eslint/eslint-plugin": "^7.1.0", - "@typescript-eslint/parser": "^7.1.0", - "@unocss/transformer-variant-group": "^0.58.5", - "@vitejs/plugin-legacy": "^5.3.1", + "@typescript-eslint/eslint-plugin": "^7.3.1", + "@typescript-eslint/parser": "^7.3.1", + "@unocss/transformer-variant-group": "^0.58.6", + "@vitejs/plugin-legacy": "^5.3.2", "@vitejs/plugin-vue": "^5.0.4", "@vitejs/plugin-vue-jsx": "^3.1.0", - "autoprefixer": "^10.4.17", + "autoprefixer": "^10.4.19", "chalk": "^5.3.0", "consola": "^3.2.3", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", "eslint-define-config": "^2.1.0", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-vue": "^9.22.0", - "esno": "^4.0.0", + "eslint-plugin-vue": "^9.23.0", + "esno": "^4.7.0", "fs-extra": "^11.2.0", "husky": "^9.0.11", - "inquirer": "^9.2.15", + "inquirer": "^9.2.16", "less": "^4.2.0", "lint-staged": "^15.2.2", "mockjs": "^1.1.0", "plop": "^4.0.1", - "postcss": "^8.4.35", + "postcss": "^8.4.38", "postcss-html": "^1.6.0", "postcss-less": "^6.0.0", "prettier": "^3.2.5", "rimraf": "^5.0.5", - "rollup": "^4.12.0", + "rollup": "^4.13.0", "rollup-plugin-visualizer": "^5.12.0", "stylelint": "^16.2.1", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^14.0.0", "stylelint-config-standard": "^36.0.0", "stylelint-order": "^6.0.4", - "terser": "^5.28.1", - "typescript": "5.3.3", - "unocss": "^0.58.5", - "vite": "5.1.4", + "terser": "^5.29.2", + "typescript": "5.4.3", + "unocss": "^0.58.6", + "vite": "5.2.2", "vite-plugin-ejs": "^1.7.0", "vite-plugin-eslint": "^1.8.1", "vite-plugin-mock": "2.9.6", @@ -116,8 +116,8 @@ "vite-plugin-purge-icons": "^0.10.0", "vite-plugin-style-import": "2.0.0", "vite-plugin-svg-icons": "^2.0.1", - "vite-plugin-url-copy": "^1.1.3", - "vue-tsc": "^1.8.27" + "vite-plugin-url-copy": "^1.1.4", + "vue-tsc": "^2.0.7" }, "packageManager": "pnpm@8.1.0", "engines": { diff --git a/src/components/Form/src/components/useRenderCheckbox.tsx b/src/components/Form/src/components/useRenderCheckbox.tsx index 173e5c3..63afb10 100644 --- a/src/components/Form/src/components/useRenderCheckbox.tsx +++ b/src/components/Form/src/components/useRenderCheckbox.tsx @@ -13,15 +13,14 @@ export const useRenderCheckbox = () => { item.component === ComponentNameEnum.CHECKBOX_GROUP ? ElCheckbox : ElCheckboxButton ) as ReturnType return componentProps?.options?.map((option) => { - const { value, ...other } = option + const { ...other } = option return ( - {option[labelAlias || 'label']} - + label={option[labelAlias || 'label']} + value={option[valueAlias || 'value']} + > ) }) } diff --git a/src/components/Form/src/components/useRenderRadio.tsx b/src/components/Form/src/components/useRenderRadio.tsx index e198f1f..fc9842b 100644 --- a/src/components/Form/src/components/useRenderRadio.tsx +++ b/src/components/Form/src/components/useRenderRadio.tsx @@ -13,15 +13,14 @@ export const useRenderRadio = () => { item.component === ComponentNameEnum.RADIO_GROUP ? ElRadio : ElRadioButton ) as ReturnType return componentProps?.options?.map((option) => { - const { value, ...other } = option + const { ...other } = option return ( - {option[labelAlias || 'label']} - + label={option[labelAlias || 'label']} + value={option[valueAlias || 'value']} + > ) }) } diff --git a/src/views/Components/Form/DefaultForm.vue b/src/views/Components/Form/DefaultForm.vue index 77428fd..90f7df5 100644 --- a/src/views/Components/Form/DefaultForm.vue +++ b/src/views/Components/Form/DefaultForm.vue @@ -1052,11 +1052,7 @@ const schema = reactive([ slots: { default: (options: RadioOption[]) => { return options?.map((v) => { - return ( - - {v.label}({v.value}) - - ) + return }) } } @@ -1097,11 +1093,7 @@ const schema = reactive([ slots: { default: (options: RadioOption[]) => { return options?.map((v) => { - return ( - - {v.label}({v.value}) - - ) + return }) } } @@ -1157,11 +1149,7 @@ const schema = reactive([ slots: { default: (options: CheckboxOption[]) => { return options?.map((v) => { - return ( - - {v.label}({v.value}) - - ) + return }) } } @@ -1214,11 +1202,7 @@ const schema = reactive([ slots: { default: (options: CheckboxOption[]) => { return options?.map((v) => { - return ( - - {v.label}({v.value}) - - ) + return }) } }