wui-components-v2 1.1.83 → 1.1.85

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/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] =
@@ -193,31 +193,26 @@ const subRelMonitor = computed(() =>
     // 仅当字段类型（extControlType）不在排除列表中才参与联动监听
     .filter((item: any) => !EXCLUDE_CONTROL_TYPES.includes(item.extControlType))
     .flatMap((item: any) =>
-      REL_FIELD_CONFIG
-        .map(({ key, assignment }) => {
-          const rel = (item as any)[key]
-          // subRelValueField：兼容嵌套在 rel 字段下，或 item 同级（仅 relValueField 兼容同级）
-          const subRel =
-            rel?.subRelValueField ||
-            (key === 'relValueField' ? (item as any).subRelValueField : undefined)
-          if (!rel || !subRel) return null
-          // 找到原始字段对象（props.fieldGroup.fields 中）：filteredFields 每次重算会浅拷贝生成新对象，
-          // 只改拷贝对象会在重算时丢失 max/min，因此同时持有原始对象引用，双写以保证不丢值
-          const rawItem =
-            (props.fieldGroup?.fields || []).find((f: any) => f.sourceId === item.sourceId) || item
-          return {
-            monitorKey: `${item.sourceId}__${key}`, // 唯一键，避免多 rel 字段共用 paramSourceId 相互干扰
-            item, // filteredFields 中的拷贝对象，直接改可立即触发模板更新
-            rawItem, // 原始字段对象，改它可在 filteredFields 重算后保留 max/min
-            itemSourceId: item.sourceId,
-            assignment, // 'value' | 'max' | 'min'
-            valueSourceKey: subRel.sourceId, // 从接口返回 fieldMap 取值所用的 key
-            paramSourceId: rel.sourceId || rel.id, // 请求参数来源字段
-            useA: !!rel.extRefPageId,
-            extRefPageId: rel.extRefPageId,
-          }
-        })
-        .filter((m: any) => m && m.paramSourceId && m.valueSourceKey)
+      REL_FIELD_CONFIG.map(({ key, assignment }) => {
+        const rel = (item as any)[key]
+        // subRelValueField：兼容嵌套在 rel 字段下，或 item 同级（仅 relValueField 兼容同级）
+        const subRel = rel?.subRelValueField || (key === 'relValueField' ? (item as any).subRelValueField : undefined)
+        if (!rel || !subRel) return null
+        // 找到原始字段对象（props.fieldGroup.fields 中）：filteredFields 每次重算会浅拷贝生成新对象，
+        // 只改拷贝对象会在重算时丢失 max/min，因此同时持有原始对象引用，双写以保证不丢值
+        const rawItem = (props.fieldGroup?.fields || []).find((f: any) => f.sourceId === item.sourceId) || item
+        return {
+          monitorKey: `${item.sourceId}__${key}`, // 唯一键，避免多 rel 字段共用 paramSourceId 相互干扰
+          item, // filteredFields 中的拷贝对象，直接改可立即触发模板更新
+          rawItem, // 原始字段对象，改它可在 filteredFields 重算后保留 max/min
+          itemSourceId: item.sourceId,
+          assignment, // 'value' | 'max' | 'min'
+          valueSourceKey: subRel.sourceId, // 从接口返回 fieldMap 取值所用的 key
+          paramSourceId: rel.sourceId || rel.id, // 请求参数来源字段
+          useA: !!rel.extRefPageId,
+          extRefPageId: rel.extRefPageId,
+        }
+      }).filter((m: any) => m && m.paramSourceId && m.valueSourceKey)
     )
 )
 const { setFieldValue, getFieldValue } = useFormFieldValues()
@@ -281,11 +276,23 @@ watch(
       const fromStore = getFieldValue(m.paramSourceId)
       const fromEntity = (props.entity as any)?.[m.paramSourceId]
       const finalVal =
-        local !== undefined && local !== '' ? local
-          : fromStore !== undefined && fromStore !== '' ? fromStore
-            : fromEntity !== undefined && fromEntity !== '' ? fromEntity
+        local !== undefined && local !== ''
+          ? local
+          : fromStore !== undefined && fromStore !== ''
+            ? fromStore
+            : fromEntity !== undefined && fromEntity !== ''
+              ? fromEntity
               : undefined
-      console.log(`[subRel] 来源取值 ${m.monitorKey} sourceId=${m.paramSourceId} | local=`, local, '| store=', fromStore, '| props.entity=', fromEntity, '=> 采用', finalVal)
+      console.log(
+        `[subRel] 来源取值 ${m.monitorKey} sourceId=${m.paramSourceId} | local=`,
+        local,
+        '| store=',
+        fromStore,
+        '| props.entity=',
+        fromEntity,
+        '=> 采用',
+        finalVal
+      )
       snapshot[m.monitorKey] = finalVal
     })
     return snapshot
@@ -295,10 +302,18 @@ watch(
       const val = newVal[m.monitorKey]
       const prev = lastSubRelSnapshot.value[m.monitorKey]
       lastSubRelSnapshot.value[m.monitorKey] = val
-      console.log('[subRel] 处理', m.monitorKey,
-        '| assignment=', m.assignment,
-        '| 参数来源sourceId=', m.paramSourceId,
-        '| 取到的值val=', val, '| 上次值prev=', prev)
+      console.log(
+        '[subRel] 处理',
+        m.monitorKey,
+        '| assignment=',
+        m.assignment,
+        '| 参数来源sourceId=',
+        m.paramSourceId,
+        '| 取到的值val=',
+        val,
+        '| 上次值prev=',
+        prev
+      )
       // 仅在选中值存在且发生变化时请求，避免无意义重复调用
       if (val !== undefined && val !== null && val !== '' && val !== prev) {
         try {
@@ -308,11 +323,11 @@ watch(
           if (m.useA) {
             api = topData
             apiName = '/v3/ltmpl/top-data'
-            param = { top: 1, code: val, sourceId: m.extRefPageId }
+            param = { top: 1, secondCriterion: val, sourceId: m.extRefPageId }
           } else {
             api = dtmplData
             apiName = '/v3/dtmpl/data'
-            param = { top: 1, code: val, sourceId: m.paramSourceId }
+            param = { top: 1, secondCriterion: val, sourceId: m.paramSourceId }
           }
           console.log('[subRel] >>> 发起请求', apiName, '参数=', param)
           const res = await api(param)
@@ -352,10 +367,12 @@ watch(
         }
       } else {
         // 没进请求分支：常见原因是 val 为空（跨页面没取到值）或值未变化
-        console.warn('[subRel] ✗ 未发起请求 ——',
+        console.warn(
+          '[subRel] ✗ 未发起请求 ——',
           val === undefined || val === null || val === ''
             ? `参数来源值 val 为空（跨页面存储未取到 sourceId=${m.paramSourceId} 的值）`
-            : `值未发生变化（prev=${prev}）`)
+            : `值未发生变化（prev=${prev}）`
+        )
       }
     }
   },
@@ -606,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
@@ -625,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
@@ -640,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
@@ -655,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
@@ -671,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
@@ -687,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
@@ -703,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
@@ -719,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-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/package.json

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