From eb4df4321be0aa5f97732ae5523f14d34b50ccf4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 三月 2022 22:59:55 +0800
Subject: [PATCH] 2022-03-04
---
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 1 -
src/templates/zshare/modalform/index.jsx | 2 +-
src/templates/zshare/formconfig.jsx | 16 ++++++++++++++++
src/tabviews/custom/components/table/edit-table/index.scss | 10 ++++++++++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 23 +++++++++++++++++------
5 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.scss b/src/tabviews/custom/components/table/edit-table/index.scss
index 0519a10..3a12a2b 100644
--- a/src/tabviews/custom/components/table/edit-table/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/index.scss
@@ -51,6 +51,16 @@
background-color: #1890ff;
border-width: 0;
}
+
+ .submit-footer-table {
+ float: right;
+ height: 24px;
+ color: #ffffff;
+ background-color: #1890ff;
+ border-width: 0;
+ margin-top: 10px;
+ }
+
.custom-control {
position: absolute;
z-index: 1;
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 7063ebe..6598db5 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1831,7 +1831,7 @@
}
pickupChange = () => {
- const { submit, MenuID } = this.props
+ const { submit, MenuID, setting } = this.props
const { data } = this.state
let pickup = !this.state.pickup
@@ -1845,7 +1845,7 @@
return
}
- if (!pickup && !is(fromJS(data), fromJS(this.state.edData))) {
+ if (!pickup && this.state.edData.filter(item => !item.$origin).length > 0) {
const _this = this
confirm({
title: '鏁版嵁宸蹭慨鏀癸紝纭畾鏀惧純淇濆瓨鍚楋紵',
@@ -1866,18 +1866,28 @@
} else {
pickup && MKEmitter.emit('resetSelectLine', MenuID, '', '')
pickup && this.props.chgSelectData([])
+ let keys = this.state.selectedRowKeys
this.setState({
data: [],
edData: [],
+ selectedRowKeys: [],
pickup,
loading: false,
editable: false
}, () => {
- this.setState({
- data: data,
- edData: pickup ? fromJS(data).toJS() : []
- })
+ if (pickup && setting.tableType === 'checkbox' && keys.length > 0) {
+ this.setState({
+ data: data,
+ edData: fromJS(data).toJS().filter(item => keys.includes(item.$$uuid))
+ })
+ } else {
+ this.setState({
+ data: data,
+ edData: pickup ? fromJS(data).toJS() : []
+ })
+ }
})
+
}
this.props.changeLock(pickup)
}
@@ -1960,6 +1970,7 @@
/>
{_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
{pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
+ {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
</div>
)
}
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 9ab832e..05967cd 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -271,7 +271,6 @@
padding-left: 10px;
}
.mk-add-line {
- display: block;
width: 100px;
color: #26C281;
border-radius: 0;
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index b714e61..79ae31d 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3273,6 +3273,22 @@
forbid: appType === 'mob'
},
{
+ type: 'radio',
+ key: 'enterReplace',
+ label: '鍥炶溅绗︽浛鎹�',
+ tooltip: '鍥炶溅绗︿細鏇挎崲涓鸿嫳鏂囬�楀彿銆�',
+ initVal: card.enterReplace || 'false',
+ required: false,
+ forbid: appType !== 'mob',
+ options: [{
+ value: 'false',
+ text: '鍚�'
+ }, {
+ value: 'true',
+ text: '鏄�'
+ }]
+ },
+ {
type: 'text',
key: 'placeholder',
label: '鎻愮ず淇℃伅',
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index acfb617..d014ae8 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -32,7 +32,7 @@
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', 'minDate', 'maxDate'],
- textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count', 'placeholder', 'marginTop', 'marginBottom'],
+ textarea: ['initval', 'readonly', 'required', 'hidden', 'readin', 'fieldlength', 'span', 'labelwidth', 'maxRows', 'encryption', 'interception', 'tooltip', 'extra', 'count', 'placeholder', 'marginTop', 'marginBottom', 'enterReplace'],
color: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'tooltip', 'extra', 'marginTop', 'marginBottom'],
rate: ['initval', 'readonly', 'required', 'hidden', 'readin', 'span', 'labelwidth', 'splitline', 'tooltip', 'extra', 'marginTop', 'marginBottom', 'allowHalf', 'rateCount', 'character', 'place'],
hint: ['label', 'type', 'blacklist', 'message', 'span', 'labelwidth', 'splitline', 'marginTop', 'marginBottom'],
--
Gitblit v1.8.0