From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/menu/components/table/normal-table/index.jsx | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index d6989a2..83f0adb 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -1,12 +1,11 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import { Icon, Popover, Modal, notification } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
@@ -35,7 +34,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
@@ -61,9 +60,9 @@
{ origin: true, uuid: Utils.getuuid(), label: 'label', type: 'date', match: 'greater' }
],
action: [
- { origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', icon: 'plus', class: 'green', btnstyle: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
- { origin: true, uuid: Utils.getuuid(), label: '淇敼', intertype: 'system', OpenType: 'pop', icon: 'form', class: 'purple', btnstyle: {color: 'rgb(255, 255, 255)', background: 'rgb(142, 68, 173)', marginRight: '15px'} },
- { origin: true, uuid: Utils.getuuid(), label: '鍒犻櫎', intertype: 'system', OpenType: 'prompt', icon: 'delete', class: 'danger', btnstyle: {color: 'rgb(255, 255, 255)', background: 'rgb(255, 77, 79)', marginRight: '15px'} }
+ { origin: true, uuid: Utils.getuuid(), label: '娣诲姞', intertype: 'system', OpenType: 'pop', icon: 'plus', class: 'green', style: {color: 'rgb(255, 255, 255)', background: 'rgb(38, 194, 129)', marginRight: '15px'} },
+ { origin: true, uuid: Utils.getuuid(), label: '淇敼', intertype: 'system', OpenType: 'pop', icon: 'form', class: 'purple', style: {color: 'rgb(255, 255, 255)', background: 'rgb(142, 68, 173)', marginRight: '15px'} },
+ { origin: true, uuid: Utils.getuuid(), label: '鍒犻櫎', intertype: 'system', OpenType: 'prompt', icon: 'delete', class: 'danger', style: {color: 'rgb(255, 255, 255)', background: 'rgb(255, 77, 79)', marginRight: '15px'} }
],
name: card.name,
subtype: card.subtype,
@@ -89,8 +88,11 @@
_card.style = config.style
_card.headerStyle = config.headerStyle
+ let oriUids = {}
_card.action = config.action.map(item => {
- item.uuid = Utils.getuuid()
+ let _uuid = Utils.getuuid()
+ oriUids[item.uuid] = _uuid
+ item.uuid = _uuid
return item
})
_card.search = config.search.map(item => {
@@ -114,6 +116,10 @@
}
return col
})
+
+ if (_card.wrap.doubleClick) {
+ _card.wrap.doubleClick = oriUids[_card.wrap.doubleClick] || ''
+ }
}
this.setState({
@@ -134,7 +140,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -275,7 +281,7 @@
newcard.errorTime = 10
newcard.verify = null
newcard.show = 'button'
- newcard.btnstyle = {marginRight: '15px'}
+ newcard.style = {marginRight: '15px'}
// 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
MKEmitter.emit('addButton', card.uuid, newcard)
@@ -295,7 +301,7 @@
const { card } = this.state
let btn = fromJS(item).toJS()
- if (btn.OpenType === 'pop') {
+ if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
if (!btn.modal) {
btn.modal = {
setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
@@ -380,9 +386,10 @@
render() {
const { card } = this.state
+ let _style = resetStyle(card.style)
return (
- <div className="menu-normal-table-edit-box" style={{...card.style, height: card.wrap.height}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-normal-table-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<NormalHeader defaultshow="hidden" hideSearch="true" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
@@ -409,14 +416,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TableCardEditComponent)
\ No newline at end of file
+export default TableCardEditComponent
\ No newline at end of file
--
Gitblit v1.8.0