update code

package.json

@@ -113,6 +113,7 @@
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recommended": "^14.0.1",
     "stylelint-config-standard": "^36.0.1",
+    "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-order": "^6.0.4",
     "terser": "^5.39.0",
     "typescript": "5.3.3",
@@ -128,8 +129,8 @@
     "vite-plugin-purge-icons": "^0.10.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-top-level-await": "^1.5.0",
-    "vue-eslint-parser": "^9.4.3",
     "vite-plugin-vue-devtools": "^7.7.0",
+    "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^1.8.27"
   },
   "license": "MIT",

pnpm-lock.yaml

@@ -267,6 +267,9 @@ importers:
       stylelint-config-standard:
         specifier: ^36.0.1
         version: 36.0.1(stylelint@16.14.1(typescript@5.3.3))
+      stylelint-config-standard-scss:
+        specifier: ^14.0.0
+        version: 14.0.0(postcss@8.5.2)(stylelint@16.14.1(typescript@5.3.3))
       stylelint-order:
         specifier: ^6.0.4
         version: 6.0.4(stylelint@16.14.1(typescript@5.3.3))
@@ -4100,6 +4103,9 @@ packages:
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
+  mdn-data@2.18.0:
+    resolution: {integrity: sha512-gtCy1yim/vpHF/tq3B4Z43x3zKWpYeb4IM3d/Mf4oMYcNuoXOYEaqtoFlLHw9zd7+WNN3jNh6/WXyUrD3OIiwQ==}
+
   memoize-one@6.0.0:
     resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
 
@@ -4514,6 +4520,9 @@ packages:
     resolution: {integrity: sha512-5mMeb1TgLWoRKxZ0Xh9RZDfwUUIqRrcxO2uXO+Ezl1N5lqpCiSU5Gk6+1kZediBfBHFtPCdopr2UZ2SgUsKcgQ==}
     engines: {node: ^12 || >=14}
 
+  postcss-media-query-parser@0.2.3:
+    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
+
   postcss-prefix-selector@1.16.1:
     resolution: {integrity: sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==}
     peerDependencies:
@@ -5072,12 +5081,32 @@ packages:
       postcss-html: ^1.0.0
       stylelint: '>=14.0.0'
 
+  stylelint-config-recommended-scss@14.1.0:
+    resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+      stylelint: ^16.6.1
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+
   stylelint-config-recommended@14.0.1:
     resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
     engines: {node: '>=18.12.0'}
     peerDependencies:
       stylelint: ^16.1.0
 
+  stylelint-config-standard-scss@14.0.0:
+    resolution: {integrity: sha512-6Pa26D9mHyi4LauJ83ls3ELqCglU6VfCXchovbEqQUiEkezvKdv6VgsIoMy58i00c854wVmOw0k8W5FTpuaVqg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+      stylelint: ^16.11.0
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+
   stylelint-config-standard@36.0.1:
     resolution: {integrity: sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==}
     engines: {node: '>=18.12.0'}
@@ -5089,6 +5118,12 @@ packages:
     peerDependencies:
       stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
 
+  stylelint-scss@6.11.1:
+    resolution: {integrity: sha512-e4rYo0UY+BIMtGeGanghrvHTjcryxgZbyFxUedp8dLFqC4P70aawNdYjRrQxbnKhu3BNr4+lt5e/53tcKXiwFA==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.0.2
+
   stylelint@16.14.1:
     resolution: {integrity: sha512-oqCL7AC3786oTax35T/nuLL8p2C3k/8rHKAooezrPGRvUX0wX+qqs5kMWh5YYT4PHQgVDobHT4tw55WgpYG6Sw==}
     engines: {node: '>=18.12.0'}
@@ -10018,6 +10053,8 @@ snapshots:
 
   mdn-data@2.12.2: {}
 
+  mdn-data@2.18.0: {}
+
   memoize-one@6.0.0: {}
 
   meow@12.1.1: {}
@@ -10425,6 +10462,8 @@ snapshots:
       postcss: 8.5.2
       postcss-safe-parser: 6.0.0(postcss@8.5.2)
 
+  postcss-media-query-parser@0.2.3: {}
+
   postcss-prefix-selector@1.16.1(postcss@5.2.18):
     dependencies:
       postcss: 5.2.18
@@ -11035,10 +11074,27 @@ snapshots:
       postcss-html: 1.8.0
       stylelint: 16.14.1(typescript@5.3.3)
 
+  stylelint-config-recommended-scss@14.1.0(postcss@8.5.2)(stylelint@16.14.1(typescript@5.3.3)):
+    dependencies:
+      postcss-scss: 4.0.9(postcss@8.5.2)
+      stylelint: 16.14.1(typescript@5.3.3)
+      stylelint-config-recommended: 14.0.1(stylelint@16.14.1(typescript@5.3.3))
+      stylelint-scss: 6.11.1(stylelint@16.14.1(typescript@5.3.3))
+    optionalDependencies:
+      postcss: 8.5.2
+
   stylelint-config-recommended@14.0.1(stylelint@16.14.1(typescript@5.3.3)):
     dependencies:
       stylelint: 16.14.1(typescript@5.3.3)
 
+  stylelint-config-standard-scss@14.0.0(postcss@8.5.2)(stylelint@16.14.1(typescript@5.3.3)):
+    dependencies:
+      stylelint: 16.14.1(typescript@5.3.3)
+      stylelint-config-recommended-scss: 14.1.0(postcss@8.5.2)(stylelint@16.14.1(typescript@5.3.3))
+      stylelint-config-standard: 36.0.1(stylelint@16.14.1(typescript@5.3.3))
+    optionalDependencies:
+      postcss: 8.5.2
+
   stylelint-config-standard@36.0.1(stylelint@16.14.1(typescript@5.3.3)):
     dependencies:
       stylelint: 16.14.1(typescript@5.3.3)
@@ -11050,6 +11106,18 @@ snapshots:
       postcss-sorting: 8.0.2(postcss@8.5.2)
       stylelint: 16.14.1(typescript@5.3.3)
 
+  stylelint-scss@6.11.1(stylelint@16.14.1(typescript@5.3.3)):
+    dependencies:
+      css-tree: 3.1.0
+      is-plain-object: 5.0.0
+      known-css-properties: 0.35.0
+      mdn-data: 2.18.0
+      postcss-media-query-parser: 0.2.3
+      postcss-resolve-nested-selector: 0.1.6
+      postcss-selector-parser: 7.1.0
+      postcss-value-parser: 4.2.0
+      stylelint: 16.14.1(typescript@5.3.3)
+
   stylelint@16.14.1(typescript@5.3.3):
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)

src/api/infra/dataSourceConfig/index.ts

@@ -1,7 +1,7 @@
 import request from '@/config/axios'
 
 export interface DataSourceConfigVO {
-  id: number | undefined
+  id: number
   name: string
   url: string
   username: string

src/components/Dialog/src/Dialog.vue

@@ -9,7 +9,7 @@ const props = defineProps({
   modelValue: propTypes.bool.def(false),
   title: propTypes.string.def('Dialog'),
   fullscreen: propTypes.bool.def(true),
-  width: propTypes.oneOfType([String, Number]).def('40%'),
+  width: propTypes.oneOfType([String, Number]).def('85%'),
   scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话，按照 maxHeight 设置最大高度
   maxHeight: propTypes.oneOfType([String, Number]).def('400px')
 })
@@ -105,7 +105,6 @@ const dialogStyle = computed(() => {
     </template>
   </ElDialog>
 </template>
-
 <style lang="scss">
 .com-dialog {
   .#{$elNamespace}-overlay-dialog {

src/locales/zh-CN.ts

@@ -2395,4 +2395,4 @@ export default {
     scord: '秒'
   },
   'OAuth 2.0': 'OAuth 2.0' // 避免菜单名是 OAuth 2.0 时，一直 warn 报错
-}
+}

src/styles/var.css

@@ -63,4 +63,5 @@ html,
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }

src/views/infra/codegen/ImportTable.vue

@@ -1,7 +1,7 @@
 <template>
   <Dialog v-model="dialogVisible" :title="t('infra.importTable')" width="800px">
     <!-- 搜索栏 -->
-    <el-form ref="queryFormRef" :inline="true" :model="queryParams" label-width="68px">
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams">
       <el-form-item :label="t('infra.dataSource')" prop="dataSourceConfigId">
         <el-select
           v-model="queryParams.dataSourceConfigId"

src/views/system/menu/MenuForm.vue

@@ -1,6 +1,6 @@
 <template>
   <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="auto">
       <el-form-item :label="t('system.parentMenu')">
         <el-tree-select
           v-model="formData.parentId"