vue_zhongyou 1.0.12 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_zhongyou",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "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 || []"
@@ -198,6 +211,7 @@
     <van-area
       :area-list="areaList"
       :columns-placeholder="addressPopup.columnsPlaceholder || ['请选择', '请选择', '请选择']"
+      v-model="addressPopup.value"
       @confirm="onAddressConfirm"
       @cancel="closeAddressPicker"
     />
@@ -280,7 +294,8 @@ const addressPopup = ref({
   visible: false,
   field: null,
   areaList: null,
-  columnsPlaceholder: null
+  columnsPlaceholder: null,
+  value: ''
 })
 
 // 存储各个datetime字段的选择时间
@@ -309,7 +324,7 @@ const getDefaultValue = (type) => {
   if (type === 'dateRange') return ['', '']
   if (type === 'datetimeRange') return ['', '']
   if (type === 'datetime') return ''
-  if (type === 'address') return { province: '', city: '', county: '', code: '' }
+  if (type === 'address') return ''
   return ''
 }
 
@@ -344,21 +359,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 = () => {
+  // 清空表单数据
+  Object.keys(formData).forEach(key => {
+    delete formData[key]
+  })
+  
   // 清除保存的datetime值
   Object.keys(dateTimeValues.value).forEach(key => {
     delete dateTimeValues.value[key]
   })
   
-  initializeFormData()
+  // 重新初始化表单数据为空值
+  normalizedSchema.value.forEach((field) => {
+    const key = field.field
+    formData[key] = getDefaultValue(field.type)
+  })
+  
   emit('update:modelValue', snapshot())
   emit('reset', snapshot())
 }
@@ -383,6 +408,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()
 }
@@ -481,6 +509,9 @@ const confirmDateTimeRange = () => {
   // 更新表单数据
   if (dateTimeRangePopup.value.field) {
     updateFieldValue(dateTimeRangePopup.value.field.field, [startDateStr, endDateStr])
+    
+    // 触发modelValue更新
+    emit('update:modelValue', snapshot())
   }
   // 关闭弹窗
   closeDateTimeRange()
@@ -556,6 +587,10 @@ const onDateRangeConfirm = (values) => {
   }
   const [start, end] = values
   updateFieldValue(dateRangePopup.value.field.field, [formatDate(start), formatDate(end)])
+  
+  // 触发modelValue更新
+  emit('update:modelValue', snapshot())
+  
   closeDateRange()
 }
 
@@ -580,16 +615,48 @@ const getDateTimeRangeText = (field) => {
 
 // Address
 const openAddressPicker = (field) => {
-  addressPopup.value = {
+  const config = {
     visible: true,
     field,
     areaList: areaList,
     columnsPlaceholder: field.columnsPlaceholder
   }
+  
+  // 如果表单数据中已有code值，则设置默认选中项
+  const fieldValue = formData[field.field]
+  let code = ''
+  
+  // 如果fieldValue是一个对象且包含code属性
+  if (fieldValue && typeof fieldValue === 'object' && fieldValue.code) {
+    code = fieldValue.code
+  }
+  // 如果fieldValue是一个字符串（直接是code值）
+  else if (fieldValue && typeof fieldValue === 'string') {
+    code = fieldValue
+  }
+  
+  if (code) {
+    config.value = getCodeToAreaValue(code)
+  }
+  
+  addressPopup.value = config
+}
+
+// 根据code获取地址选择器的默认值
+const getCodeToAreaValue = (code) => {
+  if (!code) return ''
+  
+  // 确保code是字符串且长度为6
+  const codeStr = String(code).padEnd(6, '0')
+  
+  // 返回完整的6位code作为value
+  return codeStr
 }
 
 const closeAddressPicker = () => {
   addressPopup.value.visible = false
+  // 清除value值，以免影响下次打开
+  addressPopup.value.value = ''
 }
 
 const onAddressConfirm = ({ selectedOptions }) => {
@@ -599,20 +666,58 @@ const onAddressConfirm = ({ selectedOptions }) => {
   }
   console.log(selectedOptions);
   
-  const [province, city, county] = selectedOptions
-  updateFieldValue(addressPopup.value.field.field, {
-    province: province?.text || '',
-    city: city?.text || '',
-    county: county?.text || '',
-    code: county?.value || city?.value || province?.value || ''
-  })
+  // 从数组中找出最后一项value值不为000000的值作为当前的code值返回
+  let code = '';
+  for (let i = selectedOptions.length - 1; i >= 0; i--) {
+    const option = selectedOptions[i];
+    if (option && option.value && option.value !== '000000') {
+      code = option.value;
+      break;
+    }
+  }
+  
+  updateFieldValue(addressPopup.value.field.field, code)
+  
+  // 触发modelValue更新
+  emit('update:modelValue', snapshot())
+  
   closeAddressPicker()
 }
 
 const getAddressText = (field) => {
   const value = formData[field.field]
-  if (!value) return ''
-  const parts = [value.province, value.city, value.county].filter(Boolean)
+  // 如果value是一个对象且包含code属性
+  if (value && typeof value === 'object' && value.code) {
+    return getCodeToAddressText(value.code)
+  }
+  
+  // 如果value是一个字符串（直接是code值）
+  if (value && typeof value === 'string') {
+    return getCodeToAddressText(value)
+  }
+  
+  return ''
+}
+
+// 根据code获取地址文本
+const getCodeToAddressText = (code) => {
+  if (!code) return ''
+  
+  // 确保code是字符串且长度为6
+  const codeStr = String(code).padEnd(6, '0')
+  
+  // 提取省、市、区县的code
+  const provinceCode = codeStr.substring(0, 2) + '0000'
+  const cityCode = codeStr.substring(0, 4) + '00'
+  const countyCode = codeStr
+  
+  // 获取对应的文本
+  const province = areaList.province_list[provinceCode] || ''
+  const city = areaList.city_list[cityCode] || ''
+  const county = areaList.county_list[countyCode] || ''
+  
+  // 过滤掉空值并拼接
+  const parts = [province, city, county].filter(Boolean)
   return parts.join('')
 }
 
@@ -624,16 +729,24 @@ const openDateTime = (field) => {
   // 检查是否已有该字段的保存值
   const savedTime = dateTimeValues.value[field.field]
   
-  // 如果已经有保存的时间，则使用保存的时间，否则设置默认时间为当天8:30
+  // 检查表单数据中是否有该字段的值
+  const formValue = formData[field.field]
+  
   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)
-    
-    // 将field的时间转换为日期时间格式
-    dateTimePopup.value.selectedTime = typeof field.defaultValue === 'string' ? reverseFormatDateTime(field.defaultValue) : defaultTime
+    dateTimePopup.value.selectedTime = defaultTime
   }
   
   // 更新当前小时值
@@ -659,6 +772,9 @@ const confirmDateTime = () => {
     
     // 更新表单数据
     updateFieldValue(dateTimePopup.value.field.field, dateTimeStr)
+    
+    // 触发modelValue更新
+    emit('update:modelValue', snapshot())
   }
   
   // 关闭弹窗