From 9edc281322772f6b5ec8093c40fdf90408d85da7 Mon Sep 17 00:00:00 2001 From: vben Date: Thu, 28 Jan 2021 23:28:50 +0800 Subject: [PATCH] chore: format code by eslint #222 --- .eslintrc.js | 22 +++++++ .yarnclean | 48 +++++++++++++++ package.json | 6 +- .../Application/src/AppLocalePicker.vue | 3 +- .../Application/src/AppProvider.vue | 2 +- .../Application/src/search/AppSearch.vue | 4 +- .../Application/src/search/AppSearchModal.vue | 12 ++-- src/components/Basic/src/BasicTitle.vue | 2 +- src/components/Button/src/BasicButton.vue | 4 +- .../Button/src/PopConfirmButton.vue | 2 +- src/components/ClickOutSide/src/index.vue | 4 +- .../Container/src/LazyContainer.vue | 8 +-- .../Container/src/ScrollContainer.vue | 2 +- .../src/collapse/CollapseContainer.vue | 8 +-- .../Container/src/collapse/CollapseHeader.vue | 7 ++- src/components/Drawer/src/BasicDrawer.vue | 8 +-- .../Drawer/src/components/DrawerFooter.vue | 8 +-- .../Drawer/src/components/DrawerHeader.vue | 5 +- src/components/Dropdown/src/Dropdown.vue | 2 +- src/components/Excel/src/ImportExcel.vue | 4 +- src/components/Form/src/BasicForm.vue | 8 +-- .../Form/src/components/ApiSelect.vue | 2 +- .../Form/src/components/FormAction.vue | 9 +-- .../Form/src/components/RadioButtonGroup.vue | 4 +- src/components/Form/src/types/form.ts | 2 +- src/components/Icon/src/index.vue | 2 +- src/components/Markdown/src/index.vue | 28 ++++++--- .../Menu/src/components/BasicSubMenuItem.vue | 1 - src/components/Modal/src/BasicModal.vue | 8 +-- .../Modal/src/components/ModalFooter.vue | 6 +- .../Modal/src/components/ModalWrapper.vue | 5 +- src/components/Page/src/PageFooter.vue | 6 +- src/components/Page/src/PageWrapper.vue | 10 ++-- src/components/Preview/src/index.vue | 2 +- src/components/Qrcode/src/index.vue | 4 +- src/components/SimpleMenu/src/SimpleMenu.vue | 3 +- .../SimpleMenu/src/components/MenuItem.vue | 2 +- .../SimpleMenu/src/components/SubMenuItem.vue | 4 +- src/components/StrengthMeter/src/index.vue | 2 +- src/components/Table/src/BasicTable.vue | 6 +- .../src/components/EditTableHeaderIcon.vue | 2 +- .../Table/src/components/TableAction.vue | 2 +- .../Table/src/components/TableHeader.vue | 4 +- .../src/components/editable/EditableCell.vue | 12 ++-- .../src/components/settings/ColumnSetting.vue | 12 +++- src/components/Tinymce/src/Editor.vue | 2 +- src/components/Tinymce/src/ImgUpload.vue | 7 ++- src/components/Upload/src/BasicUpload.vue | 6 +- src/components/Upload/src/UploadModal.vue | 5 +- .../Upload/src/UploadPreviewModal.vue | 1 + src/layouts/default/header/MultipleHeader.vue | 2 +- .../default/header/components/Breadcrumb.vue | 3 +- .../header/components/lock/LockModal.vue | 4 +- .../header/components/notify/NoticeList.vue | 8 ++- .../header/components/user-dropdown/index.vue | 3 - .../default/setting/components/TypePicker.vue | 5 +- src/layouts/default/sider/DragBar.vue | 2 +- src/layouts/default/sider/LayoutSider.vue | 2 +- src/layouts/default/sider/MixSider.vue | 8 ++- .../default/tabs/components/FoldButton.vue | 4 +- src/layouts/page/ParentView.vue | 2 +- src/layouts/page/index.vue | 2 +- .../analysis/components/AnalysisBar.vue | 2 +- .../analysis/components/AnalysisLine.vue | 2 +- .../analysis/components/AnalysisPie.vue | 2 +- .../analysis/components/GrowCard.vue | 8 ++- .../analysis/components/TrendLine.vue | 2 +- src/views/dashboard/analysis/index.vue | 8 +-- src/views/dashboard/house/index.vue | 60 +++++++++---------- .../workbench/components/NewsList.vue | 4 +- .../workbench/components/ProdTotal.vue | 12 ++-- .../workbench/components/ShortCuts.vue | 18 +++--- .../workbench/components/TodoList.vue | 4 +- .../dashboard/workbench/components/Week.vue | 2 +- src/views/demo/comp/button/index.vue | 16 ++--- src/views/demo/comp/drawer/Drawer2.vue | 2 +- src/views/demo/comp/drawer/Drawer3.vue | 2 +- src/views/demo/comp/drawer/Drawer5.vue | 2 +- src/views/demo/comp/drawer/index.vue | 10 ++-- src/views/demo/comp/lazy/Transition.vue | 3 +- src/views/demo/comp/loading/index.vue | 10 ++-- src/views/demo/comp/modal/Modal2.vue | 4 +- src/views/demo/comp/modal/Modal3.vue | 2 +- src/views/demo/comp/modal/index.vue | 12 ++-- src/views/demo/comp/qrcode/index.vue | 2 +- src/views/demo/comp/scroll/Action.vue | 15 ++--- src/views/demo/comp/scroll/VirtualScroll.vue | 12 ++-- src/views/demo/comp/scroll/index.vue | 7 ++- src/views/demo/comp/upload/index.vue | 4 +- src/views/demo/comp/verify/index.vue | 10 ++-- src/views/demo/echarts/Line.vue | 2 +- src/views/demo/echarts/Map.vue | 2 +- src/views/demo/echarts/Pie.vue | 2 +- src/views/demo/echarts/apex/Area.vue | 2 +- src/views/demo/echarts/apex/Bar.vue | 2 +- src/views/demo/echarts/apex/Line.vue | 2 +- src/views/demo/echarts/apex/Mixed.vue | 2 +- src/views/demo/editor/markdown/Editor.vue | 3 +- src/views/demo/editor/markdown/index.vue | 2 +- src/views/demo/editor/tinymce/Editor.vue | 3 +- src/views/demo/excel/ArrayExport.vue | 2 +- src/views/demo/excel/CustomExport.vue | 2 +- src/views/demo/excel/ImportExcel.vue | 4 +- src/views/demo/excel/JsonExport.vue | 4 +- .../demo/feat/breadcrumb/ChildrenList.vue | 2 +- src/views/demo/feat/breadcrumb/FlatList.vue | 2 +- src/views/demo/feat/context-menu/index.vue | 4 +- src/views/demo/feat/copy/index.vue | 2 +- src/views/demo/feat/icon/index.vue | 2 +- src/views/demo/feat/msg/index.vue | 18 +++--- src/views/demo/feat/ripple/index.vue | 2 +- src/views/demo/feat/tabs/index.vue | 12 ++-- src/views/demo/feat/watermark/index.vue | 2 +- src/views/demo/form/DynamicForm.vue | 10 ++-- src/views/demo/form/RefForm.vue | 16 ++--- src/views/demo/form/RuleForm.vue | 10 ++-- src/views/demo/form/UseForm.vue | 16 ++--- .../demo/page/account/center/Article.vue | 16 +++-- .../demo/page/account/center/Project.vue | 4 +- src/views/demo/page/account/center/index.vue | 4 +- .../demo/page/account/setting/BaseSetting.vue | 4 +- .../page/account/setting/SecureSetting.vue | 4 +- src/views/demo/page/desc/high/index.vue | 12 ++-- src/views/demo/page/form/high/PersonTable.vue | 5 +- src/views/demo/page/form/high/index.vue | 2 +- src/views/demo/page/form/step/Step3.vue | 2 +- src/views/demo/page/form/step/index.vue | 6 +- src/views/demo/page/list/basic/index.vue | 4 +- src/views/demo/page/list/search/index.vue | 12 +++- src/views/demo/page/result/fail/index.vue | 2 +- src/views/demo/page/result/success/index.vue | 4 +- src/views/demo/permission/back/Btn.vue | 6 +- src/views/demo/permission/front/Btn.vue | 6 +- src/views/demo/table/Basic.vue | 3 +- src/views/demo/table/CustomerCell.vue | 6 +- src/views/demo/table/EditCellTable.vue | 11 ++-- src/views/demo/table/EditRowTable.vue | 3 +- src/views/demo/table/FormTable.vue | 2 +- src/views/demo/table/RefTable.vue | 22 +++---- src/views/demo/table/UseTable.vue | 22 +++---- src/views/demo/tree/ActionTree.vue | 24 ++++---- src/views/sys/exception/Exception.tsx | 2 + src/views/sys/iframe/FrameBlank.vue | 2 +- src/views/sys/iframe/index.vue | 3 +- src/views/sys/lock/LockPage.vue | 14 +++-- src/views/sys/login/Login.vue | 13 ++-- src/views/sys/redirect/index.vue | 2 +- vite.config.ts | 21 +++---- yarn.lock | 10 ++-- 149 files changed, 574 insertions(+), 421 deletions(-) create mode 100644 .yarnclean diff --git a/.eslintrc.js b/.eslintrc.js index d642a972..68cccde8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -57,5 +57,27 @@ module.exports = { }, ], 'space-before-function-paren': 'off', + + 'vue/attributes-order': 'off', + 'vue/one-component-per-file': 'off', + 'vue/html-closing-bracket-newline': 'off', + 'vue/max-attributes-per-line': 'off', + 'vue/multiline-html-element-content-newline': 'off', + 'vue/singleline-html-element-content-newline': 'off', + 'vue/attribute-hyphenation': 'off', + // 'vue/html-self-closing': 'off', + 'vue/require-default-prop': 'off', + 'vue/html-self-closing': [ + 'error', + { + html: { + void: 'always', + normal: 'never', + component: 'always', + }, + svg: 'always', + math: 'always', + }, + ], }, }; diff --git a/.yarnclean b/.yarnclean new file mode 100644 index 00000000..3e556ef3 --- /dev/null +++ b/.yarnclean @@ -0,0 +1,48 @@ +# test directories +__tests__ +test +tests +powered-test + +# asset directories +docs +doc +website +images +assets + +# examples +example +examples + +# code coverage directories +coverage +.nyc_output + +# build scripts +Makefile +Gulpfile.js +Gruntfile.js + +# configs +appveyor.yml +circle.yml +codeship-services.yml +codeship-steps.yml +wercker.yml +.tern-project +.gitattributes +.editorconfig +.*ignore +.eslintrc +.jshintrc +.flowconfig +.documentup.json +.yarn-metadata.json +.travis.yml + +# misc +*.md + +!istanbul-reports/lib/html/assets +!istanbul-api/node_modules/istanbul-reports/lib/html/assets diff --git a/package.json b/package.json index 49f887f4..3a9d8905 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite", "clean:lib": "npx rimraf node_modules", "typecheck": "vuedx-typecheck .", - "lint:eslint": "eslint --fix --ext \"src/**/*.{vue,less,css,scss}\"", + "lint:eslint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix", "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", "lint:stylelint": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap" @@ -63,7 +63,7 @@ "@types/zxcvbn": "^4.4.0", "@typescript-eslint/eslint-plugin": "^4.14.1", "@typescript-eslint/parser": "^4.14.1", - "@vitejs/plugin-legacy": "^1.2.1", + "@vitejs/plugin-legacy": "^1.2.2", "@vitejs/plugin-vue": "^1.1.2", "@vitejs/plugin-vue-jsx": "^1.0.2", "@vue/compiler-sfc": "^3.0.5", @@ -93,7 +93,7 @@ "stylelint-order": "^4.1.0", "ts-node": "^9.1.1", "typescript": "^4.1.3", - "vite": "2.0.0-beta.50", + "vite": "2.0.0-beta.52", "vite-plugin-html": "^2.0.0-beta.6", "vite-plugin-mock": "^2.0.0-rc.2", "vite-plugin-purge-icons": "^0.6.0", diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue index 986b709c..48204d86 100644 --- a/src/components/Application/src/AppLocalePicker.vue +++ b/src/components/Application/src/AppLocalePicker.vue @@ -20,7 +20,6 @@ import { defineComponent, ref, watchEffect, unref, computed } from 'vue'; import { Dropdown, DropMenu } from '/@/components/Dropdown'; - import { GlobalOutlined } from '@ant-design/icons-vue'; import { useLocale } from '/@/locales/useLocale'; import { useLocaleSetting } from '/@/hooks/setting/useLocaleSetting'; @@ -33,7 +32,7 @@ import Icon from '/@/components/Icon'; export default defineComponent({ name: 'AppLocalPicker', - components: { GlobalOutlined, Dropdown, Icon }, + components: { Dropdown, Icon }, props: { // Whether to display text showText: propTypes.bool.def(true), diff --git a/src/components/Application/src/AppProvider.vue b/src/components/Application/src/AppProvider.vue index ddf8c6ce..b976a3cf 100644 --- a/src/components/Application/src/AppProvider.vue +++ b/src/components/Application/src/AppProvider.vue @@ -1,5 +1,5 @@ diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue index 848b0c63..3e2e0b77 100644 --- a/src/components/Drawer/src/BasicDrawer.vue +++ b/src/components/Drawer/src/BasicDrawer.vue @@ -8,7 +8,7 @@ @close="onClose" > @@ -18,11 +18,11 @@ v-loading="getLoading" :loading-tip="loadingText || t('common.loadingText')" > - + @@ -57,8 +57,8 @@ import { useAttrs } from '/@/hooks/core/useAttrs'; export default defineComponent({ - inheritAttrs: false, components: { Drawer, ScrollContainer, DrawerFooter, DrawerHeader }, + inheritAttrs: false, props: basicProps, emits: ['visible-change', 'ok', 'close', 'register'], setup(props, { emit }) { diff --git a/src/components/Drawer/src/components/DrawerFooter.vue b/src/components/Drawer/src/components/DrawerFooter.vue index 5940d0ce..25bd587b 100644 --- a/src/components/Drawer/src/components/DrawerFooter.vue +++ b/src/components/Drawer/src/components/DrawerFooter.vue @@ -1,11 +1,11 @@ diff --git a/src/components/Drawer/src/components/DrawerHeader.vue b/src/components/Drawer/src/components/DrawerHeader.vue index 3fcfb329..adc22233 100644 --- a/src/components/Drawer/src/components/DrawerHeader.vue +++ b/src/components/Drawer/src/components/DrawerHeader.vue @@ -1,6 +1,6 @@ @@ -33,6 +33,7 @@ showDetailBack: propTypes.bool, title: propTypes.string, }, + emits: ['close'], setup(_, { emit }) { const { prefixCls } = useDesign('basic-drawer-header'); diff --git a/src/components/Dropdown/src/Dropdown.vue b/src/components/Dropdown/src/Dropdown.vue index 7f7ac4ba..941fe866 100644 --- a/src/components/Dropdown/src/Dropdown.vue +++ b/src/components/Dropdown/src/Dropdown.vue @@ -1,7 +1,7 @@