From 4190affb665438b1067af88f09e8557abbbfea2b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 04 十一月 2021 00:03:46 +0800
Subject: [PATCH] 2021-11-04
---
src/templates/zshare/modalform/index.jsx | 4 +-
src/mob/components/formdragelement/index.scss | 5 ++
src/mob/modalconfig/index.jsx | 1
src/templates/modalconfig/settingform/index.jsx | 4 +-
src/templates/zshare/formconfig.jsx | 66 ++++++++++++++++++++++++++++++++
src/mob/modalconfig/source.jsx | 2
src/tabviews/zshare/mutilform/mkDatePicker/index.jsx | 22 ++++++++++-
7 files changed, 95 insertions(+), 9 deletions(-)
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index 26bc526..b8673a5 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -50,6 +50,7 @@
font-size: 16px;
flex: 1 1;
text-align: right;
+ padding-right: 15px;
}
.am-input-control.left {
text-align: left;
@@ -78,7 +79,9 @@
line-height: 24px;
}
.am-list-extra {
- display: none;
+ position: absolute;
+ top: 30px;
+ right: 10px;
}
}
}
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index bb1cd4f..7d7fdb4 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -91,6 +91,7 @@
let _config = fromJS(this.state.config).toJS()
if (list.length > _config.fields.length) {
+ _config.fields = list
this.setState({
config: _config
}, () => {
diff --git a/src/mob/modalconfig/source.jsx b/src/mob/modalconfig/source.jsx
index 3fed414..8d2248d 100644
--- a/src/mob/modalconfig/source.jsx
+++ b/src/mob/modalconfig/source.jsx
@@ -18,7 +18,7 @@
},
{
type: 'form',
- label: CommonDict['model.form.select'],
+ label: '閫夋嫨鍣�',
subType: 'select',
url: ''
},
diff --git a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
index 3d4377b..b2acd83 100644
--- a/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkDatePicker/index.jsx
@@ -31,6 +31,8 @@
this.state = {
value,
+ minDate: config.minDate ? moment().add(config.minDate, 'days').endOf('day') : '',
+ maxDate: config.maxDate ? moment().add(config.maxDate, 'days').endOf('day') : '',
mode,
format
}
@@ -52,16 +54,32 @@
this.props.onChange(val ? moment(val).format(format) : '')
}
+ disabledDate = (current) => {
+ const { minDate, maxDate } = this.state
+
+ if (!current || (!maxDate && !minDate)) {
+ return false
+ }
+
+ if (!maxDate) {
+ return current < minDate
+ } else if (!minDate) {
+ return current > maxDate
+ } else {
+ return current < minDate || current > maxDate
+ }
+ }
+
render() {
const { config } = this.props
const { value, mode } = this.state
if (mode === 'date') {
- return <DatePicker defaultValue={value} disabled={config.readonly} onChange={this.onChange}/>
+ return <DatePicker defaultValue={value} disabledDate={this.disabledDate} disabled={config.readonly} onChange={this.onChange}/>
} else if (mode === 'month') {
return <MonthPicker defaultValue={value} disabled={config.readonly} onChange={this.onChange}/>
} else if (mode === 'datetime') {
- return <DatePicker defaultValue={value} showTime disabled={config.readonly} onChange={this.onChange}/>
+ return <DatePicker defaultValue={value} disabledDate={this.disabledDate} showTime disabled={config.readonly} onChange={this.onChange}/>
}
}
}
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 825f602..d66751a 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -180,7 +180,7 @@
)}
</Form.Item>
</Col>
- <Col span={12}>
+ {appType !== 'mob' ? <Col span={12}>
<Form.Item label="鐐瑰嚮绌虹櫧澶�">
{getFieldDecorator('clickouter', {
initialValue: config.setting.clickouter || 'unclose'
@@ -191,7 +191,7 @@
</Radio.Group>
)}
</Form.Item>
- </Col>
+ </Col> : null}
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="闇�瑕侀�氳繃鏁版嵁婧愭煡璇㈢殑閫夐」锛屾槸鍚︿娇鐢ㄧ紦瀛樸��">
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index fbcc7db..fbc0a97 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2615,6 +2615,70 @@
required: false
},
{
+ type: 'select',
+ key: 'minDate',
+ label: '鏈�灏忓��',
+ initVal: card.minDate || '',
+ required: false,
+ options: [{
+ value: '',
+ text: '鏃�'
+ }, {
+ value: '0',
+ text: '褰撳ぉ'
+ }, {
+ value: '-1',
+ text: '鍓嶄竴澶�'
+ }, {
+ value: '-2',
+ text: '鍓嶄袱澶�'
+ }, {
+ value: '-3',
+ text: '鍓嶄笁澶�'
+ }, {
+ value: '-7',
+ text: '鍓嶄竷澶�'
+ }, {
+ value: '-30',
+ text: '鍓�30澶�'
+ }, {
+ value: '-90',
+ text: '鍓�90澶�'
+ }]
+ },
+ {
+ type: 'select',
+ key: 'maxDate',
+ label: '鏈�澶у��',
+ initVal: card.maxDate || '',
+ required: false,
+ options: [{
+ value: '',
+ text: '鏃�'
+ }, {
+ value: '0',
+ text: '褰撳ぉ'
+ }, {
+ value: '1',
+ text: '鍚庝竴澶�'
+ }, {
+ value: '2',
+ text: '鍚庝袱澶�'
+ }, {
+ value: '3',
+ text: '鍚庝笁澶�'
+ }, {
+ value: '7',
+ text: '鍚庝竷澶�'
+ }, {
+ value: '30',
+ text: '鍚�30澶�'
+ }, {
+ value: '90',
+ text: '鍚�90澶�'
+ }]
+ },
+ {
type: 'number',
key: 'fieldlength',
min: 1,
@@ -3007,7 +3071,7 @@
key: 'place',
label: '鎺掑垪',
initVal: card.place || 'left_right',
- tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇�傛敞锛氫笂涓嬫帓鍒楁槸浼氱鐢ㄦ壂鐮佸姛鑳姐��',
+ tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇��',
forbid: appType !== 'mob',
options: [{
value: 'left_right',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 8ce224c..ab6eb9b 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -26,9 +26,9 @@
link: ['initval', 'readonly', 'required', 'hidden', 'readin', 'resourceType', 'setAll', 'linkField', 'linkSubField', 'span', 'labelwidth', 'tooltip', 'extra', 'emptyText', 'enter', 'splitline', 'dropdown', 'marginTop', 'marginBottom'],
fileupload: ['readonly', 'required', 'readin', 'fieldlength', 'maxfile', 'fileType', 'span', 'labelwidth', 'tooltip', 'extra', 'compress', 'splitline', 'marginTop', 'marginBottom'],
switch: ['initval', 'openVal', 'closeVal', 'openText', 'closeText', 'readonly', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'splitline', 'marginTop', 'marginBottom'],
- date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom'],
+ date: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate'],
datemonth: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'splitline', 'marginTop', 'marginBottom'],
- datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom'],
+ datetime: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'declareType', 'mode', 'splitline', 'marginTop', 'marginBottom', 'minDate', 'maxDate'],
textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count', 'placeholder', 'marginTop', 'marginBottom'],
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom'],
hint: ['label', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
--
Gitblit v1.8.0