From 1a11f7115e61c548f9ffc77d0a9e504307ca71b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 八月 2021 18:37:20 +0800
Subject: [PATCH] 2021-08-24
---
src/menu/components/table/normal-table/index.jsx | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index ac84f2b..f7b5e07 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'
@@ -19,6 +18,7 @@
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
+const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const ColumnComponent = asyncComponent(() => import('./columns'))
@@ -34,7 +34,8 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null,
back: false
}
@@ -53,21 +54,21 @@
pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
- width: 24,
+ width: card.width || 24,
search: [
{ origin: true, uuid: Utils.getuuid(), label: 'label', type: 'text', match: 'like' },
{ origin: true, uuid: Utils.getuuid(), label: 'label', type: 'select', match: 'equal' },
{ 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,
setting: { interType: 'system' },
- wrap: { name: card.name, width: 24, bordered: 'true', tableType: 'checkbox' },
+ wrap: { name: card.name, width: card.width || 24, bordered: 'true', tableType: 'checkbox' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -78,6 +79,48 @@
],
scripts: [],
btnlog: [],
+ }
+
+ if (card.config) {
+ let config = fromJS(card.config).toJS()
+
+ _card.wrap = config.wrap
+ _card.wrap.name = card.name
+ _card.style = config.style
+ _card.headerStyle = config.headerStyle
+
+ let oriUids = {}
+ _card.action = config.action.map(item => {
+ let _uuid = Utils.getuuid()
+ oriUids[item.uuid] = _uuid
+ item.uuid = _uuid
+ return item
+ })
+ _card.search = config.search.map(item => {
+ item.uuid = Utils.getuuid()
+ return item
+ })
+ _card.cols = config.cols.map(col => {
+ col.uuid = Utils.getuuid()
+ if (col.type === 'colspan' && col.subcols) {
+ col = this.loopCol(col)
+ } else if (col.type === 'custom' && col.elements) {
+ col.elements = col.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ } else if (col.type === 'action' && col.elements) {
+ col.elements = col.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ }
+ return col
+ })
+
+ if (_card.wrap.doubleClick) {
+ _card.wrap.doubleClick = oriUids[_card.wrap.doubleClick] || ''
+ }
}
this.setState({
@@ -98,7 +141,7 @@
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -111,6 +154,23 @@
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
MKEmitter.removeListener('logButton', this.logButton)
+ }
+
+ loopCol = (col) => {
+ col.subcols = col.subcols.map(c => {
+ c.uuid = Utils.getuuid()
+ if (c.type === 'colspan' && c.subcols) {
+ c = this.loopCol(c)
+ } else if (c.type === 'custom' && c.elements) {
+ c.elements = c.elements.map(cell => {
+ cell.uuid = Utils.getuuid()
+ return cell
+ })
+ }
+ return c
+ })
+
+ return col
}
/**
@@ -161,7 +221,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
}
getStyle = (comIds, style) => {
@@ -219,10 +279,9 @@
newcard.interface = card.setting.interface || ''
newcard.execSuccess = 'grid'
newcard.execError = 'never'
- newcard.errorTime = 10
newcard.verify = null
newcard.show = 'button'
- newcard.btnstyle = {marginRight: '15px'}
+ newcard.style = {marginRight: '15px'}
// 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
MKEmitter.emit('addButton', card.uuid, newcard)
@@ -239,13 +298,13 @@
}
setSubConfig = (item) => {
- const { card } = this.state
+ const { card, appType } = 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' },
+ setting: { title: btn.label, width: appType === 'mob' ? 100 : 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
tables: [],
groups: [],
fields: []
@@ -326,21 +385,23 @@
}
render() {
- const { card } = this.state
+ const { card, appType } = 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">
<Icon className="plus" title="娣诲姞鍒�" onClick={this.addColumns} type="plus" />
- <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" />
+ {appType !== 'mob' ? <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" /> : null}
<Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
<WrapComponent config={card} updateConfig={this.updateComponent} />
<CopyComponent type="normaltable" card={card}/>
- <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
+ <PasteComponent config={card} options={['action', 'search', 'form', 'cols']} updateConfig={this.updateComponent} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
+ <UserComponent config={card}/>
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
@@ -355,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