Commit 727db353 authored by 田翔's avatar 田翔

fix: 人员选择器分组形态BUG修复

parent 967dd880
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "2.6.0", "version": "2.6.1",
"description": "2.6.0: 所有形态增加隐藏条件", "description": "2.6.1: 人员选择器分组形态BUG修复",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -487,35 +487,18 @@ const textWidgets = [ ...@@ -487,35 +487,18 @@ const textWidgets = [
title: '默认值', title: '默认值',
type: 'string', type: 'string',
}, },
groupSetting: {
title: '控件设置',
type: 'object',
properties: {}
},
required: { required: {
title: '必填', title: '必填',
type: 'boolean', type: 'boolean',
default: false, default: false,
width: '40%', width: '50%',
props: {
style: {
marginLeft: '10px'
}
}
}, },
disabled: { disabled: {
title: '只读', title: '只读',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '30%', width: '50%',
},
hidden: {
title: '隐藏',
type: 'boolean',
widget: 'checkbox',
default: false,
width: '30%',
}, },
groupStyle: { groupStyle: {
title: '控件样式', title: '控件样式',
...@@ -1453,44 +1436,34 @@ const businessWidgets = [ ...@@ -1453,44 +1436,34 @@ const businessWidgets = [
default: false, default: false,
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
props: { width: '50%',
style: { },
paddingLeft: '10px' isStoreID: {
} title: '是否存储ID',
} type: 'boolean',
default: false,
width: '50%',
}, },
required: { required: {
title: '必填', title: '必填',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '25%', width: '33%',
}, },
disabled: { disabled: {
title: '只读', title: '只读',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '25%', width: '33%',
},
hidden: {
title: '隐藏',
type: 'boolean',
widget: 'checkbox',
default: false,
width: '25%',
}, },
isMultiple: { isMultiple: {
title: '多选', title: '多选',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '25%', width: '33%',
},
isStoreID: {
title: '是否存储ID',
type: 'boolean',
default: false,
}, },
groupStyle: { groupStyle: {
title: '控件样式', title: '控件样式',
...@@ -1548,8 +1521,6 @@ const businessWidgets = [ ...@@ -1548,8 +1521,6 @@ const businessWidgets = [
type: 'string', type: 'string',
widget: 'FieldNames', widget: 'FieldNames',
required: true, required: true,
displayType: 'row',
labelWidth: 80,
}, },
title: { title: {
title: '展示名称', title: '展示名称',
...@@ -1904,26 +1875,14 @@ const dateWidgets = [ ...@@ -1904,26 +1875,14 @@ const dateWidgets = [
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '40%', width: '50%',
props: {
style: {
marginLeft: '10px',
}
}
}, },
disabled: { disabled: {
title: '只读', title: '只读',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '30%', width: '50%',
},
hidden: {
title: '隐藏',
type: 'boolean',
widget: 'checkbox',
default: false,
width: '30%',
}, },
groupStyle: { groupStyle: {
title: '控件样式', title: '控件样式',
...@@ -2008,21 +1967,14 @@ const fileWidgets = [ ...@@ -2008,21 +1967,14 @@ const fileWidgets = [
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '33%', width: '50%',
}, },
required: { required: {
title: '必填', title: '必填',
type: 'boolean', type: 'boolean',
widget: 'checkbox', widget: 'checkbox',
default: false, default: false,
width: '33%', width: '50%',
},
hidden: {
title: '隐藏',
type: 'boolean',
widget: 'checkbox',
default: false,
width: '33%',
}, },
preview: { preview: {
title: '预览', title: '预览',
......
...@@ -269,7 +269,6 @@ const getSelectItemList = async (params) => { ...@@ -269,7 +269,6 @@ const getSelectItemList = async (params) => {
const { code, data, msg } = await GetSelectItemList({ nodeName: dictionary }) const { code, data, msg } = await GetSelectItemList({ nodeName: dictionary })
if (code === 0) { if (code === 0) {
let array = data.filter(v => v.nodeName === value) let array = data.filter(v => v.nodeName === value)
console.log(data, array)
if (Array.isArray(array) && array.length) { if (Array.isArray(array) && array.length) {
form.setValueByPath(targetPath, array[0].nodeValue) form.setValueByPath(targetPath, array[0].nodeValue)
} }
......
...@@ -25,7 +25,6 @@ const getUSerName = (groupList, value, isMultiple, property) => { ...@@ -25,7 +25,6 @@ const getUSerName = (groupList, value, isMultiple, property) => {
} }
}) })
} }
console.log('users', groupList, value, isMultiple, property, users)
return users.map(v => v.userName).join(',') return users.map(v => v.userName).join(',')
} }
...@@ -60,7 +59,9 @@ const UserGroup = (props) => { ...@@ -60,7 +59,9 @@ const UserGroup = (props) => {
const valueShow = useMemo(() => { const valueShow = useMemo(() => {
if (value) { if (value) {
return getUSerName(groupList, value, isMultiple, property) if (property === 'userID') {
return getUSerName(groupList, value, isMultiple, property)
}
} }
return value return value
}, [groupList, isMultiple, value, property]) }, [groupList, isMultiple, value, property])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment