Skip to content

Commit 799be5a

Browse files
Merge pull request #17 from github-learning/dev
Dev
2 parents 6ea07ad + 5caf903 commit 799be5a

37 files changed

+10784
-187
lines changed

components.d.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ declare module 'vue' {
1010
AddMenu: typeof import('./src/views/system/menu/components/addMenu.vue')['default']
1111
Avatar: typeof import('./src/components/Avatar/index.vue')['default']
1212
BreadCrumb: typeof import('./src/layout/components/layout-header/breadCrumb.vue')['default']
13+
Edit: typeof import('./src/components/ProTable/components/searchForm.vue')['default']
1314
EditorMenu: typeof import('./src/views/system/menu/components/editorMenu.vue')['default']
1415
EditorRole: typeof import('./src/views/system/role/components/editorRole.vue')['default']
1516
EditorUser: typeof import('./src/views/system/user/components/editorUser.vue')['default']
@@ -20,6 +21,7 @@ declare module 'vue' {
2021
ElCard: typeof import('element-plus/es')['ElCard']
2122
ElCol: typeof import('element-plus/es')['ElCol']
2223
ElContainer: typeof import('element-plus/es')['ElContainer']
24+
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
2325
ElDialog: typeof import('element-plus/es')['ElDialog']
2426
ElDrawer: typeof import('element-plus/es')['ElDrawer']
2527
ElDropdown: typeof import('element-plus/es')['ElDropdown']
@@ -44,15 +46,20 @@ declare module 'vue' {
4446
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
4547
ElTooltip: typeof import('element-plus/es')['ElTooltip']
4648
ElTree: typeof import('element-plus/es')['ElTree']
49+
Form: typeof import('./src/components/ProTable/components/form.vue')['default']
4750
HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
4851
LayoutHeader: typeof import('./src/layout/components/layout-header/index.vue')['default']
4952
LayoutMenu: typeof import('./src/layout/components/layout-menu/index.vue')['default']
5053
MenuTree: typeof import('./src/layout/components/layout-menu/menu-tree.vue')['default']
54+
MyInput: typeof import('./src/components/MyInput/index.vue')['default']
5155
Navbar: typeof import('./src/layout/components/Navbar.vue')['default']
56+
Pagination: typeof import('./src/components/ProTable/components/Pagination.vue')['default']
5257
ProTable: typeof import('./src/components/ProTable/index.vue')['default']
5358
RoleMenu: typeof import('./src/views/system/role/components/roleMenu.vue')['default']
5459
RouterLink: typeof import('vue-router')['RouterLink']
5560
RouterView: typeof import('vue-router')['RouterView']
61+
Search: typeof import('./src/components/ProTable/components/form.vue')['default']
62+
SearchForm: typeof import('./src/components/ProTable/components/searchForm.vue')['default']
5663
SidebarItemLink: typeof import('./src/layout/components/layout-menu/SidebarItemLink.vue')['default']
5764
}
5865
}

eslint.config.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@ export default [
3737
// 6. 检测 vue 中的 ts 代码采用 tsparser
3838
{
3939
files: ["**/*.vue"],
40-
languageOptions: { parserOptions: { parser: tseslint.parser } },
40+
languageOptions: {
41+
parserOptions: {
42+
parser: tseslint.parser,
43+
ecmaFeatures: {
44+
jsx: true, // 启用 JSX 支持
45+
},
46+
}
47+
},
4148
},
4249
// 7. ignores 配置
4350
{
@@ -57,9 +64,11 @@ export default [
5764
rules: {
5865
"no-console": "warn", // 参照下方实例图
5966
"vue/multi-word-component-names": "off",
67+
"no-unused-vars": ["warn"],
68+
'@typescript-eslint/no-unused-vars': ['warn'], // 设置为 warning
6069
// semi: 1
6170
},
6271
},
6372
prettierRecommended, // 覆盖掉eslint的规范
64-
73+
6574
];

0 commit comments

Comments
 (0)