vue2server7 7.0.21 → 7.0.23

package/frontEnd/src/components/NumberRange.vue

@@ -8,7 +8,7 @@
       :disabled="disabled"
       clearable
       @input="onMinInput"
-      @focus="onFocus"
+      @focus="onMinFocus"
       @blur="onMinBlur"
       @clear="onMinClear"
     />
@@ -21,7 +21,7 @@
       :disabled="disabled"
       clearable
       @input="onMaxInput"
-      @focus="onFocus"
+      @focus="onMaxFocus"
       @blur="onMaxBlur"
       @clear="onMaxClear"
     />
@@ -33,14 +33,15 @@
 import { ref, watch, computed } from 'vue'
 
 export type RangeValue = [number | null, number | null]
+type RangeInput = [number | string | null, number | string | null]
 
 const props = withDefaults(defineProps<{
-  /** 数组模式绑定值 [min, max] */
-  modelValue?: RangeValue
-  /** 双字段模式 - 起始值 */
-  start?: number | null
-  /** 双字段模式 - 结束值 */
-  end?: number | null
+  /** 数组模式绑定值 [min, max]，接受字符串自动转换 */
+  modelValue?: RangeInput
+  /** 双字段模式 - 起始值，接受字符串自动转换 */
+  start?: number | string | null
+  /** 双字段模式 - 结束值，接受字符串自动转换 */
+  end?: number | string | null
   minPlaceholder?: string
   maxPlaceholder?: string
   separator?: string
@@ -156,33 +157,36 @@ function onMaxClear() {
   emitValue()
 }
 
-function onFocus() {
-  // 获取焦点时清除错误提示
+function onMinFocus() {
+  minFocused.value = true
+  hasBlurred.value = false
+}
+
+function onMaxFocus() {
+  maxFocused.value = true
   hasBlurred.value = false
 }
 
 function onMinBlur() {
   minFocused.value = false
-  // 格式化
-  let v = toNum(minDisplay.value)
+  const v = toNum(minDisplay.value)
   if (v !== null) {
     minDisplay.value = String(formatNum(v))
   }
   emitValue()
-  // 两个都失焦后标记
-  if (!minFocused.value && !maxFocused.value) {
+  if (!maxFocused.value) {
     hasBlurred.value = true
   }
 }
 
 function onMaxBlur() {
   maxFocused.value = false
-  let v = toNum(maxDisplay.value)
+  const v = toNum(maxDisplay.value)
   if (v !== null) {
     maxDisplay.value = String(formatNum(v))
   }
   emitValue()
-  if (!minFocused.value && !maxFocused.value) {
+  if (!minFocused.value) {
     hasBlurred.value = true
   }
 }
@@ -202,7 +206,7 @@ function reset() {
 
 defineExpose({ validate, reset })
 
-// 同步外部值
+// 同步外部值（可能是字符串，先转数字再生成显示值）
 watch(
   () => ({
     isArrayMode: isArrayMode.value,
@@ -210,8 +214,10 @@ watch(
     max: isArrayMode.value ? props.modelValue?.[1] : props.end
   }),
   ({ min, max }) => {
-    const newMin = min !== null && min !== undefined ? String(min) : ''
-    const newMax = max !== null && max !== undefined ? String(max) : ''
+    const minNum = toNum(min)
+    const maxNum = toNum(max)
+    const newMin = minNum !== null ? String(formatNum(minNum)) : ''
+    const newMax = maxNum !== null ? String(formatNum(maxNum)) : ''
     if (newMin !== minDisplay.value) minDisplay.value = newMin
     if (newMax !== maxDisplay.value) maxDisplay.value = newMax
   },

package/frontEnd/src/pages/TablePage.vue

@@ -65,7 +65,7 @@
           <template v-else-if="col.type === 'action'">
             <el-button type="text" size="small" @click="onView(row)">详情</el-button>
             <el-button type="text" size="small" @click="onDelete(row)">删除</el-button>
-    x x      </template>
+          </template>
           <template v-else>
             {{ row[col.prop] }}
           </template>
@@ -93,9 +93,9 @@ import NumberRange from '../components/NumberRange.vue'
 interface SearchForm {
   keyword: string
   type: string
-  amountRange: [number | null, number | null]
-  ageMin: number | null
-  ageMax: number | null
+  amountRange: [number | string | null, number | string | null]
+  ageMin: number | string | null
+  ageMax: number | string | null
 }
 
 interface ColumnConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server7",
-  "version": "7.0.21",
+  "version": "7.0.23",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",