wui-components-v2 1.1.70 → 1.1.72

package/components/tree-select/components/tree-select.vue

@@ -1,56 +1,56 @@
-<script setup lang="ts">
-import { defineEmits, defineOptions, defineProps } from 'vue'
-// import type { SelectMode, TreeNode as TreeNodeType } from '../index.vue'
-import TreeNode from './TreeNode.vue'
-// 树形节点数据结构定义
-interface TreeNodeType {
-  id: string
-  name: string
-  children?: TreeNodeType[]
-  [key: string]: any // 允许其他自定义属性
-}
-// 选择模式类型
-type SelectMode = 'single' | 'multiple'
-defineOptions({
-  name: 'TreeSelect',
-})
-defineProps<{
-  treeData: TreeNodeType[]
-  selectMode: SelectMode
-  selectedKeys: string[]
-  setNodeRef: (id: string, el: HTMLElement | null) => void
-}>()
-const emit = defineEmits<{
-  (e: 'update:selectedKeys', keys: string[], node: TreeNodeType): void
-  (e: 'toggleExpand', keys: TreeNodeType): void
-}>()
-
-function handleSelect(keys: string[], node: TreeNodeType) {
-  emit('update:selectedKeys', keys, node)
-}
-
-function toggleExpand(node: TreeNodeType) {
-  emit('toggleExpand', node)
-}
-</script>
-
-<template>
-  <view class="tree-select">
-    <tree-node
-      v-for="node in treeData"
-      :key="node.id"
-      :node="node"
-      :select-mode="selectMode"
-      :selected-keys="selectedKeys"
-      :set-node-ref="setNodeRef"
-      @update:selected-keys="handleSelect"
-      @toggle-expand="toggleExpand"
-    />
-  </view>
-</template>
-
-<style scoped>
-.tree-select {
-  padding: 0 16px;
-}
-</style>
+<script setup lang="ts">
+import { defineEmits, defineOptions, defineProps } from 'vue'
+// import type { SelectMode, TreeNode as TreeNodeType } from '../index.vue'
+import TreeNode from './TreeNode.vue'
+// 树形节点数据结构定义
+interface TreeNodeType {
+  id: string
+  name: string
+  children?: TreeNodeType[]
+  [key: string]: any // 允许其他自定义属性
+}
+// 选择模式类型
+type SelectMode = 'single' | 'multiple'
+defineOptions({
+  name: 'TreeSelect',
+})
+defineProps<{
+  treeData: TreeNodeType[]
+  selectMode: SelectMode
+  selectedKeys: string[]
+  setNodeRef: (id: string, el: HTMLElement | null) => void
+}>()
+const emit = defineEmits<{
+  (e: 'update:selectedKeys', keys: string[], node: TreeNodeType): void
+  (e: 'toggleExpand', keys: TreeNodeType): void
+}>()
+
+function handleSelect(keys: string[], node: TreeNodeType) {
+  emit('update:selectedKeys', keys, node)
+}
+
+function toggleExpand(node: TreeNodeType) {
+  emit('toggleExpand', node)
+}
+</script>
+
+<template>
+  <view class="tree-select">
+    <tree-node
+      v-for="node in treeData"
+      :key="node.id"
+      :node="node"
+      :select-mode="selectMode"
+      :selected-keys="selectedKeys"
+      :set-node-ref="setNodeRef"
+      @update:selected-keys="handleSelect"
+      @toggle-expand="toggleExpand"
+    />
+  </view>
+</template>
+
+<style scoped>
+.tree-select {
+  padding: 0 16px;
+}
+</style>

package/components/tree-select/index.vue

@@ -1,93 +1,93 @@
-<script setup lang="ts">
-import { computed, defineOptions, defineProps, ref } from 'vue'
-import type { FoldCardModel } from '../../type'
-import TreeSelectIndex from './components/index.vue'
-
-defineOptions({
-  name: 'TreeSelectControl',
-})
-
-const props = defineProps<{
-  extControlType: string
-  sourceId: string
-  title?: string
-  modelValue: { value: string, sourceId: string }
-  readonly: boolean
-  clearable: boolean
-  foldCardModel?: FoldCardModel
-  selectMode: 'single' | 'multiple'
-}>()
-const emits = defineEmits<{
-  (e: 'update:modelValue', value: { value: string | string[], sourceId: string }): void
-}>()
-const showPopup = ref(false)
-const selectData = ref<string | string[]>(props.modelValue.value)
-const selectformatData = computed(() => {
-  if (Array.isArray(selectData.value)) {
-    return selectData.value.map(item => item.split('@R@')[1]).join(',')
-  }
-  return selectData.value.split('@R@')[1] || ''
-})
-// const router = useRouter()
-
-function gotoSlect() {
-  if (props.readonly)
-    return
-  showPopup.value = true
-}
-
-// 清空勾选
-function clearSelect() {
-  // 清空单选
-  if (props.extControlType === 'relselect') {
-    selectData.value = ''
-    emits('update:modelValue', { value: '', sourceId: '' })
-  }
-  else {
-    selectData.value = []
-    emits('update:modelValue', { value: [], sourceId: '' })
-  }
-}
-
-// 关闭弹窗
-function handleClose() {
-  showPopup.value = false
-}
-
-// 确认选择
-function handleConfirm(value: string | string[], node: any, sourceId: string = '') {
-  selectData.value = node.map((item: any) => {
-    return `${item.id}@R@${item.name}`
-  })
-  emits('update:modelValue', { value: value[0], sourceId })
-  handleClose()
-}
-</script>
-
-<template>
-  <view>
-    <view class="relative" @click="gotoSlect">
-      <view class="flex flex-wrap text-left">
-        <text v-if="selectformatData">
-          {{ selectformatData }}
-        </text>
-        <text v-else class="text-gray-400">
-          请选择{{ title }}
-        </text>
-      </view>
-      <view v-if="clearable" class="absolute bottom-0 right-0 top-0">
-        <wd-icon v-if="selectformatData" name="error-fill" size="17px" @click.stop="clearSelect" />
-        <wd-icon v-else name="arrow-right" size="17px" />
-      </view>
-    </view>
-    <wd-popup v-model="showPopup" position="bottom" custom-style="height:100vh;width:100vw" :z-index="99999">
-      <TreeSelectIndex :select-mode="props.selectMode" :source-id="props.sourceId" @handle-confirm="handleConfirm" @handle-close="handleClose" />
-    </wd-popup>
-  </view>
-</template>
-
-<style scoped>
-:deep(.wd-tag__close){
- line-height:0.6
-}
-</style>
+<script setup lang="ts">
+import { computed, defineOptions, defineProps, ref } from 'vue'
+import type { FoldCardModel } from '../../type'
+import TreeSelectIndex from './components/index.vue'
+
+defineOptions({
+  name: 'TreeSelectControl',
+})
+
+const props = defineProps<{
+  extControlType: string
+  sourceId: string
+  title?: string
+  modelValue: { value: string, sourceId: string }
+  readonly: boolean
+  clearable: boolean
+  foldCardModel?: FoldCardModel
+  selectMode: 'single' | 'multiple'
+}>()
+const emits = defineEmits<{
+  (e: 'update:modelValue', value: { value: string | string[], sourceId: string }): void
+}>()
+const showPopup = ref(false)
+const selectData = ref<string | string[]>(props.modelValue.value)
+const selectformatData = computed(() => {
+  if (Array.isArray(selectData.value)) {
+    return selectData.value.map(item => item.split('@R@')[1]).join(',')
+  }
+  return selectData.value.split('@R@')[1] || ''
+})
+// const router = useRouter()
+
+function gotoSlect() {
+  if (props.readonly)
+    return
+  showPopup.value = true
+}
+
+// 清空勾选
+function clearSelect() {
+  // 清空单选
+  if (props.extControlType === 'relselect') {
+    selectData.value = ''
+    emits('update:modelValue', { value: '', sourceId: '' })
+  }
+  else {
+    selectData.value = []
+    emits('update:modelValue', { value: [], sourceId: '' })
+  }
+}
+
+// 关闭弹窗
+function handleClose() {
+  showPopup.value = false
+}
+
+// 确认选择
+function handleConfirm(value: string | string[], node: any, sourceId: string = '') {
+  selectData.value = node.map((item: any) => {
+    return `${item.id}@R@${item.name}`
+  })
+  emits('update:modelValue', { value: value[0], sourceId })
+  handleClose()
+}
+</script>
+
+<template>
+  <view>
+    <view class="relative" @click="gotoSlect">
+      <view class="flex flex-wrap text-left">
+        <text v-if="selectformatData">
+          {{ selectformatData }}
+        </text>
+        <text v-else class="text-gray-400">
+          请选择{{ title }}
+        </text>
+      </view>
+      <view v-if="clearable" class="absolute bottom-0 right-0 top-0">
+        <wd-icon v-if="selectformatData" name="error-fill" size="17px" @click.stop="clearSelect" />
+        <wd-icon v-else name="arrow-right" size="17px" />
+      </view>
+    </view>
+    <wd-popup v-model="showPopup" position="bottom" custom-style="height:100vh;width:100vw" :z-index="99999">
+      <TreeSelectIndex :select-mode="props.selectMode" :source-id="props.sourceId" @handle-confirm="handleConfirm" @handle-close="handleClose" />
+    </wd-popup>
+  </view>
+</template>
+
+<style scoped>
+:deep(.wd-tag__close){
+ line-height:0.6
+}
+</style>

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

@@ -1,151 +1,169 @@
-
-<template>
-  <div class="flex items-center justify-between gap-3">
-    <view @click="addUser" class=" flex-1 min-h-[20px]">
-     <view class="flex items-center gap-2">
-      <view class=" font-black font-bold">{{ showValue.name }}</view>
-      <view>{{ formatPhone(showValue.phone) }}</view>
-     </view>
-      <view>{{ showValue.address }}</view>
-    </view>
-    <wd-icon  name="user" size="18px" @tap="toAddressList" />
-
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, watch, onMounted, onUnmounted } from 'vue'
-import { useRouter } from 'uni-mini-router'
-import { pageKey, listData,pageConfig } from '../../api/page'
-import { generateHighResolutionID,formatPhone } from '../../utils/index'
-
-defineOptions({
-  name: 'UserChoose',
-})
-
-const props = defineProps({
-  modelValue: [String, Array],
-  placeholder: String,
-  sourceId: String,
-  title: String,
-  extControlType: String,
-})
-
-const emit = defineEmits<{
-  'update:modelValue': [value: string]
-}>()
-
-const router = useRouter()
-
-const currentValue = ref<string>(props.modelValue as string || '')
-const showValue = reactive({
-  name: '',
-  phone: '',
-  address: '',
-})
-
-const EVENT_NAME = `userChooseSelected_${generateHighResolutionID()}`
-
-const addUser = () => {
-  const addEvent = generateHighResolutionID()
-  router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&title=${props.title}&addEvent=${addEvent}`)
-  uni.$once(addEvent, (data: any) => {
-    uni.$off(addEvent)
-    currentValue.value = data.entityCode
-    fetchDataById(data.entityCode)
-  })
-}
-
-const toAddressList = () => {
-  uni.navigateTo({
-    url: `/pages/select-list/index?sourceId=${props.sourceId}&title=${props.title}&extControlType=${props.extControlType}&selectEvent=${EVENT_NAME}`,
-  })
-}
-
-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
-  try {
-    const config = await pageConfig(props.sourceId)
-    const newConfig=config.ltmplConfig
-    const onlyCode=newConfig.extDisplayConfig?.cardShowCols?.[0]?.sourceId //获取回显字段对应参数名
-    const query=`c_${newConfig.secondCriterion?.sourceId}=${requestId}` //构建查询参数
-    const res = await pageKey(props.sourceId, '', query)
-    const data = await listData(res.key, 1, 10)
-    const item = data.entities.find((e: any) => e.code === requestId)as any
-    const {fieldMap={}}=item
-    const textArr=(fieldMap[onlyCode] || '').split(',') //拆分字符串 姓名,手机号,地址 分别对应数组的0,1,2索引
-    if (item) {
-      showValue.name = textArr?.[0] || ''
-      showValue.phone = textArr?.[1] || ''
-      showValue.address =   textArr?.[2] || ''
-    }
-    // 数据获取完成后，触发 emit
-    emitIfNeeded(id)
-  } catch (error) {
-    console.error('获取数据失败:', error)
-  }
-}
-
-const emitIfNeeded = (val: string) => {
-  if (!val) return
-  let emitVal = val
-  if (typeof val === 'string' && !val.includes('@R@')) {
-    emitVal = val + '@R@' + showValue.name
-  }
-  if (emitVal !== props.modelValue) {
-    emit('update:modelValue', emitVal)
-  }
-}
-
-onMounted(() => {
-  const raw = currentValue.value
-  if (raw && typeof raw === 'string') {
-    const requestId = raw.includes('$$user.') ? raw.split('$$user.')[1] : raw
-    fetchDataById(requestId)
-  }
-
-  uni.$on(EVENT_NAME, (id: string) => {
-    currentValue.value = id
-    fetchDataById(id)
-  })
-})
-
-onUnmounted(() => {
-  uni.$off(EVENT_NAME)
-})
-
-watch(() => props.modelValue, (val) => {
-  const newId = val as string
-  if (newId && newId !== currentValue.value) {
-    currentValue.value = newId
-    fetchDataById(newId)
-  }
-})
-
-watch(currentValue, (val) => {
-  if (!val) return
-  // 如果值已经包含@R@（无需异步获取数据），直接 emit
-  if (typeof val === 'string' && val.includes('@R@')) {
-    if (val !== props.modelValue) {
-      emit('update:modelValue', val)
-    }
-  }
-  // 否则由 fetchDataById 成功后调用 emitIfNeeded 来 emit
-}, { immediate: true })
-</script>
-<style scoped lang="scss">
-.custom-select-picker {
-  width: 100%;
-  :deep(.wd-select-picker__wrapper) {
-  padding : 0 20px;
-  overflow: auto;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-:deep(.uni-scroll-view) {
-   scrollbar-width: none;
-}
-}
-</style>
+<template>
+  <div class="flex items-center justify-between gap-3">
+    <view @click="addUser" class="flex-1 min-h-[20px]">
+      <view class="flex items-center gap-2">
+        <view class="font-black font-bold">{{ showValue.name }}</view>
+        <view>{{ formatPhone(showValue.phone) }}</view>
+      </view>
+      <view>{{ showValue.address }}</view>
+    </view>
+    <view class="flex items-center gap-1 text-3" @tap="toAddressList">
+      通讯录
+      <wd-icon name="user" size="18px" />
+    </view>
+  </div>
+</template>
+s
+
+<script setup lang="ts">
+import { ref, reactive, watch, onMounted, onUnmounted } from 'vue'
+import { useRouter } from 'uni-mini-router'
+import { pageKey, listData, pageConfig } from '../../api/page'
+import { generateHighResolutionID, formatPhone } from '../../utils/index'
+
+defineOptions({
+  name: 'UserChoose',
+})
+
+const props = defineProps({
+  modelValue: [String, Array],
+  placeholder: String,
+  sourceId: String,
+  title: String,
+  extControlType: String,
+})
+
+const emit = defineEmits<{
+  'update:modelValue': [value: string]
+}>()
+
+const router = useRouter()
+
+const currentValue = ref<string>((props.modelValue as string) || '')
+const showValue = reactive({
+  name: '',
+  phone: '',
+  address: '',
+})
+
+const EVENT_NAME = `userChooseSelected_${generateHighResolutionID()}`
+
+const addUser = () => {
+  const addEvent = generateHighResolutionID()
+  // 当前已有数据时，跳转到编辑页面
+  if (currentValue.value) {
+    // 和 fetchDataById 中的 requestId 逻辑保持一致
+    const entityId = currentValue.value.split('@R@')[0]
+    router.push(
+      `/pages/edit-page/index?sourceId=${props.sourceId}&title=${props.title}&addEvent=${addEvent}&id=${entityId}`
+    )
+  } else {
+    router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&title=${props.title}&addEvent=${addEvent}`)
+  }
+  uni.$once(addEvent, (data: any) => {
+    uni.$off(addEvent)
+    currentValue.value = data.entityCode
+    fetchDataById(data.entityCode)
+  })
+}
+
+const toAddressList = () => {
+  uni.navigateTo({
+    url: `/pages/select-list/index?sourceId=${props.sourceId}&title=${props.title}&extControlType=${props.extControlType}&selectEvent=${EVENT_NAME}`,
+  })
+}
+
+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
+  try {
+    const config = await pageConfig(props.sourceId)
+    const newConfig = config.ltmplConfig
+    const onlyCode = newConfig.extDisplayConfig?.cardShowCols?.[0]?.sourceId //获取回显字段对应参数名
+    const query = `c_${newConfig.secondCriterion?.sourceId}=${requestId}` //构建查询参数
+    const res = await pageKey(props.sourceId, '', query)
+    const data = await listData(res.key, 1, 10)
+    const item = data.entities.find((e: any) => e.code === requestId) as any
+    const { fieldMap = {} } = item
+    const textArr = (fieldMap[onlyCode] || '').split(',') //拆分字符串 姓名,手机号,地址 分别对应数组的0,1,2索引
+    if (item) {
+      showValue.name = textArr?.[0] || ''
+      showValue.phone = textArr?.[1] || ''
+      showValue.address = textArr?.[2] || ''
+    }
+    // 数据获取完成后，触发 emit
+    emitIfNeeded(id)
+  } catch (error) {
+    console.error('获取数据失败:', error)
+  }
+}
+
+const emitIfNeeded = (val: string) => {
+  if (!val) return
+  let emitVal = val
+  if (typeof val === 'string' && !val.includes('@R@')) {
+    emitVal = val + '@R@' + showValue.name
+  }
+  if (emitVal !== props.modelValue) {
+    emit('update:modelValue', emitVal)
+  }
+}
+
+onMounted(() => {
+  const raw = currentValue.value
+  if (raw && typeof raw === 'string') {
+    const requestId = raw.includes('$$user.') ? raw.split('$$user.')[1] : raw
+    fetchDataById(requestId)
+  }
+
+  uni.$on(EVENT_NAME, (id: string) => {
+    currentValue.value = id
+    fetchDataById(id)
+  })
+})
+
+onUnmounted(() => {
+  uni.$off(EVENT_NAME)
+})
+
+watch(
+  () => props.modelValue,
+  val => {
+    const newId = val as string
+    if (newId && newId !== currentValue.value) {
+      currentValue.value = newId
+      fetchDataById(newId)
+    }
+  }
+)
+
+watch(
+  currentValue,
+  val => {
+    if (!val) return
+    // 如果值已经包含@R@（无需异步获取数据），直接 emit
+    if (typeof val === 'string' && val.includes('@R@')) {
+      if (val !== props.modelValue) {
+        emit('update:modelValue', val)
+      }
+    }
+    // 否则由 fetchDataById 成功后调用 emitIfNeeded 来 emit
+  },
+  { immediate: true }
+)
+</script>
+<style scoped lang="scss">
+.custom-select-picker {
+  width: 100%;
+  :deep(.wd-select-picker__wrapper) {
+    padding: 0 20px;
+    overflow: auto;
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+  }
+  :deep(.uni-scroll-view) {
+    scrollbar-width: none;
+  }
+}
+</style>