wui-components-v2 1.1.84 → 1.1.86

package/components/add-address-page/add-address-page.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="rounded-md mb-3">
     <view class="rounded-md shadow-md dark:bg-[#252530] pb-3">
-      <wd-textarea v-model="personDetail" placeholder="「粘贴识别」或输入文本，智能拆分、姓名、电话和地址" />
+      <wd-textarea v-model="personDetail" :readonly="readonly" placeholder="「粘贴识别」或输入文本，智能拆分、姓名、电话和地址" />
       <view class="flex justify-end align-center px-3">
-        <view class="px-3 text-white bg-[#007AFF] rounded-md py-1 text-sm box-border" @click="identifyingFn">
+        <view v-if="!readonly" class="px-3 text-white bg-[#007AFF] rounded-md py-1 text-sm box-border" @click="identifyingFn">
           智能识别
         </view>
       </view>
@@ -20,6 +20,7 @@ defineOptions({
 })
 const props = defineProps<{
   group: any
+  readonly?: boolean
 }>()
 const model = defineModel<any>()
 const personDetail = ref('')
@@ -29,6 +30,7 @@ const form = ref(null)
  * @description: 智能识别
  */
 function identifyingFn() {
+  if (props.readonly) return
   if (!personDetail.value) {
     toast.info('请输入内容')
     return

package/components/card-botom-buttons/card-botom-buttons.vue

@@ -4,10 +4,10 @@ import { useRouter } from 'uni-mini-router'
 import { onLoad } from '@dcloudio/uni-app'
 import type { ClassEditConfigs, Columns, Entities, Enums, Fields, Groups, rowActions } from '../../type'
 import ActionPopup from '../action-popup/action-popup.vue'
-import { actionDataSave, deleteData } from '../../api/page'
+import { actionDataSave, deleteData, editPageConfig } from '../../api/page'
 import { useGlobalToast } from '../../composables/useGlobalToast'
 import { useGlobalMessage } from '../../composables/useGlobalMessage'
-import { comparator } from '../../utils/index'
+import { comparator, generateHighResolutionID } from '../../utils/index'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
 import { formatItemData } from '../../utils'
 
@@ -202,7 +202,30 @@ function closeMoreButn() {
 }
 
 // 点击更多按钮
-function select({ item }: { item: any }) {
+async function select({ item }: { item: any }) {
+  // 复制操作：跳转新增页，仅复制基本信息（fieldMap），不带原 ID 和 relation 分组数据（如快递运单）
+  if (item.title.includes('复制')) {
+    // 优先用编辑同款接口拉取完整 fieldMap（含关联选择字段值如基地名称/快递公司），失败回退列表行数据
+    let fieldMapData = props.data.fieldMap
+    try {
+      const res: any = await editPageConfig(props.sourceId, props.code)
+      const entity = res?.dtmplConfig?.entity
+      if (entity?.fieldMap) fieldMapData = entity.fieldMap
+    } catch (e) {
+      console.log('[copy] 拉取完整实体失败，回退使用列表数据', e)
+    }
+    // 生成复制标识：URL 带 copyEvent 区分"复制新增"；存储以 copyEvent 为 key，仅本次复制可读，不污染普通新增
+    const copyEvent = generateHighResolutionID()
+    uni.setStorageSync(copyEvent, {
+      code: '',
+      fieldMap: fieldMapData,
+      arrayMap: {}, // 不复制 relation 分组数据（快递运单等需用户重新填写）
+    })
+    router.push(
+      `/pages/edit-page/index?sourceId=${props.sourceId}&id=&title=${props.item.title}&pageType=${props.pageType}&addEvent=${props.addEvent}&copyEvent=${copyEvent}`
+    )
+    return
+  }
   if (item.title.includes('评价') && item.actionType === 'rowActions') {
     return action(item)
   }

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

@@ -13,6 +13,7 @@ const props = defineProps({
   type: { type: String, default: 'date' },
   min: String,
   max: String,
+  readonly: { type: Boolean, default: false },
 })
 
 const emit = defineEmits<{
@@ -64,9 +65,9 @@ console.log('labelText', props)
 
 <template>
   <div class="flex items-center justify-between">
-    <wd-input v-model="labelText" readonly :placeholder="placeholder" class="flex-1" @click="open = true" />
-    <wd-icon v-if="labelText" name="close-circle" size="16px" @click="clear" />
-    <wd-icon v-else name="right" size="16px" @click="clear" />
+    <wd-input v-model="labelText" readonly :placeholder="placeholder" class="flex-1" @click="!readonly && (open = true)" />
+    <wd-icon v-if="!readonly && labelText" name="close-circle" size="16px" @click="clear" />
+    <wd-icon v-else-if="!readonly" name="right" size="16px" @click="clear" />
   </div>
 
   <wd-calendar

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

@@ -14,6 +14,7 @@ const props = defineProps({
   labelKey: { type: String, default: 'label' },
   valueKey: { type: String, default: 'value' },
   type: { type: String, default: 'radio' },
+  readonly: { type: Boolean, default: false },
 })
 
 const emit = defineEmits<{
@@ -63,9 +64,15 @@ const labelText = computed(() => {
 
 <template>
   <div class="flex items-center justify-between">
-    <wd-input v-model="labelText" readonly :placeholder="placeholder" class="flex-1" @click="open = true" />
-    <wd-icon v-if="labelText" name="close-circle" size="16px" @click="clear" />
-    <wd-icon v-else name="right" size="16px" @click="clear" />
+    <wd-input
+      v-model="labelText"
+      readonly
+      :placeholder="placeholder"
+      class="flex-1"
+      @click="!readonly && (open = true)"
+    />
+    <wd-icon v-if="!readonly && labelText" name="close-circle" size="16px" @click="clear" />
+    <wd-icon v-else-if="!readonly" name="right" size="16px" @click="clear" />
   </div>
 
   <wd-select-picker
@@ -76,6 +83,7 @@ const labelText = computed(() => {
     value-key="value"
     class="custom-select-picker"
     :type="type as any"
+    :readonly="readonly"
   />
 </template>
 

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

@@ -111,7 +111,7 @@ function initFormData() {
 
     // 时间
     if (
-      ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'datetime' ||
+      ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'eetime' ||
       ControlTypeSupportor.getControlType(item, props.entity && props.entity[item.sourceId]) === 'date'
     ) {
       return (models[item.sourceId] =
@@ -623,6 +623,7 @@ console.log('clearValueMap', clearValueMap)
               :placeholder="`请选择${item.title}`"
               :columns="enumColumn && formatSelectColumns(enumColumn[item.mstrucId])"
               type="radio"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -642,6 +643,7 @@ console.log('clearValueMap', clearValueMap)
               :title="item.title"
               :add-event="addEvent"
               :ext-control-type="item.extControlType"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -657,6 +659,7 @@ console.log('clearValueMap', clearValueMap)
               :placeholder="`请选择${item.title}`"
               :columns="enumColumn && formatSelectColumns(enumColumn[item.mstrucId])"
               type="checkbox"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -672,6 +675,7 @@ console.log('clearValueMap', clearValueMap)
               type="date"
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -688,6 +692,7 @@ console.log('clearValueMap', clearValueMap)
               type="datetime"
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -704,6 +709,7 @@ console.log('clearValueMap', clearValueMap)
               use-second
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -720,6 +726,7 @@ console.log('clearValueMap', clearValueMap)
               use-second
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item
@@ -736,6 +743,7 @@ console.log('clearValueMap', clearValueMap)
               use-second
               :clearable="!item.disabled"
               :placeholder="`请选择${item.title}`"
+              :readonly="item.disabled || item.rowEditType === 'readonly'"
             />
           </wd-form-item>
           <wd-form-item

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

@@ -31,6 +31,7 @@ const props = defineProps({
   sourceId: String,
   title: String,
   extControlType: String,
+  readonly: { type: Boolean, default: false },
 })
 
 const emit = defineEmits<{
@@ -49,6 +50,7 @@ const showValue = reactive({
 const EVENT_NAME = `userChooseSelected_${generateHighResolutionID()}`
 
 const addUser = () => {
+  if (props.readonly) return
   const addEvent = generateHighResolutionID()
   // 当前已有数据时，跳转到编辑页面
   if (currentValue.value && typeof currentValue.value === 'string') {
@@ -69,6 +71,7 @@ const addUser = () => {
 }
 
 const toAddressList = () => {
+  if (props.readonly) return
   uni.navigateTo({
     url: `/pages/select-list/index?sourceId=${props.sourceId}&title=${props.title}&extControlType=${props.extControlType}&selectEvent=${EVENT_NAME}`,
   })

package/components/wui-edit-page/wui-edit-page.vue

@@ -58,6 +58,11 @@ const addEvent = ref('')
 const editEvent = ref('')
 const rowAddEvent = ref('')
 const sendRowAddEvent = ref('')
+const copyEvent = ref('') // 复制场景：携带源行数据的事件名
+const copyData = ref<any>(null) // 复制场景：源行数据（已剥离 ID）
+const copyApplied = ref(false) // 复制数据是否已写入 entity
+// 复制场景下，需等复制数据写入 entity 后再渲染表单，否则 FormControl 在 onBeforeMount 时读不到值
+const formReady = computed(() => !!pageConfig.value?.groups?.length && (!copyEvent.value || copyApplied.value))
 const smartPaste = ref(false)
 // 折叠面板
 const collapses = ref('')
@@ -96,6 +101,15 @@ onLoad((option: any) => {
   pageType.value = option.pageType || ''
   rowAddEvent.value = option.rowAddEvent
   sendRowAddEvent.value = option.sendRowAddEvent
+  copyEvent.value = option.copyEvent
+  // 复制场景：仅当 URL 带 copyEvent 标识（即"复制新增"）才读取预填数据；
+  // 普通新增不带该标识，绝不读取存储，避免复制残留数据污染普通新增
+  if (copyEvent.value) {
+    copyData.value = uni.getStorageSync(copyEvent.value) || null
+    if (copyData.value) {
+      console.log('[copy] 读取到复制数据:', JSON.parse(JSON.stringify(copyData.value)))
+    }
+  }
   getEditPageConfig()
 })
 
@@ -106,6 +120,7 @@ onUnmounted(() => {
   // uni.$off(addEvent.value)
   uni.$off(editEvent.value)
   uni.$off(sendRowAddEvent.value)
+  uni.$off(copyEvent.value)
 })
 
 onBeforeMount(() => {
@@ -113,6 +128,49 @@ onBeforeMount(() => {
   hydrocarbonProgramToken.value = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN')
   token.value = uni.getStorageSync('TOKEN')
 })
+
+// 复制场景：将源行数据写入 entity，且强制 code 为空（新增，不带原 ID）
+function applyCopyData() {
+  pageConfig.value.entity = {
+    ...pageConfig.value.entity,
+    code: '',
+    fieldMap: copyData.value.fieldMap || {},
+    arrayMap: copyData.value.arrayMap || {},
+  }
+  copyApplied.value = true
+  console.log('[copy] 已预填 entity:', JSON.parse(JSON.stringify(pageConfig.value.entity)))
+}
+
+// 根据已加载的 entity 初始化关联（勾选/行）数据
+function initRelationData() {
+  pageConfig.value.groups.forEach((item: Groups) => {
+    // 初始化勾选数据
+    if (item.type === 'relation' && (item.buttons.includes('dtmplAdd') || item.buttons.includes('selectAdd'))) {
+      selectData.value[item.id] = {
+        data:
+          (pageConfig.value.entity &&
+            pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
+              return `${sebitem.code}`
+            })) ||
+          [],
+        loading: false,
+      }
+    }
+    // 初始化行数据
+    if (item.type === 'relation' && item.buttons.includes('rowAdd')) {
+      rowData.value[item.id] =
+        (pageConfig.value.entity &&
+          pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
+            return {
+              id: sebitem.code,
+              ...sebitem.fieldMap,
+            }
+          })) ||
+        []
+    }
+  })
+}
+
 // 获取编辑页面配置
 async function getEditPageConfig() {
   // 判断是否为行新增事件
@@ -158,35 +216,19 @@ async function getEditPageConfig() {
         title: `${res.dtmplConfig.title}`,
       })
       pageConfig.value = res.dtmplConfig
+      // 复制场景：用携带的行数据预填表单，但不带原记录 ID（保持新增）
+      if (copyEvent.value && copyData.value) {
+        applyCopyData()
+      } else if (copyEvent.value) {
+        // 兜底：复制数据迟到或丢失时，最多等待 800ms 后渲染空表单，避免页面空白卡死
+        setTimeout(() => {
+          if (!copyApplied.value) copyApplied.value = true
+        }, 800)
+      }
       const visibleGroups = pageConfig.value.groups.filter((item: Groups) => item.displayConfig.includes('displayed'))
       collapses.value = visibleGroups.length > 0 ? visibleGroups[0].id : ''
 
-      pageConfig.value.groups.forEach((item: Groups) => {
-        // 初始化勾选数据
-        if (item.type === 'relation' && (item.buttons.includes('dtmplAdd') || item.buttons.includes('selectAdd'))) {
-          selectData.value[item.id] = {
-            data:
-              (pageConfig.value.entity &&
-                pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
-                  return `${sebitem.code}`
-                })) ||
-              [],
-            loading: false,
-          }
-        }
-        // 初始化行数据
-        if (item.type === 'relation' && item.buttons.includes('rowAdd')) {
-          rowData.value[item.id] =
-            (pageConfig.value.entity &&
-              pageConfig.value.entity.arrayMap[item.id]?.map((sebitem: any) => {
-                return {
-                  id: sebitem.code,
-                  ...sebitem.fieldMap,
-                }
-              })) ||
-            []
-        }
-      })
+      initRelationData()
       getEnums()
       console.log(pageConfig.value, 'pageConfig.value')
     }
@@ -342,6 +384,9 @@ async function save() {
     // ★ 通知 wui-select-popup 刷新列表数据
     uni.$emit('selectPopup:refresh', sourceId.value)
 
+    // 复制场景：保存成功后清除本次复制数据（按 copyEvent key），避免残留
+    if (copyEvent.value) uni.removeStorageSync(copyEvent.value)
+
     subLoading.value = false
     router.back()
   } catch (error) {
@@ -877,7 +922,7 @@ console.log(pageConfig, 'props111')
           </template>
 
           <FormControl
-            v-if="group.type === 'fieldGroup'"
+            v-if="group.type === 'fieldGroup' && formReady"
             ref="formControlRef"
             :field-group="group"
             :entity="pageConfig?.entity?.fieldMap"

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

@@ -425,8 +425,8 @@ console.log(props, 'props')
 
       <!-- 右侧箭头 -->
       <view class="cell-arrow">
-        <wd-icon v-if="clearable && displayValue" name="close-circle" size="16px" @click.stop="clear" />
-        <wd-icon name="right" v-else size="16px"></wd-icon>
+        <wd-icon v-if="clearable && !readonly && displayValue" name="close-circle" size="16px" @click.stop="clear" />
+        <wd-icon v-else-if="!readonly" name="right" size="16px"></wd-icon>
       </view>
     </view>
 

package/composables/useCompanyFieldFilter.ts

@@ -40,51 +40,74 @@ export function useCompanyFieldFilter(
     )
   }
 
-  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,
-      }
-    } else {
-      return {
-        ...item,
-        hidden: values.some(v => v.includes(company)) ? false : item.hidden,
-      }
-    }
+  // 判断值是否为空（依赖字段无数据）
+  const isEmptyValue = (v: any) => {
+    if (v == null) return true
+    if (typeof v === 'string') return v.trim() === ''
+    if (Array.isArray(v)) return v.length === 0
+    return false
   }
+
+  // 评估单条可用规则（usableRuleCriteria）的就绪/命中状态
+  // criterion 通过 mstrucId 关联同一分组内的其它字段，再拿该字段在 model 中的实时值与 transDefaultValue 比对
+  // 返回值：'empty'（依赖字段无数据）| 'match'（命中）| 'unmatch'（未命中）
+  const evaluateCriterion = (criterion: any, fieldsMap: Map<string, any>, modelValue: any): 'empty' | 'match' | 'unmatch' => {
+    const target = criterion?.mstrucId ? fieldsMap.get(criterion.mstrucId) : null
+    // 找不到被关联字段时 fail-open，视为命中，避免误隐藏
+    if (!target) return 'match'
+    const refValue = modelValue[target.sourceId]
+    // 依赖字段无数据：该项隐藏
+    if (isEmptyValue(refValue)) return 'empty'
+    const expected = (criterion?.transDefaultValue || '')
+      .split(',')
+      .map((v: string) => v.trim())
+      .filter(Boolean)
+    if (expected.length === 0) return 'match'
+    const rv = String(refValue)
+    // include_anyone：被关联字段值 与 规则值 任一方包含对方即视为命中（兼容"顺丰"匹配"顺丰速运"这类模糊场景）
+    const matched = expected.some((e: string) => {
+      const ev = String(e)
+      return ev === rv || ev.includes(rv) || rv.includes(ev)
+    })
+    return matched ? 'match' : 'unmatch'
+  }
+
+  // 计算字段是否隐藏：依据 usableRuleCriteria 关联其它字段实时值
+  // - 无可用规则：保持字段自身 unusableMode 决定的显隐
+  // - 有可用规则：
+  //    1) 任一依赖字段无数据 -> 隐藏该项
+  //    2) 依赖均有数据后，所有规则命中才显示，否则隐藏
+  const computeHidden = (item: any, fieldsMap: Map<string, any>, modelValue: any, isEnabled: boolean) => {
+    const baseHidden = item?.unusableMode === 'hidden'
+    if (!isEnabled) return baseHidden
+    const criteria = item?.usableRuleCriteria
+    if (!criteria || criteria.length === 0) return baseHidden
+    // 任一依赖字段无数据 -> 隐藏
+    if (criteria.some((c: any) => evaluateCriterion(c, fieldsMap, modelValue) === 'empty')) return true
+    // 依赖就绪后：所有规则命中才显示
+    const usable = criteria.every((c: any) => evaluateCriterion(c, fieldsMap, modelValue) === 'match')
+    return usable ? false : true
+  }
+
   const filteredFields = computed(() => {
-    const company = selectedCompany.value
     const allFields = fieldGroup()?.fields
     if (!allFields) return []
-    const formattedFields = allFields.filter((item: any) => {
-      // 如果没有选中公司，所有字段都显示
-      if (!company) {
-        return true
-      }
-      // 检查 usableRuleCriteria 是否存在且有值
-      if (!item.usableRuleCriteria || item.usableRuleCriteria.length === 0) {
-        return true
-      }
-      // 获取 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 true
+    // 建立 mstrucId -> field 映射，供可用规则关联同分组内其它字段
+    const fieldsMap = new Map<string, any>()
+    allFields.forEach((f: any) => {
+      if (f?.mstrucId) fieldsMap.set(f.mstrucId, f)
     })
-    console.log('formattedFields', formattedFields)
-    return formattedFields.map((item: any) => formatFieldsItem(company, item))
+    const modelValue = model.value
+    // 保留全部字段（监听所有数据），仅通过 hidden 控制显隐，规则随 model 实时联动
+    return allFields.map((item: any) => ({
+      ...item,
+      hidden: computeHidden(item, fieldsMap, modelValue, enabled),
+    }))
   })
   watch(
     filteredFields,
-    val => {
-      // console.log('filteredFields变化了', val, 'selectedCompany:', selectedCompany.value)
+    () => {
+      // 字段显隐随 model 实时变化，可在此做监听/埋点
     },
     { immediate: true }
   )

package/package.json

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