fix lint

goxiaoy · goxiaoy · commit 6c85a47dee70 · 2023-02-03T16:18:44.000+08:00
diff --git a/admin/.eslintrc.js b/admin/.eslintrc.js
@@ -1,32 +1,32 @@
 module.exports = {
-    parser: "vue-eslint-parser",
-    "env": {
-        "browser": true,
-        "es2021": true
+    parser: 'vue-eslint-parser',
+    env: {
+        browser: true,
+        es2021: true
     },
-    "extends": [
-        "plugin:@typescript-eslint/recommended",
-        "plugin:vue/vue3-recommended"
+    extends: [
+        'plugin:@typescript-eslint/recommended',
+        'plugin:vue/vue3-recommended'
     ],
-    "parserOptions": {
-        "parser": "@typescript-eslint/parser",
-        "sourceType": "module",
+    parserOptions: {
+        parser: '@typescript-eslint/parser',
+        sourceType: 'module',
         ecmaFeature: {
             jsx: true,
             tsx: true
         }
     },
-    "plugins": [
-        "@typescript-eslint"
+    plugins: [
+        '@typescript-eslint'
     ],
-    "rules": {
+    rules: {
         'vue/max-attributes-per-line': ['error', {
             singleline: 10,
             multiline: {
-                max: 1,
-                allowFirstLine: false
+                max: 1
             }
         }],
+        'vue/multi-word-component-names': 0,
         'vue/singleline-html-element-content-newline': 'off',
         'vue/multiline-html-element-content-newline': 'off',
         'vue/html-indent': ['error', 4],
@@ -35,7 +35,9 @@ module.exports = {
         quotes: ['error', 'single'], // 单引号
         // 'vue/html-quotes': ['error', 'single'],
         semi: ['error', 'never'], // 禁止使用分号
-        'space-infix-ops': ['error', { int32Hint: false }], // 要求操作符周围有空格
+        'space-infix-ops': ['error', {
+            int32Hint: false
+        }], // 要求操作符周围有空格
         'no-multi-spaces': 'error', // 禁止多个空格
         'no-whitespace-before-property': 'error', // 禁止在属性前使用空格
         'space-before-blocks': 'error', // 在块之前强制保持一致的间距
@@ -48,8 +50,8 @@ module.exports = {
             array: true,
             object: true
         }, {
-                enforceForRenamedProperties: false
-            }],
+            enforceForRenamedProperties: false
+        }],
         'comma-dangle': ['error', 'never'], // 最后一个属性不允许有逗号
         'arrow-spacing': 'error', // 箭头函数空格
         'prefer-template': 'error',
@@ -59,10 +61,12 @@ module.exports = {
         'no-unneeded-ternary': 'error', // 禁止可以表达为更简单结构的三元操作符
         'no-restricted-syntax': ['error', 'WithStatement', 'BinaryExpression[operator="in"]'], // 禁止with/in语句
         'no-lonely-if': 'error', // 禁止 if 语句作为唯一语句出现在 else 语句块中
-        'newline-per-chained-call': ['error', { ignoreChainWithDepth: 2 }], // 要求方法链中每个调用都有一个换行符
+        'newline-per-chained-call': ['error', {
+            ignoreChainWithDepth: 2
+        }], // 要求方法链中每个调用都有一个换行符
         // 路径别名设置
         'no-submodule-imports': ['off', '/@'],
         'no-implicit-dependencies': ['off', ['/@']],
         '@typescript-eslint/no-explicit-any': 'off' // 类型可以使用any 
     }
-}
+}
diff --git a/admin/package.json b/admin/package.json
@@ -5,7 +5,9 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build && echo > dist/placeholder",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "lint": "eslint --ext .tsx,.ts,vue src/",
+    "lint:fix": "eslint --ext .tsx,.ts,vue src/ --fix"
   },
   "dependencies": {
     "ant-design-vue": "^3.1.1",
diff --git a/admin/src/components.d.ts b/admin/src/components.d.ts
@@ -5,7 +5,6 @@ import '@vue/runtime-core'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AAlert: typeof import('ant-design-vue/es')['Alert']
     ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ABreadcrumbItem: typeof import('ant-design-vue/es')['BreadcrumbItem']
     AButton: typeof import('ant-design-vue/es')['Button']
@@ -19,11 +18,8 @@ declare module '@vue/runtime-core' {
     ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider']
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
-    AModal: typeof import('ant-design-vue/es')['Modal']
-    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATag: typeof import('ant-design-vue/es')['Tag']
-    ATextarea: typeof import('ant-design-vue/es')['Textarea']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Screenfull: typeof import('./components/Screenfull/index.vue')['default']
diff --git a/admin/src/components/Screenfull/index.vue b/admin/src/components/Screenfull/index.vue
@@ -5,7 +5,7 @@
     </div>
 </template>
 <script setup lang='ts'>
-import { notification } from 'ant-design-vue';
+import { notification } from 'ant-design-vue'
 import { onMounted, onUnmounted, ref } from 'vue'
 import screenfull from 'screenfull'
 
diff --git a/admin/src/layout/aside.vue b/admin/src/layout/aside.vue
@@ -4,14 +4,14 @@
             <Sidebar />
         </a-layout-sider>
         <a-layout style="padding: 0 24px 24px">
-            <div v-if="layout.dtmVersion && layout.dtmVersion != dashVer" style="color:#f00"> !!! admin version: {{dashVer}} != dtm version: {{layout.dtmVersion}}. </div>
+            <div v-if="layout.dtmVersion && layout.dtmVersion != dashVer" style="color:#f00"> !!! admin version: {{ dashVer }} != dtm version: {{ layout.dtmVersion }}. </div>
             <a-breadcrumb style="margin: 16px 0">
                 <a-breadcrumb-item>{{ mainNav }}</a-breadcrumb-item>
                 <a-breadcrumb-item>{{ subNav }}</a-breadcrumb-item>
                 <a-breadcrumb-item>{{ page }}</a-breadcrumb-item>
             </a-breadcrumb>
             <a-layout-content
-            :style="{ background: '#fff', padding: '24px', margin: 0, minHeight: '280px' }"
+                :style="{ background: '#fff', padding: '24px', margin: 0, minHeight: '280px' }"
             >
                 <Content />
             </a-layout-content>
@@ -20,14 +20,10 @@
 </template>
 
 <script setup lang='ts'>
-import Sidebar from './components/sidebar.vue'
-import Content from './components/content.vue'
 import { useRoute } from 'vue-router'
 import { useLayoutStore } from '../store/modules/layout'
-import { IMenubarList } from '../type/store/layout'
 import { findCurrentMenubar } from '../utils/util'
-import { computed, onMounted, ref } from 'vue'
-import { getDtmVersion } from '../api/api_dtm'
+import { computed, onMounted } from 'vue'
 
 
 const dashVer = import.meta.env.VITE_ADMIN_VERSION
diff --git a/admin/src/layout/components/content.vue b/admin/src/layout/components/content.vue
@@ -9,8 +9,8 @@
                         closable
                         @close="onClose"
                     >
-                        <template v-slot:description>
-                            <span v-for="ln of errLines">{{ln}} <br/> </span>
+                        <template #description>
+                            <span v-for="(ln, index) of errLines" :key="index">{{ ln }} <br> </span>
                         </template>
                     </a-alert>
                     <component :is="Component" :key="key" />
@@ -30,10 +30,10 @@ const route = useRoute()
 const key = computed(() => route.path)
 
 const layoutStore = useLayoutStore()
-const errLines = computed(() => layoutStore.globalError.split("\n"))
-const onClose = async (e: MouseEvent) => {
+const errLines = computed(() => layoutStore.globalError.split('\n'))
+const onClose = async() => {
     await sleep(1000)
-    layoutStore.setGlobalError("")
+    layoutStore.setGlobalError('')
 }
 
 </script>
diff --git a/admin/src/layout/components/header.vue b/admin/src/layout/components/header.vue
@@ -1,30 +1,30 @@
 <template>
     <div>
-        <a-layout-header class="header flex">
-            <div class="flex items-center logo h-16">
+        <a-layout-header class="flex header">
+            <div class="flex items-center h-16 logo">
                 <svg-icon style="width: 36px; height: 36px; margin-right: 84px;" icon-class="svg-logo" />
-                <span class="text-gray-400 text-lg">DTM admin {{ version }}</span>
+                <span class="text-lg text-gray-400">DTM admin {{ version }}</span>
             </div>
             <a-menu
-            v-model:selectedKeys="activeMenu"
-            theme="dark"
-            mode="horizontal"
-            :style="{ lineHeight: '64px' }"
-            @select="onOpenChange"
+                v-model:selectedKeys="activeMenu"
+                theme="dark"
+                mode="horizontal"
+                :style="{ lineHeight: '64px' }"
+                @select="onOpenChange"
             >
                 <a-menu-item v-for="v in getMenubar.menuList" :key="v.path">{{ v.meta.title }}</a-menu-item>
             </a-menu>
         </a-layout-header>
     </div>
 </template>
 <script setup lang='ts'>
-import { computed, ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { useLayoutStore } from '/@/store/modules/layout'
 
 const route = useRoute()
 const router = useRouter()
-const { getMenubar, getCurrentVersion } = useLayoutStore()
+const { getMenubar } = useLayoutStore()
 const firstRedirectPath = '/admin'
 const version = import.meta.env.VITE_ADMIN_VERSION
 
diff --git a/admin/src/layout/components/sidebar.vue b/admin/src/layout/components/sidebar.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, computed } from 'vue'
+import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useLayoutStore } from '/@/store/modules/layout'
 import { IMenubarList } from '/@/type/store/layout'
@@ -36,6 +36,7 @@ const activeMenu = computed({
     get: () => {
         return [route.path]
     },
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     set: (val) => {
         // do nothing, just for eliminate warn
     }
@@ -46,6 +47,7 @@ const openKeys = computed({
         const pos = route.path.lastIndexOf('/')
         return [route.path.substring(0, pos)]
     }, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     set: (val) => {
         // do onthing, just for eliminate warn
     }
diff --git a/admin/src/layout/index.vue b/admin/src/layout/index.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-    import Header from './components/header.vue'
+import Header from './components/header.vue'
 </script>
 
 <template>
-  	<a-layout>
-		<a-layout-header class="header">
-			<Header />
-		</a-layout-header>
+    <a-layout>
+        <a-layout-header class="header">
+            <Header />
+        </a-layout-header>
         <router-view />
     </a-layout>
 </template>
diff --git a/admin/src/main.ts b/admin/src/main.ts
@@ -15,18 +15,18 @@ app.use(pinia)
 app.mount('#app')
 
 window.onunhandledrejection = (ev: PromiseRejectionEvent) => {
-  showAlert(ev.reason.stack || ev.reason.message)
+    showAlert(ev.reason.stack || ev.reason.message)
 }
 window.onerror = err => {
-  if (typeof err === "string") {
-    return showAlert(err)
-  }
-  showAlert(JSON.stringify(err))
+    if (typeof err === 'string') {
+        return showAlert(err)
+    }
+    showAlert(JSON.stringify(err))
 }
 
 function showAlert(msg: string) {
-  let layout = useLayoutStore()
-  if (!layout.globalError) {
-    layout.setGlobalError(msg)
-  }
+    const layout = useLayoutStore()
+    if (!layout.globalError) {
+        layout.setGlobalError(msg)
+    }
 }
diff --git a/admin/src/permission.ts b/admin/src/permission.ts
@@ -4,6 +4,7 @@ import { useLayoutStore } from './store/modules/layout'
 
 configure({ showSpinner: false })
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const defaultRoutePath = '/'
 
 router.beforeEach((to) => {
diff --git a/admin/src/store/modules/layout.ts b/admin/src/store/modules/layout.ts
@@ -1,7 +1,7 @@
-import { defineStore } from 'pinia';
-import { allowRouter } from '/@/router';
-import { ILayout, IMenubar, IMenubarList, IStatus } from '/@/type/store/layout';
-import { getDtmVersion } from '/@/api/api_dtm';
+import { defineStore } from 'pinia'
+import { allowRouter } from '/@/router'
+import { ILayout, IMenubar, IMenubarList, IStatus } from '/@/type/store/layout'
+import { getDtmVersion } from '/@/api/api_dtm'
 
 export const useLayoutStore = defineStore({
     id: 'layout',
@@ -12,16 +12,16 @@ export const useLayoutStore = defineStore({
         status: {
             isLoading: false
         },
-        dtmVersion: "",
-        globalError: "",
+        dtmVersion: '',
+        globalError: ''
     }),
     getters: {
         getMenubar(): IMenubar {
             return this.menubar
         },
         getStatus(): IStatus {
             return this.status
-        },
+        }
     },
     actions: {
         setRoutes(data: Array<IMenubarList>): void {
@@ -36,7 +36,7 @@ export const useLayoutStore = defineStore({
         async loadDtmVersion(): Promise<void> {
             const { data: { version } } = await getDtmVersion()
             this.dtmVersion = version
-            console.log("dtm version: ", this.dtmVersion)
+            console.log('dtm version: ', this.dtmVersion)
         }
     }
 })
diff --git a/admin/src/type/shim.vue.d.ts b/admin/src/type/shim.vue.d.ts
@@ -1,5 +1,5 @@
 declare module '*.vue' {
-  import { defineComponent } from 'vue';
+  import { defineComponent } from 'vue'
   const Component: ReturnType<typeof defineComponent>
   export default Component
 }
diff --git a/admin/src/utils/util.ts b/admin/src/utils/util.ts
@@ -1,12 +1,12 @@
-import { useRoute } from 'vue-router';
-import { IMenubarList } from '../type/store/layout';
+import { useRoute } from 'vue-router'
+import { IMenubarList } from '../type/store/layout'
 
 export const findCurrentMenubar = (menuList: IMenubarList[], root?: boolean) => {
     const route = useRoute()
     let arr: IMenubarList[] | IMenubarList = []
     for (let i = 0; i < menuList.length; i++) {
-        const v = menuList[i];
-        const usePath = v.meta.activeMenu || v.redirect || v.path;
+        const v = menuList[i]
+        const usePath = v.meta.activeMenu || v.redirect || v.path
         const pos = usePath.lastIndexOf('/')
         const rootPath = pos == 0 ? usePath : usePath.substring(0, pos)
         if (route.path.indexOf(rootPath) !== -1) {
@@ -22,6 +22,6 @@ export const findCurrentMenubar = (menuList: IMenubarList[], root?: boolean) =>
     return arr
 }
 
-export const sleep = async (ms: number) => {
+export const sleep = async(ms: number) => {
     return new Promise(resolve => setTimeout(resolve, ms))
 }
diff --git a/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue b/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue
diff --git a/admin/src/views/Dashboard/GlobalTransactions/_Components/DialogTransactionDetail.vue b/admin/src/views/Dashboard/GlobalTransactions/_Components/DialogTransactionDetail.vue
diff --git a/admin/src/views/Dashboard/KVPairs/Topics.vue b/admin/src/views/Dashboard/KVPairs/Topics.vue
diff --git a/admin/src/views/Dashboard/KVPairs/_Components/DialogTopicDetail.vue b/admin/src/views/Dashboard/KVPairs/_Components/DialogTopicDetail.vue
diff --git a/admin/src/views/Dashboard/KVPairs/_Components/DialogTopicSubscribe.vue b/admin/src/views/Dashboard/KVPairs/_Components/DialogTopicSubscribe.vue
diff --git a/admin/tailwind.config.js b/admin/tailwind.config.js
diff --git a/admin/vite.config.ts b/admin/vite.config.ts
