wui-components-v2 1.1.71 → 1.1.72

package/components/fold-card/fold-card.vue

@@ -73,7 +73,6 @@ function toggleCollapse(contentId: string) {
     collapseIcon.value = 'arrow-down'
   }
 }
-console.log(props, 'props')
 </script>
 
 <template>
@@ -98,6 +97,7 @@ console.log(props, 'props')
                   )
                 }}
               </view>
+              <!-- <slot name="addressInfo" />s -->
             </view>
             <!-- <slot name="detailAddress" /> -->
           </view>

package/components/form-control/form-control.vue

@@ -273,7 +273,7 @@ function submit() {
               })
             }
           }
-          resolve(data)
+          resolve({ ...clearValueMap, ...data })
         } else {
           reject(valid)
         }
@@ -289,6 +289,14 @@ function submit() {
 defineExpose({
   submit,
 })
+const clearValueMap = fields.value.reduce(
+  (acc, field) => {
+    acc[field.id] = field.clearValueOnHidden ? '' : field.defaultValue ?? null
+    return acc
+  },
+  {} as Record<string, any>
+)
+console.log('clearValueMap', clearValueMap)
 </script>
 
 <template>

package/components/user-choose/user-choose.vue

@@ -7,9 +7,9 @@
       </view>
       <view>{{ showValue.address }}</view>
     </view>
-    <view class="flex items-center gap-1 text-3">
+    <view class="flex items-center gap-1 text-3" @tap="toAddressList">
       通讯录
-      <wd-icon name="user" size="18px" @tap="toAddressList" />
+      <wd-icon name="user" size="18px" />
     </view>
   </div>
 </template>

package/components/wui-select-list/wui-select-list.vue

@@ -150,15 +150,7 @@ async function queryList(pageNo: number, pageSize: number) {
   // paging.value.reload() // 手动触发加载
   // })
 
-  const search = uni.getStorageSync('paramsData')?.changedData || {}
-    const newParams = {
-      thirdCriterion: search.relValueField3 || '',
-      secondCriterion: search.relValueField?.toString() || '',
-    }
-  const params = Object.entries(newParams)
-    .map(([key, value]) => `${key}=${value}`)
-    .join('&')
-  let qre = searchData.value ? `${searchData.value + '&' + params}` : params
+  let qre = searchData.value
   if (config.value.defaultCriteriaValue) {
     for (const key in config.value.defaultCriteriaValue) {
       if (Object.prototype.hasOwnProperty.call(config.value.defaultCriteriaValue, key)) {

package/composables/useCompanyFieldFilter.ts

@@ -8,7 +8,7 @@ export function useCompanyFieldFilter(
   fieldGroup: () => Groups | undefined,
   model: Ref<any>,
   enabled: boolean = true,
-  companyFieldSourceId: string = COMPANY_FIELD_SOURCE_ID,
+  companyFieldSourceId: string = COMPANY_FIELD_SOURCE_ID
 ) {
   const deliveryCompanySourceId = ref<string>('')
   const selectedCompany = ref<string>('')
@@ -16,11 +16,11 @@ export function useCompanyFieldFilter(
   if (enabled) {
     watch(
       () => fieldGroup()?.fields,
-      (newFields) => {
+      newFields => {
         const companyField: any = newFields?.find((item: any) => item.sourceId === companyFieldSourceId) || {}
         deliveryCompanySourceId.value = companyField.sourceId || ''
       },
-      { deep: true, immediate: true },
+      { deep: true, immediate: true }
     )
 
     // 直接监听 model 中对应字段的值变化
@@ -33,59 +33,61 @@ export function useCompanyFieldFilter(
 
     watch(
       companyFieldValue,
-      (newValue) => {
+      newValue => {
         selectedCompany.value = newValue ? String(newValue).substring(0, 2) : ''
       },
-      { immediate: true },
+      { immediate: true }
     )
   }
 
-  const formatFieldsItem=(company:string,item:any)=>{
-     const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue||''
-      const isHidden=item?.unusableMode==='hidden'
-      const values = transDefaultValue.split(',').map(v => v.trim())
-    if(!company){
+  const formatFieldsItem = (company: string, item: any) => {
+    const transDefaultValue = item.usableRuleCriteria?.[0]?.transDefaultValue || ''
+    const isHidden = item?.unusableMode === 'hidden'
+    const values = transDefaultValue.split(',').map(v => v.trim())
+    if (!company) {
       return {
         ...item,
-        hidden:isHidden,
+        hidden: isHidden,
       }
-    }else{
-
+    } else {
       return {
         ...item,
-        hidden: values.some(v => v.includes(company))?false:item.hidden,
+        hidden: values.some(v => v.includes(company)) ? false : item.hidden,
       }
-
     }
   }
   const filteredFields = computed(() => {
     const company = selectedCompany.value
     const allFields = fieldGroup()?.fields
-    if (!allFields)
-      return []
+    if (!allFields) return []
     const formattedFields = allFields.filter((item: any) => {
       // 如果没有选中公司，所有字段都显示
       if (!company) {
         return true
       }
-      // 检查 usableRuleCriterias 是否存在且有值
-      if (!item.usableRuleCriterias || item.usableRuleCriterias.length === 0) {
+      // 检查 usableRuleCriteria 是否存在且有值
+      if (!item.usableRuleCriteria || item.usableRuleCriteria.length === 0) {
         return true
       }
       // 获取 transDefaultValue 并检查是否包含选中的公司
-      const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue
+      const transDefaultValue = item.usableRuleCriteria?.[0]?.transDefaultValue
       if (typeof transDefaultValue === 'string') {
         const values = transDefaultValue.split(',').map(v => v.trim())
         // console.log('transDefaultValue', company, 'values', values,values.includes(company))
-        return values.some(v => v.includes(company) )
+        return values.some(v => v.includes(company))
       }
       return true
     })
+    console.log('formattedFields', formattedFields)
     return formattedFields.map((item: any) => formatFieldsItem(company, item))
   })
-  watch(filteredFields, (val) => {
-    // console.log('filteredFields变化了', val, 'selectedCompany:', selectedCompany.value)
-  }, { immediate: true })
+  watch(
+    filteredFields,
+    val => {
+      // console.log('filteredFields变化了', val, 'selectedCompany:', selectedCompany.value)
+    },
+    { immediate: true }
+  )
 
   return { filteredFields, selectedCompany }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.71",
+  "version": "1.1.72",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",