Merge branch 'dev-cjw' into 'dev'

fix: 修复组织架构、联想弹层组件、选择组件对sepTextField字段赋值异常问题,并对移动端的配置进行适配

See merge request itc-framework/ma/2024/front!6
This commit is contained in:
gao yq
2024-07-26 03:32:18 +00:00
4 changed files with 4 additions and 4 deletions

View File

@ -106,7 +106,7 @@
if (!props.sepTextField || !props.row) {
return;
}
props.row[props.sepTextField] = v;
props.row[camelCaseString(props.sepTextField)] = v;
}
function resetTreeList(list) {

View File

@ -139,7 +139,7 @@
const options = unref(selectedDataSourceVal.value);
const txtArr = options
.filter((opt) => {
return arr.includes(opt.id);
return arr.includes(opt.value);
})
.map((item) => item[props.labelField]);
formData[camelCaseString(props.sepTextField)] = txtArr.join(',');

View File

@ -172,7 +172,7 @@
return arr.includes(opt.value);
})
.map((item) => item.label);
props.row[props.sepTextField] = txtArr.join(',');
props.row[camelCaseString(props.sepTextField)] = txtArr.join(',');
}
onMounted(() => {

View File

@ -989,7 +989,7 @@ export function buildAppSchema(model: ComponentOptionModel, convertCamel: boolea
export function buildAppComponentProps(type, options, key, bindTable) {
const params: any = {};
const defaultParams = { isShow: options.isShow };
const defaultParams = { isShow: options.isShow, sepTextField: options?.sepTextField };
switch (type) {
case 'input':
return {