From f6a1ab6a58215cf7546976a86eb6face1a7be32f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 七月 2021 15:37:17 +0800
Subject: [PATCH] 2021-07-30
---
src/templates/zshare/modalform/index.jsx | 4 +-
src/menu/components/form/formaction/index.scss | 1
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 1
src/menu/components/share/sourcecomponent/inputform/index.jsx | 2
src/menu/stylecontroller/index.jsx | 10 +++--
src/mob/components/tabs/antv-tabs/index.jsx | 5 ++
src/tabviews/rolemanage/index.jsx | 4 +-
src/templates/zshare/formconfig.jsx | 8 ++++
src/mob/components/menubar/normal-menubar/index.jsx | 5 ++
src/menu/components/share/sourcecomponent/index.jsx | 4 +-
src/utils/utils-custom.js | 26 ++++++++++++
src/menu/components/card/data-card/index.jsx | 2
src/mob/components/formdragelement/card.jsx | 2
src/tabviews/zshare/mutilform/mkInput/index.jsx | 2
src/tabviews/zshare/mutilform/mkTextArea/index.jsx | 2
src/views/appmanage/index.jsx | 2
src/views/appmanage/submutilform/index.scss | 8 ++++
src/templates/modalconfig/dragelement/card.jsx | 4 +-
src/views/appmanage/submutilform/index.jsx | 19 ++-------
19 files changed, 78 insertions(+), 33 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index cb8b128..eab3104 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -459,7 +459,7 @@
<NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- {appType !== 'mob' ? <Icon className="plus" title="娣诲姞鍗＄墖" onClick={this.addCard} type="plus" /> : null}
+ <Icon className="plus" title="娣诲姞鍗＄墖" onClick={this.addCard} type="plus" />
{appType !== 'mob' ? <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" /> : null}
<Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
<WrapComponent config={card} updateConfig={this.updateComponent} />
diff --git a/src/menu/components/form/formaction/index.scss b/src/menu/components/form/formaction/index.scss
index b7a1cd3..1ed5878 100644
--- a/src/menu/components/form/formaction/index.scss
+++ b/src/menu/components/form/formaction/index.scss
@@ -13,6 +13,7 @@
}
.submit {
border: none;
+ height: auto;
}
.skip {
position: absolute;
diff --git a/src/menu/components/share/sourcecomponent/index.jsx b/src/menu/components/share/sourcecomponent/index.jsx
index a5b88bc..569fc8d 100644
--- a/src/menu/components/share/sourcecomponent/index.jsx
+++ b/src/menu/components/share/sourcecomponent/index.jsx
@@ -6,7 +6,7 @@
import InputForm from './inputform'
import './index.scss'
-class CopyComponent extends Component {
+class SourceComponent extends Component {
static propTpyes = {
type: PropTypes.string,
placement: PropTypes.any,
@@ -91,4 +91,4 @@
}
}
-export default CopyComponent
\ No newline at end of file
+export default SourceComponent
\ No newline at end of file
diff --git a/src/menu/components/share/sourcecomponent/inputform/index.jsx b/src/menu/components/share/sourcecomponent/inputform/index.jsx
index f178a9e..cb5888a 100644
--- a/src/menu/components/share/sourcecomponent/inputform/index.jsx
+++ b/src/menu/components/share/sourcecomponent/inputform/index.jsx
@@ -167,7 +167,7 @@
{keyword === 'upload' ? <Form.Item label="涓婁紶" labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={{xs: { span: 24 }, sm: { span: 20 }}}>
<FileUpload config={{
initval: '',
- suffix: type === 'video' ? '.mp4,.webm,.ogg' : '.jpg,.png,.gif,.pjp,.pjpeg,.jpeg,.jfif,.webp',
+ suffix: type === 'video' ? '.mp4,.webm,.ogg' : '.jpg,.png,.gif,.pjp,.pjpeg,.jpeg,.jfif,.webp,.ico',
maxfile: 1,
fileType: type === 'video' ? 'text' : 'picture'
}} onChange={this.changeFile} />
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index a253fea..d1c5585 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -65,7 +65,7 @@
}
onCloseDrawer = () => {
- let { card } = this.state
+ let card = fromJS(this.state.card).toJS()
let check = false
if (card.borderWidth === '0px') {
@@ -78,15 +78,15 @@
check = true
} else if (card.borderRightWidth === '0px') {
delete card.borderRightWidth
- delete card.borderRightWidth
+ delete card.borderRightColor
check = true
} else if (card.borderTopWidth === '0px') {
delete card.borderTopWidth
- delete card.borderTopWidth
+ delete card.borderTopColor
check = true
} else if (card.borderBottomWidth === '0px') {
delete card.borderBottomWidth
- delete card.borderBottomWidth
+ delete card.borderBottomColor
check = true
}
@@ -516,6 +516,8 @@
<Option value="100%">100%</Option>
<Option value="100% 100%">100% 100%</Option>
<Option value="auto 100%">auto 100%</Option>
+ <Option value="100% auto">100% auto</Option>
+ <Option value="auto">auto</Option>
<Option value="contain">contain</Option>
<Option value="cover">cover</Option>
</Select>
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 7447e32..bf36729 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -78,7 +78,7 @@
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
<div style={{textAlign: 'left', position: 'relative', height, lineHeight: 1.5}}>
- {card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>璇疯緭鍏�</span> }
+ {card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span> }
{card.count === 'true' ? <span style={{position: 'absolute', right: 0, bottom: 0}}>0/{card.fieldlength}</span> : null}
</div>
</div>
diff --git a/src/mob/components/menubar/normal-menubar/index.jsx b/src/mob/components/menubar/normal-menubar/index.jsx
index 982740a..89ed8ff 100644
--- a/src/mob/components/menubar/normal-menubar/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/index.jsx
@@ -125,6 +125,11 @@
card.subMenus = card.subMenus.map(item => {
if (item.uuid === cell.uuid) return cell
+ if (cell.oriuuid && item.uuid === cell.oriuuid) {
+ delete cell.oriuuid
+
+ return cell
+ }
return item
})
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 34bf6db..9c68e58 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -104,6 +104,7 @@
confirm({
content: '鑿滃崟灞炴�х敱鈥滆彍鍗曗�濆垏鎹㈣嚦鍏朵粬绫诲瀷鏃讹紝鑿滃崟灏嗚閲嶇疆锛屽嵆瑙ｉ櫎涔嬪墠鑿滃崟鐨勭粦瀹氬叧绯伙紝纭畾淇敼鍚楋紵',
onOk() {
+ _card.oriuuid = _card.uuid
_card.uuid = Utils.getuuid()
_this.setState({ visible: false, card: _card })
_this.props.updateElement(_card)
diff --git a/src/mob/components/tabs/antv-tabs/index.jsx b/src/mob/components/tabs/antv-tabs/index.jsx
index d5e2437..5ecb338 100644
--- a/src/mob/components/tabs/antv-tabs/index.jsx
+++ b/src/mob/components/tabs/antv-tabs/index.jsx
@@ -59,6 +59,11 @@
{ uuid: Utils.getuuid(), parentId: tabs.uuid, floor: tabs.floor, label: 'Tab 3', icon: '', components: [] }
]
}
+
+ if (this.state.appType === 'mob') {
+ _tabs.setting.display = 'flex'
+ }
+
this.setState({
tabs: _tabs
})
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index 4ea00c0..fc1a5b4 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -80,7 +80,7 @@
func: 's_get_kei'
}
- Api.getCloudConfig(param).then(result => {
+ Api.getSystemConfig(param).then(result => {
if (result.status) {
let applist = result.data.map(item => {
item.sublist = item.data_detail || []
@@ -709,7 +709,7 @@
this.setState({loadingAppTree: true})
- Api.getCloudConfig(param).then(result => {
+ Api.getSystemConfig(param).then(result => {
if (result.status) {
if (!result.data || result.data.length === 0) {
this.setState({loadingAppTree: false, appTrees: [], appInitCheckKeys: null, appCheckedKeys: [], appOpenKeys: [], selectAppTrees: [], selectAppOpenKeys: []})
diff --git a/src/tabviews/zshare/mutilform/mkInput/index.jsx b/src/tabviews/zshare/mutilform/mkInput/index.jsx
index 9b090dd..a9281ab 100644
--- a/src/tabviews/zshare/mutilform/mkInput/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkInput/index.jsx
@@ -77,7 +77,7 @@
const { config } = this.props
const { value } = this.state
- return <Input ref={this.inputRef} placeholder="" value={value} autoComplete="off" disabled={config.readonly} onChange={this.handleChange} onPressEnter={this.handleInputSubmit} />
+ return <Input ref={this.inputRef} placeholder={config.placeholder || ''} value={value} autoComplete="off" disabled={config.readonly} onChange={this.handleChange} onPressEnter={this.handleInputSubmit} />
}
}
diff --git a/src/tabviews/zshare/mutilform/mkTextArea/index.jsx b/src/tabviews/zshare/mutilform/mkTextArea/index.jsx
index 531aa49..ef57945 100644
--- a/src/tabviews/zshare/mutilform/mkTextArea/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkTextArea/index.jsx
@@ -84,7 +84,7 @@
const { value } = this.state
return (
- <TextArea ref={this.inputRef} value={value} autoSize={{ minRows: 2, maxRows: config.maxRows || 6 }} onChange={this.onChange} disabled={config.readonly} />
+ <TextArea ref={this.inputRef} placeholder={config.placeholder || ''} value={value} autoSize={{ minRows: 2, maxRows: config.maxRows || 6 }} onChange={this.onChange} disabled={config.readonly} />
)
}
}
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index f5ad414..4337686 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -65,7 +65,7 @@
let formItem = null
if (card.type === 'text') {
- formItem = (<Input style={{marginTop: '4px'}} value={card.initval} />)
+ formItem = (<Input style={{marginTop: '4px'}} placeholder={card.placeholder || ''} value={card.initval} />)
} else if (card.type === 'number') {
formItem = (<InputNumber value={card.initval} precision={card.decimal} />)
} else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
@@ -79,7 +79,7 @@
} else if (card.type === 'datetime') {
formItem = (<DatePicker showTime value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
} else if (card.type === 'textarea') {
- formItem = (<TextArea value={card.initval} autoSize={{ minRows: 2, maxRows: 6 }} />)
+ formItem = (<TextArea value={card.initval} placeholder={card.placeholder || ''} autoSize={{ minRows: 2, maxRows: 6 }} />)
} else if (card.type === 'brafteditor') {
formItem = (<Editor />)
} else if (card.type === 'fileupload') {
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 42a28d2..54f99eb 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2941,6 +2941,14 @@
},
{
type: 'text',
+ key: 'placeholder',
+ label: '鎻愮ず淇℃伅',
+ tooltip: '瀛楁棰勬湡鍊肩殑鎻愮ず淇℃伅銆�',
+ initVal: card.placeholder || '',
+ required: false
+ },
+ {
+ type: 'text',
key: 'emptyText',
label: '绌哄�兼枃鏈�',
tooltip: '绌哄�肩殑鎻愮ず鏂囨湰锛岄�夋嫨璁剧疆绌哄�兼椂鏈夋晥锛岄粯璁ゅ�间负銆婄┖銆嬨��',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index a8bb337..c9b59d6 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -16,7 +16,7 @@
const DataTable = asyncComponent(() => import('./datatable'))
const modalTypeOptions = {
- text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline'],
+ text: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'regular', 'interception', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'scan', 'splitline', 'placeholder'],
number: ['initval', 'readonly', 'hidden', 'decimal', 'min', 'max', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'enter', 'cursor', 'splitline'],
select: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline'],
checkbox: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'arrange'],
@@ -29,7 +29,7 @@
date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline'],
datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'splitline'],
datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline'],
- textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count'],
+ textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count', 'placeholder'],
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra'],
hint: ['label', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline'],
split: ['label', 'type'],
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 058d369..e79cd52 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -372,6 +372,13 @@
})
}
})
+ } else if (item.type === 'balcony') {
+ if (item.elements) {
+ item.elements = item.elements.map(cell => {
+ cell.uuid = this.getuuid()
+ return cell
+ })
+ }
} else if (item.type === 'table' && item.subtype === 'normaltable' && item.cols) {
let loopCol = (col) => {
col.subcols = col.subcols.map(c => {
@@ -426,7 +433,24 @@
return cell
})
}
- if (item.search) {
+ if (item.type === 'topbar') {
+ if (item.search && item.search.fields) {
+ item.search.fields = item.search.fields.map(cell => {
+ cell.uuid = this.getuuid()
+ return cell
+ })
+ }
+ if (item.search && item.search.groups) {
+ item.search.groups = item.search.groups.map(cell => {
+ cell.uuid = this.getuuid()
+ cell.fields = cell.fields.map(m => {
+ m.uuid = this.getuuid()
+ return m
+ })
+ return cell
+ })
+ }
+ } else if (item.search) {
item.search = item.search.map(cell => {
cell.uuid = this.getuuid()
return cell
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index c238f65..a6df4f1 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -1057,7 +1057,7 @@
<Col span={12}>
<div className="app-item">
<div className="label">缃戠珯鍥炬爣:</div>
- <div className="content">{item.favicon ? <img style={{width: '30px', height: '30px'}} src={item.favicon} alt="" /> : '鏃�'}</div>
+ <div className="content">{item.favicon ? <img style={{width: '18px', height: '18px'}} src={item.favicon} alt="" /> : '鏃�'}</div>
</div>
</Col>
</Row>
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 137c862..3d1a936 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -5,7 +5,7 @@
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
-const FileUpload = asyncComponent(() => import('@/tabviews/zshare/fileupload'))
+const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
class MainSearch extends Component {
static propTpyes = {
@@ -73,12 +73,6 @@
xs: { span: 24 },
sm: { span: 16 }
}
- }
-
- let file = ''
-
- if (type === 'edit' && card && card.favicon) {
- file = card.favicon
}
return (
@@ -202,13 +196,10 @@
<Col span={12}>
<Form.Item label="鍥炬爣">
{getFieldDecorator('favicon', {
- initialValue: file
- })(<FileUpload config={{
- initval: file,
- suffix: '.jpg,.png,.gif,.pjp,.pjpeg,.jpeg,.jfif,.webp,.ico',
- maxfile: 1,
- fileType: 'text'
- }}/>)}
+ initialValue: card ? card.favicon : ''
+ })(
+ <SourceComponent type="picture" placement="right"/>
+ )}
</Form.Item>
</Col>
</Row>
diff --git a/src/views/appmanage/submutilform/index.scss b/src/views/appmanage/submutilform/index.scss
index b2364d9..f6ceb5b 100644
--- a/src/views/appmanage/submutilform/index.scss
+++ b/src/views/appmanage/submutilform/index.scss
@@ -5,4 +5,12 @@
color: #c49f47;
margin-right: 3px;
}
+ .mk-source-wrap {
+ .ant-radio-button-wrapper:last-child {
+ display: none;
+ }
+ .ant-radio-button-wrapper:not(:first-child) {
+ border-radius: 0 4px 4px 0;
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0