From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index a2fd460..bcb6274 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -51,9 +51,8 @@
<span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'columns', 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
<span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'columns', 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
<Popconfirm
- title={this.props.dict['header.form.query.delete']}
- okText={this.props.dict['model.confirm']}
- cancelText={this.props.dict['model.cancel']}
+ overlayClassName="popover-confirm"
+ title={this.props.dict['model.query.delete']}
onConfirm={() => this.handleDelete(record, 'columns')
}>
<span style={{color: '#ff4d4f', cursor: 'pointer'}}><Icon type="delete" /></span>
@@ -89,12 +88,12 @@
})
}
- if (card.intertype !== 'inner' || card.innerFunc) {
+ if (card.intertype !== 'system') {
_verify.enable = 'false'
}
let defaultscript = ''
- if (!_verify.script && card.intertype === 'inner' && !card.innerFunc) {
+ if (!_verify.script && card.intertype === 'system') {
let search = this.formatSearch(config.search)
search = Utils.joinMainSearchkey(search)
search = search ? 'where ' + search : ''
@@ -352,7 +351,7 @@
param.LText = param.LText.replace(/@\$|\$@/ig, '')
param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
Api.getLocalConfig(param).then(res => {
@@ -416,8 +415,6 @@
confirm({
content: `纭畾娓呯┖Excel鍒楀悧锛焋,
- okText: this.props.dict['model.confirm'],
- cancelText: this.props.dict['model.cancel'],
onOk() {
_this.setState({
verify: {
@@ -474,7 +471,7 @@
pagination={false}
/>
</TabPane>
- {card.intertype === 'inner' && !card.innerFunc ? <TabPane tab={
+ {card.intertype === 'system' ? <TabPane tab={
<span>
鑷畾涔夎剼鏈�
{verify.enable === 'true' ? <span className="count-tip">1</span> : null}
--
Gitblit v1.8.0