vue_zhongyou 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_zhongyou",
-  "version": "1.0.13",
+  "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

@@ -211,6 +211,7 @@
     <van-area
       :area-list="areaList"
       :columns-placeholder="addressPopup.columnsPlaceholder || ['请选择', '请选择', '请选择']"
+      v-model="addressPopup.value"
       @confirm="onAddressConfirm"
       @cancel="closeAddressPicker"
     />
@@ -293,7 +294,8 @@ const addressPopup = ref({
   visible: false,
   field: null,
   areaList: null,
-  columnsPlaceholder: null
+  columnsPlaceholder: null,
+  value: ''
 })
 
 // 存储各个datetime字段的选择时间
@@ -322,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 ''
 }
 
@@ -613,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 }) => {
@@ -632,13 +666,17 @@ 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())
@@ -648,8 +686,38 @@ const onAddressConfirm = ({ selectedOptions }) => {
 
 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('')
 }