wui-components-v2 1.1.55 → 1.1.56

package/components/custom-date-picker/custom-date-picker.vue

@@ -26,9 +26,6 @@ interface SelectOption {
   value: string | number
   [key: string]: any
 }
-
-console.log(props.type, 'props.type')
-
 const open = ref(false)
 const currentValue = ref<any>(props.modelValue)
 function clear() {
@@ -38,7 +35,6 @@ function clear() {
 watch(
   () => props.modelValue,
   (val) => {
-    console.log(val, 'val1111')
     currentValue.value = val
   },
 )
@@ -55,8 +51,10 @@ const labelText = computed(() => {
   } = {
     date: 'YYYY-MM-DD',
     datetime: 'YYYY-MM-DD HH:mm',
+    year:'YYYY'
   }
-  if (['date', 'datetime'].includes(props.type)) {
+
+  if (['date', 'datetime', 'year'].includes(props.type)) {
     return currentValue.value ? dayjs(currentValue.value).format(formatMap[props.type] as string) : ''
   }
   else {
@@ -79,7 +77,7 @@ const labelText = computed(() => {
   </div>
 
   <wd-calendar
-    v-if="['date', 'datetime'].includes(type)"
+    v-if="['date', 'datetime',].includes(type)"
     v-model="currentValue"
     v-model:visible="open"
     label-key="label"

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, onBeforeMount, ref, toRaw } from 'vue'
+import { computed, onBeforeMount, ref, toRaw, watch } from 'vue'
 import type { FormSchema, FormSchemaIssue } from '@wot-ui/ui/components/wd-form/types'
 import dayjs from 'dayjs/esm/index'
 import type { Enums, Fields, Groups } from '../../type'
@@ -50,6 +50,19 @@ const { filteredFields: fields } = useCompanyFieldFilter(
   props.companyFilter, // 是否自适应显示快递公司填充框
   props.companyFieldSourceId, //  快递公司对应字段
 )
+const giveDefaultValue =(value:any)=>{
+    const {extInfo={}} = uni.getStorageSync('userInfo')||{}
+  const rawDefaultValue=extInfo.fieldMap||{};
+  const defaultValue: Record<string, any> = {}
+  for (const key in rawDefaultValue) {
+    if (Object.prototype.hasOwnProperty.call(rawDefaultValue, key)) {
+      const val = rawDefaultValue[key]
+      defaultValue[key] = typeof val === 'string' && val.includes('@R@') ? val.split('@R@')[0] : val
+    }
+  }
+  return defaultValue[value]||{}
+}
+giveDefaultValue({})
 // 初始化表单数据
 function initFormData() {
   const models: { [key: string]: any } = {}
@@ -81,14 +94,84 @@ function initFormData() {
     return models[item.sourceId] = (props.entity && props.entity[item.sourceId]) || item.transDefaultValue || ''
   })
 
-  model.value = models
+ // 遍历 models，处理 $$user. 前缀
+const processedModels: Record<string, any> = {}
+for (const key in models) {
+  if (Object.prototype.hasOwnProperty.call(models, key)) {
+    const val = models[key]
+    if (typeof val === 'string' && val.includes('$$user.')) {
+      processedModels[key] = giveDefaultValue(val.split('$$user.')[1])
+    } else {
+      processedModels[key] = val
+    }
+  }
+}
+
+  model.value = {
+    ...processedModels,
+  }
 }
 
+//-s
+const shouldMonitor=computed(()=>{
+  const newList=fields.value.filter((item:any)=>item.relValueField||item.relValueField3).map((innerItem:any)=>({
+    id: innerItem.sourceId,
+    title: innerItem.title,
+    relValueField: innerItem.relValueField.id,
+    relValueField3: innerItem.relValueField3.id,
+  }))
+  console.log('shouldMonitor:', newList)
+  return newList
+})
+//-e
+
+// 存储变化后的数据，{ [fieldKey]: newValue, ... }
+const changedData = ref<Record<string, any>>({})
+const initialModel = ref<Record<string, any>>({})
+
+// 监听 shouldMonitor 中 relValueField / relValueField3 对应的 model 字段
+watch(
+  () => {
+    const snapshot: Record<string, any> = {}
+    shouldMonitor.value?.forEach((item: any) => {
+      if (item.relValueField)
+        snapshot.relValueField = model.value[item.relValueField]
+      if (item.relValueField3)
+        snapshot.relValueField3 = model.value[item.relValueField3]
+    })
+    return snapshot
+  },
+  (newVal) => {
+    // 只存储与初始值不同的字段（表单变化的值）
+    const changed: Record<string, any> = {}
+    shouldMonitor.value?.forEach((item: any) => {
+      if (item.relValueField && newVal.relValueField !== initialModel.value[item.relValueField]) {
+        changed.relValueField = newVal.relValueField
+      }
+      if (item.relValueField3 && newVal.relValueField3 !== initialModel.value[item.relValueField3]) {
+        changed.relValueField3 = newVal.relValueField3
+      }
+    })
+    changedData.value = changed
+
+    // 当所有被监听的字段都有值时，存入缓存供 select-list 页面读取
+    const values = Object.values(newVal)
+    const allExist = values.length > 0 && values.every(v => v !== null && v !== undefined && v !== '')
+    if (allExist) {
+      uni.setStorageSync('paramsData', {
+        changedData: changedData.value,
+        rawData: shouldMonitor.value,
+      })
+    }
+  },
+)
+
 onBeforeMount(() => {
   action.value = uni.getStorageSync('BASE_URL')
   hydrocarbonProgramToken.value = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN')
   token.value = uni.getStorageSync('TOKEN')
   initFormData()
+  initialModel.value = JSON.parse(JSON.stringify(model.value))
 })
 function formatSelectColumns(columns: any) {
   return columns.map((item: any) => {
@@ -124,7 +207,6 @@ const schema = computed((): FormSchema => {
 
 // 监听文件上传成功
 function handleFileChange(e: any, item: Fields) {
-  console.log(e, item,'2222222222222')
   model.value[item.sourceId] = e.fileList
 }
 
@@ -155,7 +237,6 @@ function submit() {
             })
           }
         }
-        console.log('submit', model.value)
         resolve(data)
       }
       else {
@@ -169,10 +250,16 @@ function submit() {
   })
 }
 
+
+
+
+
 // 暴露方法/变量给父组件
 defineExpose({
   submit,
 })
+
+
 </script>
 
 <template>

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

@@ -66,7 +66,6 @@ const fetchDataById = async (id: string) => {
   if (!id || !props.sourceId) return
   const newId=Array.isArray(id)?id[0]:id
   const requestId = newId?.split('@R@')[0] || props.sourceId
-  console.log('fetchDataById', requestId, props.sourceId,id)
   try {
     const config = await pageConfig(props.sourceId)
     const newConfig=config.ltmplConfig
@@ -96,18 +95,17 @@ const emitIfNeeded = (val: string) => {
     emitVal = val + '@R@' + showValue.name
   }
   if (emitVal !== props.modelValue) {
-    console.log('emit update:modelValue', emitVal)
     emit('update:modelValue', emitVal)
   }
 }
 
 onMounted(() => {
   if (currentValue.value) {
-    fetchDataById(currentValue.value)
+    const requestId= currentValue.value.includes('$$user.')? currentValue.value.split('$$user.')[1] : currentValue.value
+    fetchDataById(requestId)
   }
 
   uni.$on(EVENT_NAME, (id: string) => {
-    console.log('user-choose 接收到id:', id)
     currentValue.value = id
     fetchDataById(id)
   })

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

@@ -141,6 +141,7 @@ async function getEnums() {
   }
 }
 
+
 // @query所绑定的方法不要自己调用！！需要刷新列表数据时，只需要调用this.$refs.paging.reload()即可
 async function queryList(pageNo: number, pageSize: number) {
   // 此处请求仅为演示，请替换为自己项目中的请求
@@ -155,7 +156,16 @@ async function queryList(pageNo: number, pageSize: number) {
   // paging.value.reload() // 手动触发加载
   // })
 
-  let qre = searchData.value
+    const search=uni.getStorageSync('paramsData')?.changedData || {}
+    const newParams={
+      thirdCriteria:search.relValueField3 || '',
+      secondCriteria:search.relValueField?.toString() || '',
+
+    }
+  const params = Object.entries(newParams)
+  .map(([key, value]) => `${key}=${value}`)
+  .join('&');
+  let qre = searchData.value?`${searchData.value+'&'+params}`:params
   if (config.value.defaultCriteriaValue) {
     for (const key in config.value.defaultCriteriaValue) {
       if (Object.prototype.hasOwnProperty.call(config.value.defaultCriteriaValue, key)) {
@@ -237,6 +247,9 @@ const formatAddress = (value:string) => {
  const checkboxType:any=computed(()=>{
   return ['relselect','relselect-extdis'].includes(extControlType.value)?'':'square'
  })
+ onUnmounted(() => {
+  uni.removeStorageSync('paramsData')
+})
 </script>
 
 <template>

package/package.json

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