af-mobile-client-vue3 1.1.13 → 1.1.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/components/data/XCellList/index.vue

@@ -212,8 +212,8 @@ function onLoad() {
       pageSize,
       conditionParams: {
         $queryValue: searchVal,
-        ...conditionParams.value,
         ...fixQueryForm,
+        ...conditionParams.value,
       },
       sortField: orderVal?.value,
       sortOrder: sortordVal?.value,

package/src/components/data/XFormItem/index.vue

@@ -199,6 +199,9 @@ watch(() => props.modelValue, (newVal) => {
   }
   else {
     localValue.value = newVal !== undefined ? newVal : getDefaultValue()
+    if (attr.type === 'rangePicker') {
+      pickerValue.value = newVal !== undefined ? `${newVal[0]} ~ ${newVal[1]}` : ''
+    }
   }
 })
 
@@ -388,6 +391,7 @@ const formatDate = date => `${date.getFullYear()}-${date.getMonth() + 1}-${date.
 
 function onCalendarConfirm(values) {
   localValue.value = [formatDate(values[0]), formatDate(values[1])]
+  pickerValue.value = `${formatDate(values[0])} ~ ${formatDate(values[1])}`
   calendarShow.value = false
 }
 
@@ -446,7 +450,7 @@ function init() {
     }
     if (attr.queryFormDefault) {
       // console.log(querySelectDefaultValue.value)
-      querySelectDefaultValue.value.push(attr.queryFormDefault)
+      querySelectDefaultValue.value.push(...attr.queryFormDefault)
       // querySelectDefaultValue.value = attr.queryFormDefault
     }
   }
@@ -806,7 +810,7 @@ function handleAddressConfirm(location) {
     <!-- 日历选择-查询 -->
     <VanField
       v-if="attr.type === 'rangePicker' && mode === '查询' && showItem"
-      v-model="(localValue as string | number)"
+      v-model="(pickerValue as string | number)"
       is-link
       readonly
       name="rangePicker"

package/src/views/component/XCellListView/index.vue

@@ -121,6 +121,7 @@ function deleteRow(result) {
         :config-name="configName"
         :service-name="serviceName"
         :id-key="idKey"
+        :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }"
         @to-detail="toDetail"
         @delete-row="deleteRow"
         @update="updateRow"