From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/templates/sharecomponent/columncomponent/index.jsx | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 63a0a8d..2648a81 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Tooltip, Modal, notification, Switch, message } from 'antd'
+import { Tooltip, Modal, notification, Switch, message } from 'antd'
+import { QuestionCircleOutlined, CopyOutlined } from '@ant-design/icons'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -468,11 +469,18 @@
})
}
+ revert = () => {
+ this.setState({
+ columnlist: fromJS(this.props.config.columns).toJS()
+ })
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
}
componentDidMount () {
+ MKEmitter.addListener('revert', this.revert)
MKEmitter.addListener('plusColumns', this.plusColumns)
}
@@ -483,6 +491,7 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('revert', this.revert)
MKEmitter.removeListener('plusColumns', this.plusColumns)
}
@@ -492,11 +501,11 @@
return (
<div className="model-table-column-list">
- <Tooltip placement="bottomLeft" overlayClassName="middle" title={dict['model.tooltip.column.guide']}>
- <Icon type="question-circle" />
+ <Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃樉绀哄垪銆嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬樉绀哄垪鎷栬嚦姝ゅ娣诲姞锛涙垨鐐瑰嚮銆婃坊鍔犳樉绀哄垪銆嬫寜閽壒閲忔坊鍔狅紝閫夋嫨鎵归噺娣诲姞鏃讹紝闇�鎻愬墠閫夋嫨浣跨敤琛ㄣ�傛敞锛氭坊鍔犲悎骞跺垪鏃讹紝闇�璁剧疆鍙�夊垪銆�">
+ <QuestionCircleOutlined style={{color: '#c49f47', position: 'relative', left: '-15px', top: '5px'}} />
</Tooltip>
{columnlist && columnlist.length > 0 ?
- <Icon className="column-copy" title="copy" type="copy" onClick={this.copycolumn} /> : null
+ <CopyOutlined className="column-copy" title="copy" onClick={this.copycolumn} /> : null
}
<Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={this.onFieldChange} />
<DragElement
@@ -509,11 +518,10 @@
markMenu={this.markElement}
handleGridBtn={this.handleGridBtn}
showfield={this.state.showField}
- placeholder={this.state.dict['header.form.column.placeholder']}
/>
{/* 鏄剧ず鍒楃紪杈� */}
<Modal
- title={dict['header.modal.column.edit']}
+ title="鏄剧ず鍒�-缂栬緫"
visible={modaltype === 'columns'}
width={800}
maskClosable={false}
@@ -550,7 +558,7 @@
</Modal>
{/* 鎿嶄綔鍒楃紪杈� */}
<Modal
- title={dict['header.modal.gridbtn.edit']}
+ title="鎿嶄綔鍒�-缂栬緫"
visible={modaltype === 'gridbtn'}
width={800}
maskClosable={false}
--
Gitblit v1.8.0