vue_zhongyou 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_zhongyou",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "main": "index.js",
   "keywords": [],

package//345/212/237/350/203/275/344/273/243/347/240/201/AI/345/257/271/350/257/235/DynamicMobileForm.vue

@@ -8,7 +8,7 @@
           v-model="formData[field.field]"
           :type="field.type === 'textarea' ? 'textarea' : 'text'"
           :label="field.label"
-          :label-width="60"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || `请输入${field.label}`"
           :rules="field.rules || []"
           :maxlength="field.maxlength"
@@ -20,7 +20,12 @@
         />
 
         <!-- 单选 -->
-        <van-field v-else-if="field.type === 'radio'" name="radio" :label="field.label" :rules="field.rules || []">
+        <van-field 
+          v-else-if="field.type === 'radio'" 
+          name="radio" 
+          :label="field.label" 
+          :label-width="field.labelWidth || 60"
+          :rules="field.rules || []">
           <template #input>
             <van-radio-group 
               v-model="formData[field.field]" 
@@ -41,7 +46,12 @@
 
 
         <!-- 多选 -->
-        <van-field v-else-if="field.type === 'checkbox'" name="checkboxGroup" :label="field.label" :rules="field.rules || []">
+        <van-field 
+          v-else-if="field.type === 'checkbox'" 
+          name="checkboxGroup" 
+          :label="field.label" 
+          :label-width="field.labelWidth || 60"
+          :rules="field.rules || []">
           <template #input>
             <van-checkbox-group 
               v-model="formData[field.field]" 
@@ -66,6 +76,7 @@
           is-link
           readonly
           :label="field.label"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || `请选择${field.label}`"
           :model-value="getSelectLabel(field)"
           :rules="field.rules || []"
@@ -78,6 +89,7 @@
           is-link
           readonly
           :label="field.label"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || '请选择时间范围'"
           :rules="field.rules || []"
           :model-value="getDateRangeText(field)"
@@ -90,7 +102,7 @@
           is-link
           readonly
           :label="field.label"
-          :label-width="60"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || '请选择日期时间范围'"
           :model-value="getDateTimeRangeText(field)"
           :rules="field.rules || []"
@@ -103,6 +115,7 @@
           is-link
           readonly
           :label="field.label"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || '请选择地址'"
           :rules="field.rules || []"
           :model-value="getAddressText(field)"
@@ -115,7 +128,7 @@
           is-link
           readonly
           :label="field.label"
-          :label-width="60"
+          :label-width="field.labelWidth || 60"
           :placeholder="field.placeholder || '请选择日期时间'"
           :model-value="getDateTimeText(field)"
           :rules="field.rules || []"
@@ -283,6 +296,9 @@ const addressPopup = ref({
   columnsPlaceholder: null
 })
 
+// 存储各个datetime字段的选择时间
+const dateTimeValues = ref({})
+
 // 单个日期时间弹窗状态
 const dateTimePopup = ref({
   visible: false,
@@ -341,16 +357,31 @@ watch(
 
 const updateFieldValue = (field, value) => {
   formData[field] = value
-  emit('update:modelValue', snapshot())
   emit('change', { field, value, values: snapshot() })
 }
 
 const handleSubmit = () => {
+  emit('update:modelValue', snapshot())
   emit('submit', snapshot())
 }
 
 const handleReset = () => {
-  initializeFormData()
+  // 清空表单数据
+  Object.keys(formData).forEach(key => {
+    delete formData[key]
+  })
+  
+  // 清除保存的datetime值
+  Object.keys(dateTimeValues.value).forEach(key => {
+    delete dateTimeValues.value[key]
+  })
+  
+  // 重新初始化表单数据为空值
+  normalizedSchema.value.forEach((field) => {
+    const key = field.field
+    formData[key] = getDefaultValue(field.type)
+  })
+  
   emit('update:modelValue', snapshot())
   emit('reset', snapshot())
 }
@@ -375,6 +406,9 @@ const onSelectConfirm = ({ selectedOptions }) => {
   const option = selectedOptions?.[0]
   if (option && selectPopup.value.field) {
     updateFieldValue(selectPopup.value.field.field, option.value)
+    
+    // 触发modelValue更新
+    emit('update:modelValue', snapshot())
   }
   closeSelect()
 }
@@ -473,6 +507,9 @@ const confirmDateTimeRange = () => {
   // 更新表单数据
   if (dateTimeRangePopup.value.field) {
     updateFieldValue(dateTimeRangePopup.value.field.field, [startDateStr, endDateStr])
+    
+    // 触发modelValue更新
+    emit('update:modelValue', snapshot())
   }
   // 关闭弹窗
   closeDateTimeRange()
@@ -548,6 +585,10 @@ const onDateRangeConfirm = (values) => {
   }
   const [start, end] = values
   updateFieldValue(dateRangePopup.value.field.field, [formatDate(start), formatDate(end)])
+  
+  // 触发modelValue更新
+  emit('update:modelValue', snapshot())
+  
   closeDateRange()
 }
 
@@ -598,6 +639,10 @@ const onAddressConfirm = ({ selectedOptions }) => {
     county: county?.text || '',
     code: county?.value || city?.value || province?.value || ''
   })
+  
+  // 触发modelValue更新
+  emit('update:modelValue', snapshot())
+  
   closeAddressPicker()
 }
 
@@ -613,16 +658,32 @@ const openDateTime = (field) => {
   dateTimePopup.value.visible = true
   dateTimePopup.value.field = field
   
-  // 设置默认时间为当天8:30
-  const today = new Date()
-  const defaultTime = new Date(today)
-  defaultTime.setHours(8, 30, 0, 0)
+  // 检查是否已有该字段的保存值
+  const savedTime = dateTimeValues.value[field.field]
+  
+  // 检查表单数据中是否有该字段的值
+  const formValue = formData[field.field]
   
-  // 将field的时间转换为日期时间格式
-  dateTimePopup.value.selectedTime = typeof field.defaultValue === 'string' ? reverseFormatDateTime(field.defaultValue) : defaultTime
+  if (savedTime) {
+    // 如果已经有保存的时间，则使用保存的时间
+    dateTimePopup.value.selectedTime = new Date(savedTime)
+  } else if (formValue) {
+    // 如果表单数据中有该字段的值，则使用表单数据中的值
+    dateTimePopup.value.selectedTime = typeof formValue === 'string' ? reverseFormatDateTime(formValue) : new Date(formValue)
+  } else if (field.defaultValue) {
+    // 如果字段有默认值，则使用字段的默认值
+    dateTimePopup.value.selectedTime = typeof field.defaultValue === 'string' ? reverseFormatDateTime(field.defaultValue) : new Date(field.defaultValue)
+  } else {
+    // 否则设置默认时间为当天8:30
+    const today = new Date()
+    const defaultTime = new Date(today)
+    defaultTime.setHours(8, 30, 0, 0)
+    dateTimePopup.value.selectedTime = defaultTime
+  }
   
-  // 初始化当前小时值
-  dateTimePopup.value.currentHour = '8'
+  // 更新当前小时值
+  const hours = dateTimePopup.value.selectedTime.getHours()
+  dateTimePopup.value.currentHour = hours.toString().padStart(2, '0')
 }
 
 const closeDateTime = () => {
@@ -637,9 +698,15 @@ const confirmDateTime = () => {
   // 格式化日期时间
   const dateTimeStr = formatDateTime(dateTimePopup.value.selectedTime)
   
-  // 更新表单数据
+  // 保存当前字段的时间值
   if (dateTimePopup.value.field) {
+    dateTimeValues.value[dateTimePopup.value.field.field] = new Date(dateTimePopup.value.selectedTime)
+    
+    // 更新表单数据
     updateFieldValue(dateTimePopup.value.field.field, dateTimeStr)
+    
+    // 触发modelValue更新
+    emit('update:modelValue', snapshot())
   }
   
   // 关闭弹窗