Merge remote-tracking branch 'origin/main'

# Conflicts:
#	frontend/src/views/dashboard/common/ResourceTree.vue

Author: ziyujiahao

frontend/.eslintignore

@@ -5,4 +5,6 @@
 *.woff
 *.ttf
 .vscode/
-.DS_Store
+.DS_Store
+eslint.config.cjs
+.eslintrc.js

frontend/.eslintrc.js

@@ -30,4 +30,4 @@ module.exports = {
       },
     ],
   },
-}
+}

frontend/eslint.config.cjs

@@ -0,0 +1,59 @@
+const { globalIgnores } = require('eslint/config')
+const eslint = require('@eslint/js')
+const eslintConfigPrettier = require('eslint-config-prettier')
+const eslintPluginPrettierRecommended = require('eslint-plugin-prettier/recommended')
+const eslintPluginVue = require('eslint-plugin-vue')
+const globals = require('globals')
+const typescriptEslint = require('typescript-eslint')
+
+module.exports = typescriptEslint.config(
+  {
+    languageOptions: {
+      globals: globals.browser,
+      ecmaVersion: 'latest',
+      parserOptions: {
+        parser: typescriptEslint.parser,
+      },
+    },
+
+    extends: [
+      eslint.configs.recommended,
+      ...typescriptEslint.configs.recommended,
+      ...eslintPluginVue.configs['flat/recommended'],
+    ],
+    rules: {
+      'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+      'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+      'vue/multi-word-component-names': 'off',
+      'vue/no-required-prop-with-default': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/ban-ts-comment': 'warn',
+
+      'prettier/prettier': [
+        'warn',
+        {
+          singleQuote: true,
+          semi: false,
+          trailingComma: 'es5',
+          printWidth: 100,
+          tabWidth: 2,
+          endOfLine: 'auto',
+        },
+      ],
+    },
+  },
+  globalIgnores([
+    'node_modules/',
+    'dist/',
+    'public/',
+    'eslint.config.cjs',
+    '.eslintrc.js',
+    '**/*.md',
+    '**/*.woff',
+    '**/*.ttf',
+    '**/.vscode/',
+    '**/.DS_Store',
+  ]),
+  eslintConfigPrettier,
+  eslintPluginPrettierRecommended
+)

frontend/package.json

@@ -3,10 +3,17 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
+  "eslintConfig": {
+    "env": {
+      "browser": true,
+      "node": true
+    }
+  },
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc -b && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "lint": "eslint . --ext .vue,.js,.ts,.jsx,.tsx --fix"
   },
   "dependencies": {
     "@antv/g2": "^5.3.3",
@@ -28,6 +35,7 @@
   },
   "devDependencies": {
     "@element-plus/icons-vue": "^2.3.1",
+    "@eslint/migrate-config": "^1.5.0",
     "@types/crypto-js": "^4.2.2",
     "@types/element-resize-detector": "^1.1.6",
     "@types/node": "^22.14.1",
@@ -41,10 +49,12 @@
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.4.1",
     "eslint-plugin-vue": "^10.2.0",
+    "globals": "^16.2.0",
     "less": "^4.3.0",
     "pinia": "^3.0.2",
     "prettier": "^3.5.3",
     "typescript": "~5.7.2",
+    "typescript-eslint": "^8.34.0",
     "unplugin-auto-import": "^19.1.2",
     "unplugin-vue-components-secondary": "^0.24.6",
     "vite": "^6.3.1",

frontend/src/App.vue

@@ -13,6 +13,4 @@ const elLanguage = computed(() => {
   </el-config-provider>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>

frontend/src/api/auth.ts

@@ -1,10 +1,11 @@
 import { request } from '@/utils/request'
 
 export const userApi = {
-  pager: (pageNumber: number, pageSize: number) => request.get(`/user/pager/${pageNumber}/${pageSize}`),
+  pager: (pageNumber: number, pageSize: number) =>
+    request.get(`/user/pager/${pageNumber}/${pageSize}`),
   add: (data: any) => request.post('/settings/terminology', data),
   edit: (data: any) => request.put('/settings/terminology', data),
   delete: (id: number) => request.delete(`/settings/terminology/${id}`),
   query: (id: number) => request.get(`/settings/terminology/${id}`),
   language: (data: any) => request.put('/user/language', data),
-}
+}