w-ui-v1 1.0.36 → 1.0.38

package/package.json

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

package/w-add/w-add.vue

@@ -1,69 +1,71 @@
 <script lang="ts">
 //在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
 export default {
-    options: {
-        styleIsolation: 'shared'//使css :deep()生效
-    }
+	options: {
+		styleIsolation: 'shared'//使css :deep()生效
+	}
 }
 </script>
 <template>
-    <view>
-        <view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
-            <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-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="add(item)">新增</wd-button>
-                        </view>
-
-                        <view v-if="relationLoading[item.id]"
-                            style="height: 100px;display: flex;justify-content: center;align-items: center;">
-                            <wd-loading />
-                        </view>
-
-                        <!-- 卡片 -->
-                        <view v-else class="card-list">
-                            <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 || [],
-                                    ractions: item.ractions || [],
-                                    columns: item.fields || []
-                                }" :item-data="subitem" :source-id="item.pointSourceId" />
-                        </view>
-
-                        <view class="row-add" v-if="item.buttons.includes('rowAdd')">
-                            <wd-button hairline type="info" size="small" icon="add"
-                                @click="addrow(item.id)">加一条</wd-button>
-                        </view>
-                    </view>
-                </wd-collapse-item>
-            </wd-collapse>
-            <view class="footer-button">
-                <wd-button :round="false" block @click="handleSubmit" icon="save">保存</wd-button>
-            </view>
-        </view>
-        <wd-message-box />
-        <wd-toast />
-    </view>
+	<view>
+		<view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
+			<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-card>
+							<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>
+						</wd-card>
+					</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="add(item)">新增</wd-button>
+						</view>
+
+						<view v-if="relationLoading[item.id]"
+							style="height: 100px;display: flex;justify-content: center;align-items: center;">
+							<wd-loading />
+						</view>
+
+						<!-- 卡片 -->
+						<view v-else class="card-list">
+							<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 || [],
+									ractions: item.ractions || [],
+									columns: item.fields || []
+								}" :item-data="subitem" :source-id="item.pointSourceId" />
+						</view>
+
+						<view class="row-add" v-if="item.buttons.includes('rowAdd')">
+							<wd-button hairline type="info" size="small" icon="add"
+								@click="addrow(item.id)">加一条</wd-button>
+						</view>
+					</view>
+				</wd-collapse-item>
+			</wd-collapse>
+			<view class="footer-button">
+				<wd-button :round="false" block @click="handleSubmit" icon="save">保存</wd-button>
+			</view>
+		</view>
+		<wd-message-box />
+		<wd-toast />
+	</view>
 </template>
 
 <script setup lang="ts">
@@ -72,23 +74,23 @@ import wFromControl from '../w-form-control/w-form-control.vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
 import { ref, defineProps, reactive, watch } from 'vue';
 import {
-    addPageConfig,
-    getEnum,
-    addPageDataSave,
-    getSelectData
+	addPageConfig,
+	getEnum,
+	addPageDataSave,
+	getSelectData
 } from '../utils/apis/pageConfig'
 import { useMessage } from 'wot-design-uni'
 import { useToast } from 'wot-design-uni'
 const toast = useToast()
 const message = useMessage()
 defineOptions({
-    name: 'w-add'
+	name: 'w-add'
 })
 const props = defineProps({
-    sourceId: {
-        type: String,
-        default: ''
-    },
+	sourceId: {
+		type: String,
+		default: ''
+	},
 
 })
 const sourceId = ref('')
@@ -107,262 +109,264 @@ const value = ref([])
 const Enumcolumn = ref({})
 const pointSourceId = ref('')
 onLoad((option: any) => {
-    sourceId.value = props.sourceId || option.sourceId
-    getPageConfig()
+	sourceId.value = props.sourceId || option.sourceId
+	getPageConfig()
 })
 
 watch(checkboxvalue, (value) => {
-   
-    getSelectDataPxoy(value)
+
+	getSelectDataPxoy(value)
 }, {
-    immediate: false,
-    deep: true
+	immediate: false,
+	deep: true
 
 })
 
 onUnload(() => {
-    // 取消监听勾选列表页面事件
-    uni.$off('getCheckData')
+	// 取消监听勾选列表页面事件
+	uni.$off('getCheckData')
 
 })
 
 // 获取页面配置
 function getPageConfig() {
-    loading.value = true
-    addPageConfig(sourceId.value).then((res: any) => {
-        pageConf.value = res.data.dtmplConfig
-
-        let fieldGroup = {}
-        let relation = {}
-        res.data.dtmplConfig.groups.forEach((item: any) => {
-            value.value.push(item.id)
-            if (item.type === 'relation') {
-                let t = []
-                relation[item.id] = t
-                relationLoading[item.id] = false
-            }
-
-
-            if (item.type === 'fieldGroup') {
-
-                item.fields.forEach((subItem: any) => {
-                    if (subItem.extControlType === 'datetime') {
-                        fieldGroup[subItem.id] = null
-                        return
-                    }
-                    fieldGroup[subItem.id] = subItem.defaultValue || ''
-
-                })
-            }
-
-        })
-        model.value = {
-            ...relation,
-            ...fieldGroup//一般为基本信息
-        }
-        getEnumer()
-        loading.value = false
-    })
+	loading.value = true
+	addPageConfig(sourceId.value).then((res: any) => {
+		pageConf.value = res.data.dtmplConfig
+
+		let fieldGroup = {}
+		let relation = {}
+		res.data.dtmplConfig.groups.forEach((item: any) => {
+			value.value.push(item.id)
+			if (item.type === 'relation') {
+				let t = []
+				relation[item.id] = t
+				relationLoading[item.id] = false
+			}
+
+
+			if (item.type === 'fieldGroup') {
+
+				item.fields.forEach((subItem: any) => {
+					if (subItem.extControlType === 'datetime') {
+						fieldGroup[subItem.id] = null
+						return
+					}
+					fieldGroup[subItem.id] = subItem.defaultValue || ''
+
+				})
+			}
+
+		})
+		model.value = {
+			...relation,
+			...fieldGroup//一般为基本信息
+		}
+		getEnumer()
+		loading.value = false
+	})
 
 }
 //获取枚举
 async function getEnumer() {
-    let params = []
-    pageConf.value.groups?.forEach((item: any) => {
-        item.fields?.forEach((subItem: any) => {
-            if (subItem.extControlType === 'select') {
-                params.push(`mstrucIds=${subItem.mstrucId}`)
-            }
-        })
-    });
-    if (!params.length) return
-    const res = await getEnum(params.join("&"))
-    Enumcolumn.value = res.data?.enumMap || {}
+	let params = []
+	pageConf.value.groups?.forEach((item: any) => {
+		item.fields?.forEach((subItem: any) => {
+			if (subItem.extControlType === 'select') {
+				params.push(`mstrucIds=${subItem.mstrucId}`)
+			}
+		})
+	});
+	if (!params.length) return
+	const res = await getEnum(params.join("&"))
+	Enumcolumn.value = res.data?.enumMap || {}
 }
 
 
 //保存
 async function handleSubmit() {
 
-    form.value[0]
-        .validate()
-        .then(async ({ valid, errors }) => {
-            if (valid) {
-                toast.loading({
-                    message: '保存中...',
-                    duration: 0
-                })
-                let data = {}
-                pageConf.value.groups?.forEach((item: any) => {
-                    if (item.type === 'fieldGroup') {
-                        item.fields?.forEach((subItem: any) => {
-                            data[subItem.id] = model.value[subItem.id]
-                        })
-                    }
-
-                    if (item.type === 'relation') {
-                        data[`${item.id}.$$flag$$`] = true
-                        model.value[item.id]?.forEach((subItem: any, index: number) => {
-                            data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
-                            data[`${item.id}[${index}].唯一编码`] = subItem
-                        })
-                    }
-                })
-
-                try {
-                    const res = await addPageDataSave(sourceId.value, data)
-                    if (res.data.status === 'success') {
-                        toast.success("保存成功")
-                        uni.navigateBack({
-                            success: () => {
-                                uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
-                            }
-                        })
-                    } else {
-                        toast.error(res.data.message || '保存失败"')
-                    }
-
-                } catch (error) {
-                    toast.error(error)
-                }
-
-
-            }
-        })
-        .catch((error) => {
-            console.log(error, 'error')
-        })
+	form.value[0]
+		.validate()
+		.then(async ({ valid, errors }) => {
+			if (valid) {
+				toast.loading({
+					message: '保存中...',
+					duration: 0
+				})
+				let data = {}
+				pageConf.value.groups?.forEach((item: any) => {
+					if (item.type === 'fieldGroup') {
+						item.fields?.forEach((subItem: any) => {
+							data[subItem.id] = model.value[subItem.id]
+						})
+					}
+
+					if (item.type === 'relation') {
+						data[`${item.id}.$$flag$$`] = true
+						model.value[item.id]?.forEach((subItem: any, index: number) => {
+							data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+							data[`${item.id}[${index}].唯一编码`] = subItem
+						})
+					}
+				})
+
+				try {
+					const res = await addPageDataSave(sourceId.value, data)
+					if (res.data.status === 'success') {
+						toast.success("保存成功")
+						uni.navigateBack({
+							success: () => {
+								uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+							}
+						})
+					} else {
+						toast.error(res.data.message || '保存失败"')
+					}
+
+				} catch (error) {
+					toast.error(error)
+				}
+
+
+			}
+		})
+		.catch((error) => {
+			console.log(error, 'error')
+		})
 
 }
 
 //跳转勾选页面数据
 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) => {
-        return item.code
-    })
-    uni.navigateTo({
-        url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
-        success: () => {
-            uni.$emit('checkeDData', { checkData: data || [] })
-        }
-    })
+	//监听勾选列表页面事件
+	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) => {
+		return item.code
+	})
+	uni.navigateTo({
+		url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
+		success: () => {
+			uni.$emit('checkeDData', { checkData: data || [] })
+		}
+	})
 }
 const selectData = ref({})
 //获取勾选数据
 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) => {
-        return item.code
-    })
-    relationLoading[relationID.value] = false
+	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) => {
+		return item.code
+	})
+	relationLoading[relationID.value] = false
 }
 
 //删除勾选数据
 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 || []
+	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 editItem = (item: any, subitem: any, index: any) => {
+	relationID.value = item.id
+	//监听编辑页面事件
+	uni.$on('editeDataSAC', function (data: any) {
+
+		checkboxvalue.value = selectData.value[item.id]?selectData.value[item.id].map((item: any) => {
+			return item.code
+		}):[data.entityCode]
+		// 取消监听编辑页面事件
+		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}`,
-    })
+	relationID.value = item.id
+	//监听添加数据完成事件
+	uni.$on('addDataSAC', function (data: any) {
+		checkboxvalue.value = selectData.value[item.id]?[...selectData.value[item.id].map((item: any) => {
+			return item.code
+		}), data.entityCode]:[data.entityCode]
+		// 取消监听添加数据完成事件
+		uni.$off('addDataSAC')
+	})
+	//跳转新增页面
+	uni.navigateTo({
+		url: `/pages/add/add?sourceId=${item.pointSourceId}`,
+	})
 }
 
 
 //新加一行
 function addrow(key: any) {
 
-    let data = pageConf.value.groups.find((item: any) => {
-        return item.id === key
-    })
-    let t = {}
-    data.fields.forEach((subItem: any) => {
-        t[subItem.id] = subItem.defaultValue || ''
-    })
-    model.value[key].push(t)
+	let data = pageConf.value.groups.find((item: any) => {
+		return item.id === key
+	})
+	let t = {}
+	data.fields.forEach((subItem: any) => {
+		t[subItem.id] = subItem.defaultValue || ''
+	})
+	model.value[key].push(t)
 }
 //删除一行
 function remove(key: any, index: any, title: string) {
-    message
-        .confirm({
-            msg: `${title}--确定删除第${index + 1}条数据吗？`,
-            title: '删除'
-        })
-        .then(() => {
-            model.value[key].splice(index, 1)
-        })
-        .catch(() => {
-            console.log('点击了取消按钮')
-        })
+	message
+		.confirm({
+			msg: `${title}--确定删除第${index + 1}条数据吗？`,
+			title: '删除'
+		})
+		.then(() => {
+			model.value[key].splice(index, 1)
+		})
+		.catch(() => {
+			console.log('点击了取消按钮')
+		})
 
 }
 </script>
 
 <style scoped lang="scss">
 .footer-button {
-    width: 100%;
-    box-sizing: border-box;
-    padding: 5px 10px 5px 10px;
-    position: sticky;
-    bottom: 0;
-    background-color: #fff;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 5px 10px 5px 10px;
+	position: sticky;
+	bottom: 0;
+	background-color: #fff;
 
 }
 
 .row-add {
-    // background-color: #fff;
-    padding: 8px 0;
-    display: flex;
-    justify-content: center;
-    gap: 5px;
+	// background-color: #fff;
+	padding: 0 0 8px 0;
+	display: flex;
+	justify-content: center;
+	gap: 5px;
 }
 
 :deep(.collapse-custom-class) {
-    background-color: #F6F7FB;
-    padding: 0.5px 0 !important;
+	background-color: #f8f8f8;
+	padding: 15px 0 0.5px 0 !important;
 }
 </style>

package/w-card/w-card.vue

@@ -41,6 +41,10 @@ const props = defineProps({
   applicationType: {
     type: String,
     default: ''
+  },
+  actionType: {
+    type: String,
+    default: ''
   }
 })
 
@@ -200,7 +204,7 @@ const actionBtn = (item: any) => {
 //格式化title
 const getTitleValue = (value: any, title: string) => {
   let data=getValue(value, title)?.content
-  if(!data) return ' '
+  if(!data) return ''
   // 是否为数组
   if(Array.isArray(data)){
     return getValue(value, title).content.map((item:any)=>{
@@ -279,8 +283,9 @@ const getTitleValue = (value: any, title: string) => {
           @click="goto('edit')">
           编辑
         </wd-button>
+        <!-- //假删除按钮，在新增、编辑页面才会出现 -->
         <wd-button :round="false" size="small" class="btn"  type="error" @click="delerelation"
-          v-if="props.actionType === 'relation'">
+          v-if="props.actionType === 'relation'&&props.page.buttons.includes('singleDelete')">
           删除
         </wd-button>
         <wd-button :round="false" size="small" class="btn"  type="error" @click="dele"

package/w-edit/w-edit.vue

@@ -16,14 +16,15 @@ export default {
                 <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>
-
+                        <wd-card>
+                            <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>
+                        </wd-card>
                     </view>
                     <view v-if="item.type === 'relation'">
                         <view class="row-add">
@@ -40,7 +41,8 @@ export default {
 
                         <!-- 卡片 -->
                         <view v-else class="card-list">
-                            <w-card @edit="()=>{editItem(item, subitem, subindex)}" @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 || [],
@@ -138,7 +140,7 @@ onLoad((option: any) => {
 
 })
 watch(checkboxvalue, (value) => {
-    
+
     getSelectDataPxoy(value)
 }, {
     immediate: false,
@@ -198,7 +200,7 @@ async function getEnumer() {
 
 //获取勾选数据
 async function getSelectDataPxoy(values: string[]) {
-    if (values.length === 0) return model.value[relationID.value]=[]
+    if (values.length === 0) return model.value[relationID.value] = []
     //获取勾选数据
     let codes = ''
     values.forEach((item: any) => {
@@ -247,6 +249,7 @@ async function handleSubmit() {
                         toast.success("保存成功")
                         uni.navigateBack({
                             success: () => {
+                                
                                 uni.$emit('editeDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
                             }
                         })
@@ -292,26 +295,29 @@ const deletItem = (item: any, subitem: any, index: any) => {
     checkboxvalue.value = data || []
 }
 
-//点击编辑勾选数据按钮
-const editItem=( item: any, subitem: any, index: any )=>{
+//点击编辑按钮
+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) => {
+    //监听编辑页面事件
+    uni.$on('editeDataSAC', function (data: any) {
+      
+        checkboxvalue.value = selectData.value[item.id]?selectData.value[item.id].map((item: any) => {
             return item.code
-        })
-         // 取消监听编辑页面事件
-         uni.$off('editeDataSAC')
+        }):[data.entityCode]
+        // 取消监听编辑页面事件
+        uni.$off('editeDataSAC')
     })
 }
 
-//新增
+//点击新增按钮
 const add = (item: any) => {
     relationID.value = item.id
+
     //监听添加数据完成事件
     uni.$on('addDataSAC', function (data: any) {
-        checkboxvalue.value.push(data.entityCode)
+        checkboxvalue.value = selectData.value[item.id]?[...selectData.value[item.id].map((item: any) => {
+			return item.code
+		}), data.entityCode]:[data.entityCode]
         // 取消监听添加数据完成事件
         uni.$off('addDataSAC')
     })
@@ -364,14 +370,14 @@ function remove(key: any, index: any, title: string) {
 
 .row-add {
     // background-color: #fff;
-    padding: 8px 0;
+    padding: 0 0 8px 0;
     display: flex;
     justify-content: center;
     gap: 5px;
 }
 
 :deep(.collapse-custom-class) {
-    background-color: #F6F7FB;
-    padding: 0.5px 0 !important;
+    background-color: #f8f8f8;
+    padding: 15px 0 0.5px 0 !important;
 }
 </style>

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

@@ -25,10 +25,17 @@
       :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
       :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="subItem.max===1?'radio':'checkbox'"
-      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
-      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @clear="clear" />
+
+    <wd-cell v-else-if="subItem.extControlType === 'relselect'" title-width="100px" :prop="subItem.id"
+      :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
+      <view style="text-align: left">
+        <wSelectPicker @confirm="wSelectPickerconfirm" :modelValue="modelValue" :disabled="subItem.disabled"
+          :type="subItem.max === 1 ? 'radio' : 'checkbox'"
+          :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
+          @clear="clear" clearable />
+      </view>
+    </wd-cell>
+
     <wd-cell v-else-if="subItem.extControlType === 'file'"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}文件` }]" :title="subItem.title"
       title-width="100px" :prop="subItem.id">
@@ -80,15 +87,15 @@ const modelValue = computed(() => {
       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 []
+        if (!props.model[props.subItem.id]) return []
 
-        let selectArr=  props.model[props.subItem.id].split('@,@')
-       
-        let selectArr2= selectArr.map((item:any)=>{
+        let selectArr = props.model[props.subItem.id].split('@,@')
+
+        let selectArr2 = selectArr.map((item: any) => {
           return item.split('@R@')[0]
-        }) 
-        
-         return selectArr2
+        })
+
+        return selectArr2
       }
 
     case 'file':
@@ -112,10 +119,10 @@ const success = (e: any) => {
 const wSelectPickerconfirm = (e) => {
   console.log(e)
   if (Array.isArray(e.selectedItems)) {
-    let selectArr1= e.selectedItems.map((item:any)=>{
+    let selectArr1 = e.selectedItems.map((item: any) => {
       return `${item.value}@R@${item.label}`
     })
-    let selectArr= selectArr1.join('@,@')
+    let selectArr = selectArr1.join('@,@')
     emit('update:modelValue', selectArr)
   } else {
     emit('update:modelValue', `${e.selectedItems.value}@R@${e.selectedItems.label}`)

package/w-menu/w-menu.vue

@@ -133,6 +133,7 @@ function queryList() {
     </template>
     <view>
       <view v-if="filtermenu.length > 0" class="menu-list">
+        <slot name="topImg"></slot>
         <wd-card v-for="(item, index) in filtermenu" :key="index" :title="item.title"
           custom-title-class="menu-title-class">
           <template #default>