Commit d2218b1b authored by 田翔's avatar 田翔

fix: 提示语修改

parent dc011b5b
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "5.0.4", "version": "5.0.5",
"description": "5.0.4 坐标获取地址修复", "description": "5.0.5 提示语修改",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -169,7 +169,7 @@ const AccountSelector = (props) => { ...@@ -169,7 +169,7 @@ const AccountSelector = (props) => {
return ( return (
<div className={styles.AccountSelector}> <div className={styles.AccountSelector}>
<Input <Input
placeholder={!disabled ? placeholder : null} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择台账')}
value={value} value={value}
onClick={() => iconClick()} onClick={() => iconClick()}
addonAfter={!disabled ? addonAfter : null} addonAfter={!disabled ? addonAfter : null}
......
...@@ -74,7 +74,7 @@ const DeptSelector = (props) => { ...@@ -74,7 +74,7 @@ const DeptSelector = (props) => {
showArrow={!disabled} showArrow={!disabled}
allowClear allowClear
treeDefaultExpandAll={true} treeDefaultExpandAll={true}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择部门')}
> >
</TreeSelect> </TreeSelect>
) )
......
...@@ -178,7 +178,7 @@ const UserGroup = (props) => { ...@@ -178,7 +178,7 @@ const UserGroup = (props) => {
<Input <Input
disabled={disabled} disabled={disabled}
value={valueShow} value={valueShow}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择人员')}
onClick={inputFocus} onClick={inputFocus}
addonAfter={disabled ? null : <UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={inputFocus} />} addonAfter={disabled ? null : <UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={inputFocus} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -53,7 +53,7 @@ const UserSelect = (props) => { ...@@ -53,7 +53,7 @@ const UserSelect = (props) => {
return ( return (
<Select <Select
mode={isMultiple ? 'multiple' : null} mode={isMultiple ? 'multiple' : null}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择人员')}
value={valueShow} value={valueShow}
disabled={disabled} disabled={disabled}
showArrow={!disabled} showArrow={!disabled}
......
...@@ -129,7 +129,7 @@ const UserTree = (props) => { ...@@ -129,7 +129,7 @@ const UserTree = (props) => {
<Input <Input
disabled={disabled} disabled={disabled}
value={valueShow} value={valueShow}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择人员')}
onClick={inputFocus} onClick={inputFocus}
addonAfter={disabled ? null : <UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={inputFocus} />} addonAfter={disabled ? null : <UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={inputFocus} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -272,7 +272,7 @@ const Coordinate = (props) => { ...@@ -272,7 +272,7 @@ const Coordinate = (props) => {
!disabled ? !disabled ?
<Input <Input
disabled={disabled} disabled={disabled}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择坐标')}
value={value} value={value}
addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />} addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -220,7 +220,7 @@ const Device = (props) => { ...@@ -220,7 +220,7 @@ const Device = (props) => {
<Input <Input
disabled={disabled} disabled={disabled}
value={value} value={value}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择设备')}
onClick={iconClick} onClick={iconClick}
addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={iconClick} />} addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={iconClick} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -147,7 +147,7 @@ const DrawArea = (props) => { ...@@ -147,7 +147,7 @@ const DrawArea = (props) => {
!disabled ? !disabled ?
<Input <Input
disabled={disabled} disabled={disabled}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击绘制区域')}
value={isJson(value) ? '已绘制' : ''} value={isJson(value) ? '已绘制' : ''}
addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />} addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -145,7 +145,7 @@ const DrawPath = (props) => { ...@@ -145,7 +145,7 @@ const DrawPath = (props) => {
!disabled ? !disabled ?
<Input <Input
disabled={disabled} disabled={disabled}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '点击绘制路径')}
value={isJson(value) ? '已绘制' : ''} value={isJson(value) ? '已绘制' : ''}
addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />} addonAfter={disabled ? null : <CompassOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} onClick={showMap} />}
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -53,7 +53,7 @@ const DateTime = (props) => { ...@@ -53,7 +53,7 @@ const DateTime = (props) => {
<DatePicker <DatePicker
disabledDate={disabledDate} disabledDate={disabledDate}
disabled={disabled} disabled={disabled}
placeholder={!disabled ? placeholder : ''} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择日期')}
value={isValid ? moment(value) : null} value={isValid ? moment(value) : null}
onChange={dateChange} onChange={dateChange}
showNow showNow
......
...@@ -44,7 +44,7 @@ const Time = (props) => { ...@@ -44,7 +44,7 @@ const Time = (props) => {
disabledDate={disabledDate} disabledDate={disabledDate}
locale={locale} locale={locale}
disabled={disabled} disabled={disabled}
placeholder={!disabled ? placeholder : ''} placeholder={disabled ? (placeholder || '') : (placeholder || '点击选择时间')}
// getPopupContainer={(targterNode) => targterNode.parentElement || document.body} // getPopupContainer={(targterNode) => targterNode.parentElement || document.body}
minuteStep={5} minuteStep={5}
format={'HH:mm'} format={'HH:mm'}
......
...@@ -31,7 +31,7 @@ const CascadeSelector = (props) => { ...@@ -31,7 +31,7 @@ const CascadeSelector = (props) => {
return ( return (
<Cascader <Cascader
allowClear allowClear
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请选择内容')}
fieldNames={{ label: 'label', value: 'label', children: 'children' }} fieldNames={{ label: 'label', value: 'label', children: 'children' }}
value={value ? value.split('/') : []} value={value ? value.split('/') : []}
onChange={cascaderChange} onChange={cascaderChange}
......
...@@ -171,7 +171,7 @@ const ComboBox = (props) => { ...@@ -171,7 +171,7 @@ const ComboBox = (props) => {
showArrow={!disabled} showArrow={!disabled}
showSearch={isSearch} showSearch={isSearch}
value={valueShow} value={valueShow}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请选择内容')}
onChange={handleChange} onChange={handleChange}
allowClear allowClear
// getPopupContainer={(targterNode) => targterNode.parentElement || document.body} // getPopupContainer={(targterNode) => targterNode.parentElement || document.body}
......
...@@ -60,7 +60,7 @@ const RelevanceSelect = (props) => { ...@@ -60,7 +60,7 @@ const RelevanceSelect = (props) => {
style={{ width: '100%' }} style={{ width: '100%' }}
onChange={selectChange} onChange={selectChange}
disabled={disabled} disabled={disabled}
placeholder={!disabled ? placeholder : null} placeholder={disabled ? (placeholder || '') : (placeholder || '请选择内容')}
allowClear allowClear
> >
{ {
......
...@@ -32,7 +32,7 @@ const Coding = (props) => { ...@@ -32,7 +32,7 @@ const Coding = (props) => {
return ( return (
<div className={styles.coding} isdisabled={JSON.stringify(disabled)}> <div className={styles.coding} isdisabled={JSON.stringify(disabled)}>
<Input <Input
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请输入内容')}
onChange={inputChange} onChange={inputChange}
value={value} value={value}
disabled={disabled} disabled={disabled}
......
...@@ -64,7 +64,7 @@ const NumberInput = (props) => { ...@@ -64,7 +64,7 @@ const NumberInput = (props) => {
addonBefore={addonBefore} addonBefore={addonBefore}
addonAfter={addonAfter} addonAfter={addonAfter}
prefix={prefix} prefix={prefix}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请输入内容')}
disabled={disabled} disabled={disabled}
value={value === '' ? null : Number(value)} value={value === '' ? null : Number(value)}
formatter={formatterFn} formatter={formatterFn}
......
...@@ -57,7 +57,7 @@ const RichText = forwardRef(({ schema, onChange, value }, ref) => { ...@@ -57,7 +57,7 @@ const RichText = forwardRef(({ schema, onChange, value }, ref) => {
<Editor <Editor
defaultConfig={{ defaultConfig={{
readOnly: disabled, readOnly: disabled,
placeholder: placeholder || '', placeholder: disabled ? (placeholder || '') : (placeholder || '请输入内容'),
focus: false, focus: false,
pasteFilterStyle: true, // 忽略粘贴样式 pasteFilterStyle: true, // 忽略粘贴样式
pasteIgnoreImg: true, // 忽略粘贴的图片 pasteIgnoreImg: true, // 忽略粘贴的图片
......
...@@ -45,7 +45,6 @@ const SearchLocation = (props) => { ...@@ -45,7 +45,6 @@ const SearchLocation = (props) => {
} }
}) })
} }
// console.log(targetPath, coord)
if (targetPath) { if (targetPath) {
addons.setValue(targetPath, `${coord.x},${coord.y}`) addons.setValue(targetPath, `${coord.x},${coord.y}`)
} }
...@@ -73,7 +72,7 @@ const SearchLocation = (props) => { ...@@ -73,7 +72,7 @@ const SearchLocation = (props) => {
<Popover content={content} title="地名选择" trigger="hover" placement="topLeft"> <Popover content={content} title="地名选择" trigger="hover" placement="topLeft">
<Input <Input
disabled={disabled} disabled={disabled}
placeholder={placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请输入地址')}
value={value} value={value}
onChange={onSearch} onChange={onSearch}
/> />
......
...@@ -25,7 +25,7 @@ const TextArea = (props) => { ...@@ -25,7 +25,7 @@ const TextArea = (props) => {
disabled={disabled} disabled={disabled}
value={value} value={value}
rows={rows} rows={rows}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请输入内容')}
onChange={handleChange} onChange={handleChange}
/> />
) )
......
...@@ -102,7 +102,7 @@ const TextInput = (props) => { ...@@ -102,7 +102,7 @@ const TextInput = (props) => {
disabled={disabled} disabled={disabled}
value={valueShow} value={valueShow}
maxLength={maxLength} maxLength={maxLength}
placeholder={disabled ? null : placeholder} placeholder={disabled ? (placeholder || '') : (placeholder || '请输入内容')}
onChange={handleChange} onChange={handleChange}
addonBefore={iconList.includes(addonBefore) ? <Icon style={{ color: 'pink' }} component={icons[addonBefore]} /> : addonBefore} addonBefore={iconList.includes(addonBefore) ? <Icon style={{ color: 'pink' }} component={icons[addonBefore]} /> : addonBefore}
addonAfter={iconList.includes(addonAfter) ? <Icon component={icons[addonAfter]} /> : addonAfter} addonAfter={iconList.includes(addonAfter) ? <Icon component={icons[addonAfter]} /> : addonAfter}
......
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