Browse Source

feat: 同步代码

kailong321200875 1 year ago
parent
commit
4891f49b7d
4 changed files with 28 additions and 7 deletions
  1. 2 2
      package.json
  2. 10 2
      src/components/Form/src/Form.vue
  3. 3 0
      src/components/TabMenu/src/TabMenu.vue
  4. 13 3
      uno.config.ts

+ 2 - 2
package.json

@@ -11,7 +11,7 @@
     "build:pro": "pnpm vite build --mode pro",
     "build:gitee": "pnpm vite build --mode gitee",
     "build:dev": "pnpm vite build --mode dev",
-    "build:test": "pnpm run ts:check && vite build --mode test",
+    "build:test": "pnpm vite build --mode test",
     "serve:pro": "pnpm vite preview --mode pro",
     "serve:dev": "pnpm vite preview --mode dev",
     "serve:test": "pnpm vite preview --mode test",
@@ -40,7 +40,7 @@
     "driver.js": "^1.3.1",
     "echarts": "^5.4.3",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.4.4",
+    "element-plus": "2.5.3",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",

+ 10 - 2
src/components/Form/src/Form.vue

@@ -406,7 +406,15 @@ export default defineComponent({
   margin-left: 0 !important;
 }
 
-.@{elNamespace}-form--inline .@{elNamespace}-input {
-  width: 245px;
+.@{elNamespace}-form--inline {
+  :deep(.el-form-item__content) {
+    & > :first-child {
+      min-width: 229.5px;
+    }
+  }
+  .@{elNamespace}-input-number {
+    // 229.5px是兼容el-input-number的最小宽度,
+    min-width: 229.5px;
+  }
 }
 </style>

+ 3 - 0
src/components/TabMenu/src/TabMenu.vue

@@ -85,6 +85,9 @@ export default defineComponent({
         } else {
           showTitle.value = !collapse
         }
+      },
+      {
+        immediate: true
       }
     )
 

+ 13 - 3
uno.config.ts

@@ -1,16 +1,26 @@
 import { defineConfig, toEscapedSelector as e, presetUno, presetIcons } from 'unocss'
 import transformerVariantGroup from '@unocss/transformer-variant-group'
+import { loadEnv } from 'vite'
+
+const root = process.cwd()
 
 const createPresetIcons = () => {
+  const isBuild = !!process.argv[4]
+  let env = {} as any
+  if (!isBuild) {
+    env = loadEnv(process.argv[4], root)
+  } else {
+    env = loadEnv(process.argv[3], root)
+  }
   // @ts-ignore
-  if (import.meta.env.VITE_USE_ONLINE_ICON === 'true') {
+  if (env.VITE_USE_ONLINE_ICON === 'true') {
+    return []
+  } else {
     return [
       presetIcons({
         prefix: ''
       })
     ]
-  } else {
-    return []
   }
 }