Commit 69f85fbe authored by 彭俊龙's avatar 彭俊龙

feat: '自定义地图描述字段修改,手签显隐逻辑优化'

parent ac9ba07f
{
"name": "panda-xform",
"version": "6.10.52",
"description": "6.10.52 formjson解析检查非空",
"version": "6.10.54",
"description": "6.10.54 自定义地图描述字段修改,手签显隐逻辑优化",
"keywords": [
"panda-xform"
],
......@@ -23,7 +23,7 @@
"@ant-design/icons": "^4.7.0",
"@babel/plugin-proposal-private-property-in-object": "^7.15.4",
"@babel/runtime": "^7.19.0",
"@wangeditor/editor": "^5.1.22",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-react": "^1.0.6",
"antd": "4.20.7",
"file-saver": "^2.0.5",
......
......@@ -3990,10 +3990,10 @@ const mapWidgets = [
dependencies: ['isHidden'],
},
addressSync: {
title: '地址同步',
title: '数据同步',
type: 'string',
widget: 'AddressSync',
description: '位置信息将会同步到下方字段中',
description: '地图数据信息将同步到下方字段中',
otherProps: {
mode: "multiple"
}
......@@ -4533,7 +4533,7 @@ const advancedWidgets = [
showDate: {
title: '是否显示签名日期',
type: 'boolean',
widget: 'IsHidden',
widget: 'switch',
default: false,
displayType: 'row',
labelWidth: 137,
......@@ -4543,7 +4543,7 @@ const advancedWidgets = [
isShowSave: {
title: '是否隐藏保存电子签章选项',
type: 'boolean',
widget: 'IsHidden',
widget: 'switch',
default: false,
},
hiddenCondition: {
......
......@@ -120,7 +120,7 @@ const Signature = (props) => {
}
<div className={styles.right}>
<Button onClick={() => setVisible(false)}>取消</Button>
{signature ? <Button type='primary' ghost onClick={() => getValues()}>电子签章</Button> : null}
{(signature && !isShowSave) ? <Button type='primary' ghost onClick={() => getValues()}>电子签章</Button> : null}
<Button type='primary' onClick={() => onOk()}>确定</Button>
</div>
</div>
......
......@@ -4,13 +4,10 @@ import { Switch } from 'antd'
const IsHidden = (props) => {
const { value, onChange, addons } = props
const { baseControl, checkedTxt, unCheckedTxt } = props.schema
const switchChange = (checked) => {
if (addons) {
onChange(checked)
// baseControl是否为基础组件,是则不做联动逻辑
if(baseControl) return;
if (checked) {
addons.setValue('hiddenCondition', '1=1')
addons.setValue('hiddenRules', [])
......@@ -24,8 +21,8 @@ const IsHidden = (props) => {
return (
<Switch
checked={value}
checkedChildren={ checkedTxt || '隐藏'}
unCheckedChildren={ unCheckedTxt || '显示'}
checkedChildren={'隐藏'}
unCheckedChildren={'显示'}
onChange={switchChange}
>
</Switch>
......
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