diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 5d7e57f3..0127df89 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -6,6 +6,7 @@ "stylelint.vscode-stylelint", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", + "usernamehw.errorlens", "mrmlnc.vscode-less", "lokalise.i18n-ally", "redhat.vscode-yaml", diff --git a/.vscode/settings.json b/.vscode/settings.json index f45d23cf..81f0295e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -66,6 +66,12 @@ "source.fixAll.eslint": true, "source.organizeImports": false }, + "eslint.rules.customizations": [ + { + "rule": "@stylistic/*", + "severity": "off" + } + ], "eslint.validate": [ "javascript", "javascriptreact", @@ -82,7 +88,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" }, "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -166,6 +172,9 @@ "*.env": "$(capture).env.*", "package.json": ".hintrc,pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore" }, + "eslint.codeAction.showDocumentation": { + "enable": true + }, "terminal.integrated.scrollback": 10000, "nuxt.isNuxtApp": false } diff --git a/src/components/Application/src/AppDarkModeToggle.vue b/src/components/Application/src/AppDarkModeToggle.vue index 1a51fcad..7cde953f 100644 --- a/src/components/Application/src/AppDarkModeToggle.vue +++ b/src/components/Application/src/AppDarkModeToggle.vue @@ -29,8 +29,14 @@ function toggleDarkMode() { - - diff --git a/src/components/FormDesign/src/components/VFormDesign/components/ImportJsonModal.vue b/src/components/FormDesign/src/components/VFormDesign/components/ImportJsonModal.vue index e7e5a486..8a5f2700 100644 --- a/src/components/FormDesign/src/components/VFormDesign/components/ImportJsonModal.vue +++ b/src/components/FormDesign/src/components/VFormDesign/components/ImportJsonModal.vue @@ -109,7 +109,7 @@ defineExpose({ showModal }) 取消 - - diff --git a/src/components/FormDesign/src/components/VFormDesign/components/PreviewCode.vue b/src/components/FormDesign/src/components/VFormDesign/components/PreviewCode.vue index 171564a3..44db4897 100644 --- a/src/components/FormDesign/src/components/VFormDesign/components/PreviewCode.vue +++ b/src/components/FormDesign/src/components/VFormDesign/components/PreviewCode.vue @@ -72,10 +72,10 @@ export default defineComponent({
-
+
- - diff --git a/src/components/FormDesign/src/components/VFormDesign/index.vue b/src/components/FormDesign/src/components/VFormDesign/index.vue index c9eb7bad..8f27b905 100644 --- a/src/components/FormDesign/src/components/VFormDesign/index.vue +++ b/src/components/FormDesign/src/components/VFormDesign/index.vue @@ -19,7 +19,6 @@ import PropsPanel from './modules/PropsPanel.vue' import ImportJsonModal from './components/ImportJsonModal.vue' import CodeModal from './components/CodeModal.vue' import { globalConfigState } from './config/formItemPropsConfig' -import { useDesign } from '@/hooks/web/useDesign' import { CollapseContainer } from '@/components/Container/index' import 'codemirror/mode/javascript/javascript' @@ -29,7 +28,6 @@ defineProps({ default: 'v-form-antd表单设计器', }, }) -const { prefixCls } = useDesign('form-design') // 子组件实例 const propsPanel = ref(null) const jsonModal = ref(null) @@ -251,7 +249,7 @@ provide('formDesignMethods', { - - diff --git a/src/components/Page/src/PageFooter.vue b/src/components/Page/src/PageFooter.vue index 31eda4c8..8932ed26 100644 --- a/src/components/Page/src/PageFooter.vue +++ b/src/components/Page/src/PageFooter.vue @@ -9,8 +9,8 @@ const { getCalcContentWidth } = useMenuSetting()