w-ui-v1 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/w-add/w-add.vue

@@ -40,7 +40,7 @@ export default {
 
                         <!-- 卡片 -->
                         <view v-else class="card-list">
-                            <w-card @delet="() => { deletItem(item, subitem, subindex) }" :actionType="item.type"
+                            <w-card @edit="()=>{editItem(item, subitem, subindex)}" @delet="() => { deletItem(item, subitem, subindex) }" :actionType="item.type"
                                 v-for="(subitem, subindex) in selectData[item.id]" :key="subindex" :car-index="subindex"
                                 :page="{
                                     rowActions: item.rowActions || [],
@@ -109,36 +109,21 @@ const pointSourceId = ref('')
 onLoad((option: any) => {
     sourceId.value = props.sourceId || option.sourceId
     getPageConfig()
-
-    //监听勾选列表页面事件
-    uni.$on('getCheckData', function (data: any) {
-        checkboxvalue.value = data.checkData
-    })
-
-    //监听添加数据完成事件
-    uni.$on('addDataSAC', function (data: any) {
-        console.log(data,'addDataSAC')
-        checkboxvalue.value.push(data.entityCode)
-    })
 })
 
 watch(checkboxvalue, (value) => {
-    if (value.length === 0) return
-    //获取勾选数据
-    let codes = ''
-    value.forEach((item: any) => {
-        codes += `codes=${item}&`
-    })
-    getSelectDataPxoy(codes)
+   
+    getSelectDataPxoy(value)
 }, {
-    immediate: false
+    immediate: false,
+    deep: true
+
 })
 
 onUnload(() => {
     // 取消监听勾选列表页面事件
     uni.$off('getCheckData')
-    // 取消监听添加数据完成事件
-    uni.$off('addDataSAC')
+
 })
 
 // 获取页面配置
@@ -230,7 +215,7 @@ async function handleSubmit() {
                         toast.success("保存成功")
                         uni.navigateBack({
                             success: () => {
-                                uni.$emit('addDataSAC', { entityCode:res.data.entityCode,sourceId:res.data.sourceId })
+                                uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
                             }
                         })
                     } else {
@@ -252,6 +237,10 @@ async function handleSubmit() {
 
 //跳转勾选页面数据
 function selectrow(item: any) {
+    //监听勾选列表页面事件
+    uni.$on('getCheckData', function (data: any) {
+        checkboxvalue.value = data.checkData
+    })
     relationID.value = item.id
     pointSourceId.value = item.pointSourceId
     let data = selectData.value[relationID.value]?.map((item) => {
@@ -266,8 +255,16 @@ function selectrow(item: any) {
 }
 const selectData = ref({})
 //获取勾选数据
-async function getSelectDataPxoy(codes: string) {
+async function getSelectDataPxoy(values: string[]) {
+    if (values.length === 0) return model.value[relationID.value]=[]
+    //获取勾选数据
+    let codes = ''
+    values.forEach((item: any) => {
+        codes += `codes=${item}&`
+    })
+
     relationLoading[relationID.value] = true
+    if (!relationID.value) return
     const res = await getSelectData(relationID.value, codes)
     selectData.value[relationID.value] = res.data.entities
     model.value[relationID.value] = selectData.value[relationID.value].map((item: any) => {
@@ -278,6 +275,7 @@ async function getSelectDataPxoy(codes: string) {
 
 //删除勾选数据
 const deletItem = (item: any, subitem: any, index: any) => {
+    relationID.value = item.id
     selectData.value[item.id].splice(index, 1)
     let data = selectData.value[item.id].map((item: any) => {
         return item.code
@@ -285,8 +283,30 @@ const deletItem = (item: any, subitem: any, index: any) => {
     checkboxvalue.value = data || []
 }
 
+//点击编辑勾选数据按钮
+const editItem=( item: any, subitem: any, index: any )=>{
+    relationID.value = item.id
+     //监听编辑页面事件
+     uni.$on('editeDataSAC', function (data: any) {
+        
+        checkboxvalue.value=selectData.value[item.id].map((item: any) => {
+            return item.code
+        })
+         // 取消监听编辑页面事件
+         uni.$off('editeDataSAC')
+    })
+}
+
 //新增
-const add=(item:any)=>{
+const add = (item: any) => {
+    relationID.value = item.id
+    //监听添加数据完成事件
+    uni.$on('addDataSAC', function (data: any) {
+        checkboxvalue.value.push(data.entityCode)
+        // 取消监听添加数据完成事件
+        uni.$off('addDataSAC')
+    })
+    //跳转新增页面
     uni.navigateTo({
         url: `/pages/add/add?sourceId=${item.pointSourceId}`,
     })

package/w-card/utils/utils.ts

@@ -47,7 +47,7 @@ export function getValue(content: any, title: any): any {
     }
 
     //文件链接
-    if (obj.base?.path && (obj.base?.type.includes('docx')|| obj.base?.type.includes('txt')|| obj.base?.type.includes('dat'))) {
+    if (obj.base?.path && (obj.base?.type.includes('docx')|| obj.base?.type.includes('txt')|| obj.base?.type.includes('dat')|| obj.base?.type.includes('md'))) {
 
       return {
         url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
@@ -81,21 +81,42 @@ function splitString(str: string) {
     return str
   }
 
-  if (str) {
+  
     // 判断是否有 "@R@"
     if (str.includes('@R@')) {
       // 分割字符串
-      const splitStr = str.split('@R@')
-      // 返回分割后的数组的最后一项
-      return splitStr[splitStr.length - 1]
+      const splitStr =splitStringtoArr(str).map((item:string)=>{
+        let splitItem = item.split('@R@')
+            return {
+              label:splitItem[1],
+              value:splitItem[0]
+            }
+      }) 
+      // 返回分割后的对象数组
+      return splitStr
     }
     else {
       // 返回原字符串
       return str
     }
-  }
-  // 返回原字符串
-  return str
+  
+}
+
+// 根据 "@,@" 分割字符串，得到数组
+function splitStringtoArr(str: string) {
+  
+    // 判断是否有 "@,@" 字符串
+    if (str.includes('@,@')) {
+      // 分割字符串
+      const splitStr = str.split('@,@')
+      // 返回分割后的数组
+      return splitStr
+    }
+    else {
+      // 返回原字符串
+      return [str]
+    }
+  
 }
 
 // 判断字符串中是否存在'y'字符

package/w-card/w-card.vue

@@ -9,7 +9,7 @@ import {
 import { hasY, getValue, downloadFile } from './utils/utils'
 import { deletePageData } from '../utils/apis/pageConfig'
 import { useMessage, useToast } from 'wot-design-uni'
-const emits = defineEmits(['refresh', 'delet'])
+const emits = defineEmits(['refresh', 'delet','edit'])
 const toast = useToast()
 const message = useMessage()
 const props = defineProps({
@@ -110,7 +110,7 @@ function toggleExpand() {
 }
 
 // 跳转页页面
-function goto(type: string, item: any = {}, subItem: string = '') {
+function goto(type: string, item: any = {}, subItem: any) {
 
   switch (type) {
     case 'detail':
@@ -119,20 +119,17 @@ function goto(type: string, item: any = {}, subItem: string = '') {
       })
       break
     case 'link':
-      let data = null
-      if (Array.isArray(item.data)) {
-        data = item.data.find((item: any) => {
-          return item.includes(subItem)
-        }).split('@R@')[0]
-      } else {
-        data = item.data.split('@R@')[0]
-      }
+      let code = subItem.value
+      
 
       uni.navigateTo({
-        url: `/pages/detail/detail?sourceId=${item.sourceId}&code=${data}`,
+        url: `/pages/detail/detail?sourceId=${item.sourceId}&code=${code}`,
       })
       break
     case 'edit':
+      if (props.actionType === 'relation') {
+        emits('edit')
+      }
       uni.navigateTo({
         url: `/pages/edit/edit?sourceId=${props.sourceId}&code=${props.itemData.code}`,
       })
@@ -211,8 +208,8 @@ const actionBtn = (item: any) => {
         </view>
         <view v-else-if="item.buttons.includes('detail')">
           <view @click="goto('link', item, subItem)" class="link"
-            v-for="(subItem, subIndex) in item.content?.split('，')" :key="subIndex">
-            <text> {{ subItem }}</text>
+            v-for="(subItem, subIndex) in item.content" :key="subIndex">
+            <text> {{ subItem.label }}</text>
           </view>
         </view>
         <view v-else-if="item.content?.type === '文件'" class="value">

package/w-detail/w-detail.vue

@@ -59,7 +59,15 @@ function getPageData() {
 }
 
 // 跳转详情页
-function goto(PItem: any, item: any) {
+function goto(type = '', PItem: any, item: any) {
+
+	if (type == 'link') {
+		uni.navigateTo({
+			url: `/pages/detail/detail?sourceId=${item.sourceId}&code=${PItem.value}`
+		})
+		return
+	}
+
 	uni.navigateTo({
 		url: `/pages/detail/detail?sourceId=${item.pointSourceId}&code=${PItem.code}`
 	})
@@ -101,6 +109,14 @@ function goto(PItem: any, item: any) {
 								:author="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).author"
 								:name="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).name"
 								controls></audio>
+
+							<view v-else-if="subItem.buttons.includes('detail')">
+								<view @click="goto('link', bItem, subItem)" class="link"
+									v-for="(bItem, bIndex) in getValue(pageData.fieldMap[subItem.sourceId], subItem.title)"
+									:key="bIndex">
+									<text> {{ bItem.label }}</text>
+								</view>
+							</view>
 							<view v-else class="value">
 								{{ getValue(pageData.fieldMap[subItem.sourceId], subItem.title) }}
 							</view>
@@ -119,33 +135,39 @@ function goto(PItem: any, item: any) {
 						v-for="(PItem, PIndex) in pageData.arrayMap[item.id]" :key="PIndex">
 						<view v-for="(subItem, subIndex) in item.fields" :key='subIndex' style='margin-bottom: 8px;'>
 							<view v-if="!subItem.hidden" class="row">
-								
-									<view class="label">
-										{{ subItem.title }}:
-									</view>
-								
-									<wd-img
-										v-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
-										width="100rpx" height="100rpx"
-										:src="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url"
-										:enable-preview="true" />
-									<view
-										v-else-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '文件'"
-										class="value">
-										<wd-text type="primary"
-											@click="downloadFile(getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url)"
-											:text="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).name" />
-									</view>
-									<audio
-										v-else-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '音频'"
-										:src="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url"
-										:author="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).author"
-										:name="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).name"
-										controls></audio>
-									<view v-else class="value">
-										{{ getValue(PItem.fieldMap[subItem.sourceId], subItem.title) }}
+
+								<view class="label">
+									{{ subItem.title }}:
+								</view>
+
+								<wd-img v-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
+									width="100rpx" height="100rpx"
+									:src="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url"
+									:enable-preview="true" />
+								<view
+									v-else-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '文件'"
+									class="value">
+									<wd-text type="primary"
+										@click="downloadFile(getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url)"
+										:text="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).name" />
+								</view>
+								<audio
+									v-else-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '音频'"
+									:src="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).url"
+									:author="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).author"
+									:name="getValue(PItem.fieldMap[subItem.sourceId], subItem.title).name"
+									controls></audio>
+								<view v-else-if="subItem.buttons.includes('detail')">
+									<view @click="goto('link', bItem, subItem)" class="link"
+										v-for="(bItem, bIndex) in getValue(pageData.fieldMap[subItem.sourceId], subItem.title)"
+										:key="bIndex">
+										<text> {{ bItem.label }}</text>
 									</view>
-								
+								</view>
+								<view v-else class="value">
+									{{ getValue(PItem.fieldMap[subItem.sourceId], subItem.title) }}
+								</view>
+
 							</view>
 						</view>
 
@@ -179,13 +201,18 @@ function goto(PItem: any, item: any) {
 		word-break: break-all;
 		color: #333;
 	}
+
+	.link {
+		color: #4d80f0;
+	}
 }
 
 
 :deep(.card-custom-class) {
 	margin: 0 !important;
 }
-:deep(.card-custom-class-relation){
+
+:deep(.card-custom-class-relation) {
 	margin: 0 0 8px 0 !important;
 }
 

package/w-edit/w-edit.vue

@@ -12,24 +12,25 @@ export default {
             <wd-loading />
         </view>
         <view v-else>
-        <wd-collapse v-model="value" >
-            <wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups" :key="index">
-                <view
-                    v-if="item.type === 'fieldGroup'">
-                    <wd-form ref="form" :model="model">
-                        <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
-                              <wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn" v-model:model-value="model[subItem.id]"/>
-                        </wd-cell-group>
-
-                    </wd-form>
-                   
-                </view>
-                <view v-if="item.type === 'relation'">
-                    <view class="row-add">
+            <wd-collapse v-model="value">
+                <wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id"
+                    v-for="(item, index) in pageConf.groups" :key="index">
+                    <view v-if="item.type === 'fieldGroup'">
+                        <wd-form ref="form" :model="model">
+                            <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
+                                <wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn"
+                                    v-model:model-value="model[subItem.id]" />
+                            </wd-cell-group>
+
+                        </wd-form>
+
+                    </view>
+                    <view v-if="item.type === 'relation'">
+                        <view class="row-add">
                             <wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
                                 icon="add" @click="selectrow(item)">选择</wd-button>
                             <wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
-                                icon="add" @click="addrow(item.id)">新增</wd-button>
+                                icon="add" @click="add(item)">新增</wd-button>
                         </view>
 
                         <view v-if="relationLoading[item.id]"
@@ -39,7 +40,8 @@ export default {
 
                         <!-- 卡片 -->
                         <view v-else class="card-list">
-                            <w-card v-for="(subitem, index) in selectData[item.id]" :key="index" :car-index="index"
+                            <w-card @edit="()=>{editItem(item, subitem, subindex)}" @delet="() => { deletItem(item, subitem, subindex) }" :actionType="item.type"
+                                v-for="(subitem, subindex) in selectData[item.id]" :key="subindex" :car-index="subindex"
                                 :page="{
                                     rowActions: item.rowActions || [],
                                     buttons: item.buttons || [],
@@ -53,15 +55,15 @@ export default {
                                 @click="addrow(item.id)">加一条</wd-button>
                         </view>
 
-                </view>
+                    </view>
 
 
-            </wd-collapse-item>
-        </wd-collapse>
-        <view class="footer-button">
-            <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
+                </wd-collapse-item>
+            </wd-collapse>
+            <view class="footer-button">
+                <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
+            </view>
         </view>
-       </view>
         <wd-message-box />
         <wd-popup safe-area-inset-bottom position="right" v-model="showSelectRow" custom-style="width: 100vw;">
             <WSelectTable :sourceId="pointSourceId">
@@ -81,8 +83,8 @@ export default {
 import wCard from '../w-card/w-card.vue'
 import wFromControl from '../w-form-control/w-form-control.vue'
 import WSelectTable from '../w-table/w-selectTable.vue';
-import { onLoad ,onUnload} from '@dcloudio/uni-app'
-import { ref, defineProps, reactive ,watch} from 'vue';
+import { onLoad, onUnload } from '@dcloudio/uni-app'
+import { ref, defineProps, reactive, watch } from 'vue';
 import {
     editPageConfig,
     getEnum,
@@ -102,9 +104,9 @@ const props = defineProps({
         type: String,
         default: ''
     },
-    code:{
-         type: String,
-         default: ''
+    code: {
+        type: String,
+        default: ''
     }
 
 })
@@ -125,32 +127,30 @@ const relationID = ref('')
 const selectData = ref({})
 onLoad((option: any) => {
     sourceId.value = props.sourceId || option.sourceId
-    code.value = props.code|| option.code
+    code.value = props.code || option.code
     getPageConfig()
-     //监听勾选列表页面事件
-     uni.$on('getCheckData', function (data: any) {
+    //监听勾选列表页面事件
+    uni.$on('getCheckData', function (data: any) {
         checkboxvalue.value = data.checkData
+        // 取消监听勾选列表页面事件
+        uni.$off('getCheckData')
     })
+
 })
 watch(checkboxvalue, (value) => {
-    if (value.length === 0) return
-    //获取勾选数据
-    let codes = ''
-    value.forEach((item: any) => {
-        codes += `codes=${item}&`
-    })
-    getSelectDataPxoy(codes)
+    
+    getSelectDataPxoy(value)
 }, {
-    immediate: false
+    immediate: false,
+    deep: true
 })
 onUnload(() => {
-    // 取消监听勾选列表页面事件
-    uni.$off('getCheckData')
+
 })
 //获取页面配置
 function getPageConfig() {
     loading.value = true
-    editPageConfig(sourceId.value,code.value).then((res: any) => {
+    editPageConfig(sourceId.value, code.value).then((res: any) => {
         pageConf.value = res.data.dtmplConfig
         let fieldGroup = {}
         let relation = {}
@@ -158,7 +158,7 @@ function getPageConfig() {
             value.value.push(item.id)
             if (item.type === 'relation') {
                 let t = []
-                t=res.data.dtmplConfig.entity?.arrayMap[item.id]?.map((item:any)=>item.code)
+                t = res.data.dtmplConfig.entity?.arrayMap[item.id]?.map((item: any) => item.code)
                 relation[item.id] = t
                 relationLoading[item.id] = false
                 selectData.value[item.id] = res.data.dtmplConfig.entity?.arrayMap[item.id] || []
@@ -167,14 +167,14 @@ function getPageConfig() {
                 item.fields.forEach((subItem: any) => {
                     fieldGroup[subItem.id] = res.data.dtmplConfig.entity?.fieldMap[subItem.id] || ''
                 })
-                fieldGroup['唯一编码']=res.data.dtmplConfig.entity?.code
+                fieldGroup['唯一编码'] = res.data.dtmplConfig.entity?.code
             }
 
         })
         model.value = {
             ...relation,
             ...fieldGroup,//一般为基本信息
-            唯一编码:res.data.dtmplConfig.entity?.code
+            唯一编码: res.data.dtmplConfig.entity?.code
         }
         getEnumer()
         loading.value = false
@@ -197,8 +197,16 @@ async function getEnumer() {
 }
 
 //获取勾选数据
-async function getSelectDataPxoy(codes: string) {
+async function getSelectDataPxoy(values: string[]) {
+    if (values.length === 0) return model.value[relationID.value]=[]
+    //获取勾选数据
+    let codes = ''
+    values.forEach((item: any) => {
+        codes += `codes=${item}&`
+    })
+
     relationLoading[relationID.value] = true
+    if (!relationID.value) return
     const res = await getSelectData(relationID.value, codes)
     selectData.value[relationID.value] = res.data.entities
     model.value[relationID.value] = selectData.value[relationID.value].map((item: any) => {
@@ -232,21 +240,25 @@ async function handleSubmit() {
                         })
                     }
                 })
-                data['唯一编码']=model.value['唯一编码']
+                data['唯一编码'] = model.value['唯一编码']
                 try {
                     const res = await addPageDataSave(sourceId.value, data)
-                    if (res.data.status==='success'){
+                    if (res.data.status === 'success') {
                         toast.success("保存成功")
-                          uni.navigateBack()
-                    }else{
-                        toast.error(res.data.message||'保存失败"')
+                        uni.navigateBack({
+                            success: () => {
+                                uni.$emit('editeDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+                            }
+                        })
+                    } else {
+                        toast.error(res.data.message || '保存失败"')
                     }
-                        
+
                 } catch (error) {
                     toast.error(error)
                 }
 
-              
+
             }
         })
         .catch((error) => {
@@ -259,17 +271,57 @@ async function handleSubmit() {
 function selectrow(item: any) {
     relationID.value = item.id
     pointSourceId.value = item.pointSourceId
-    let data=selectData.value[relationID.value]?.map((item)=>{
+    let data = selectData.value[relationID.value]?.map((item) => {
         return item.code
     })
     uni.navigateTo({
         url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
         success: () => {
-            uni.$emit('checkeDData', { checkData: data||[] })
+            uni.$emit('checkeDData', { checkData: data || [] })
         }
     })
 }
 
+//删除勾选数据
+const deletItem = (item: any, subitem: any, index: any) => {
+    relationID.value = item.id
+    selectData.value[item.id].splice(index, 1)
+    let data = selectData.value[item.id].map((item: any) => {
+        return item.code
+    })
+    checkboxvalue.value = data || []
+}
+
+//点击编辑勾选数据按钮
+const editItem=( item: any, subitem: any, index: any )=>{
+    relationID.value = item.id
+     //监听编辑页面事件
+     uni.$on('editeDataSAC', function (data: any) {
+        
+        checkboxvalue.value=selectData.value[item.id].map((item: any) => {
+            return item.code
+        })
+         // 取消监听编辑页面事件
+         uni.$off('editeDataSAC')
+    })
+}
+
+//新增
+const add = (item: any) => {
+    relationID.value = item.id
+    //监听添加数据完成事件
+    uni.$on('addDataSAC', function (data: any) {
+        checkboxvalue.value.push(data.entityCode)
+        // 取消监听添加数据完成事件
+        uni.$off('addDataSAC')
+    })
+    //跳转新增页面
+    uni.navigateTo({
+        url: `/pages/add/add?sourceId=${item.pointSourceId}`,
+    })
+}
+
+
 //新加一行
 function addrow(key: any) {
 

package/w-form-control/w-form-control.vue

@@ -9,23 +9,26 @@
       label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
       :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="Enumcolumn[subItem.mstrucId]"
-      @confirm="(e) => { change(e) }" @clear="clear"/>
+      @confirm="(e) => { change(e) }" @clear="clear" />
     <wd-textarea auto-height v-else-if="subItem.extControlType === 'textarea'" :disabled="subItem.disabled"
       :label="subItem.title" label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
       :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }" @clear="clear"/>
+      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
+      @clear="clear" />
     <wd-input v-else-if="subItem.extControlType === 'decimal' || subItem.extControlType === 'int'"
       :disabled="subItem.disabled" :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
       :modelValue="modelValue" type="number" :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }" @clear="clear"/>
+      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
+      @clear="clear" />
     <wd-calendar v-else-if="subItem.extControlType === 'datetime'" :disabled="subItem.disabled" :label="subItem.title"
       label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue" type="datetime"
       :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }" @clear="clear"/>
+      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
+      @clear="clear" />
     <wSelectPicker @confirm="wSelectPickerconfirm" :prop="subItem.id" v-else-if="subItem.extControlType === 'relselect'"
-      :modelValue="modelValue" :disabled="subItem.disabled" :label="subItem.title" type="radio"
+      :modelValue="modelValue" :disabled="subItem.disabled" :label="subItem.title" :type="subItem.max===1?'radio':'checkbox'"
       :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
-      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @clear="clear"/>
+      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @clear="clear" />
     <wd-cell v-else-if="subItem.extControlType === 'file'"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}文件` }]" :title="subItem.title"
       title-width="100px" :prop="subItem.id">
@@ -34,9 +37,8 @@
         :file-list="modelValue" :disabled="subItem.disabled" :action="`${baseUrl}/v3/upload`"
         @success="success"></wd-upload>
     </wd-cell>
-    <wd-input v-else :disabled="subItem.disabled" :label="subItem.title"
-      label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
-      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+    <wd-input v-else :disabled="subItem.disabled" :label="subItem.title" label-width="100px" :prop="subItem.id"
+      clearable :modelValue="modelValue" :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
       :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
       @clear="clear" />
   </view>
@@ -75,7 +77,20 @@ const modelValue = computed(() => {
       return props.model[props.subItem.id] ? dayjs(props.model[props.subItem.id]).valueOf() : null
 
     case 'relselect':
-      return props.model[props.subItem.id] ? props.model[props.subItem.id].split('@R@')[0] : ''
+      if (props.subItem.max === 1) {
+        return props.model[props.subItem.id] ? props.model[props.subItem.id].split('@R@')[0] : ''
+      } else {
+        if(!props.model[props.subItem.id])  return []
+
+        let selectArr=  props.model[props.subItem.id].split('@,@')
+       
+        let selectArr2= selectArr.map((item:any)=>{
+          return item.split('@R@')[0]
+        }) 
+        
+         return selectArr2
+      }
+
     case 'file':
       return props.model[props.subItem.id] ? JSON.parse(props.model[props.subItem.id]).valid === 'new' ? [{ url: JSON.parse(props.model[props.subItem.id]).base.path }] : [{ url: baseUrl + "/v3/files" + JSON.parse(props.model[props.subItem.id]).base.path }] : []
 
@@ -97,7 +112,11 @@ const success = (e: any) => {
 const wSelectPickerconfirm = (e) => {
   console.log(e)
   if (Array.isArray(e.selectedItems)) {
-
+    let selectArr1= e.selectedItems.map((item:any)=>{
+      return `${item.value}@R@${item.label}`
+    })
+    let selectArr= selectArr1.join('@,@')
+    emit('update:modelValue', selectArr)
   } else {
     emit('update:modelValue', `${e.selectedItems.value}@R@${e.selectedItems.label}`)
   }

package/w-search/w-search.vue

@@ -114,8 +114,11 @@ const search = () => {
               data.push(d)
               break;
             case 'entity-select':
+            d = `c_${key}=${element.value}@R@${element.label}`
+              data.push(d)
+              break;
             case 'relselectvalue':
-              console.log(element)
+              
               d = `c_${key}=${element.label}`
               data.push(d)
               break;