From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/index.jsx | 422 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 282 insertions(+), 140 deletions(-)
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index d6c9c0c..5cadab2 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -1,27 +1,27 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal } from 'antd'
+import { Popover, message } from 'antd'
+import { PlusOutlined, PlusCircleOutlined, PlusSquareOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
+import getWrapForm from './options'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const SearchComponent = asyncComponent(() => import('@/templates/sharecomponent/searchcomponent'))
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 PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
+const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
const ColumnComponent = asyncComponent(() => import('./columns'))
-const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
-
-const { confirm } = Modal
class TableCardEditComponent extends Component {
static propTpyes = {
@@ -31,70 +31,72 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null,
back: false
}
UNSAFE_componentWillMount () {
const { card } = this.props
+ const { appType } = this.state
if (card.isNew) {
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
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' }
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text', match: 'like' },
+ { origin: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'select', match: '=' }
],
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', execSuccess: 'grid', 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', execSuccess: 'grid', 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', execSuccess: 'grid', Ot: 'required', 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', show: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
- { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'true', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label2', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
+ { origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label3', field: '', Hide: 'false', IsSort: 'false', type: 'text', Width: 120 },
],
scripts: [],
- btnlog: [],
+ isNew: true
}
-
+
+ if (appType === 'mob') {
+ _card.search = []
+ _card.action = _card.action.filter(a => !a.origin)
+ }
+
+ this.updateComponent(_card)
+ } else {
+ let _card = fromJS(card).toJS()
+ if (appType === 'mob') {
+ _card.search = []
+ }
this.setState({
card: _card
- })
- this.props.updateConfig(_card)
- } else {
- this.setState({
- card: fromJS(card).toJS()
})
}
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('submitModal', this.handleSave)
+ MKEmitter.addListener('completeSave', this.completeSave)
+ MKEmitter.addListener('addColumns', this.addColumns)
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -104,81 +106,138 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
- MKEmitter.removeListener('submitModal', this.handleSave)
+ MKEmitter.removeListener('completeSave', this.completeSave)
+ MKEmitter.removeListener('addColumns', this.addColumns)
+ }
+
+ completeSave = () => {
+ const { card } = this.state
+
+ if (card.isNew) {
+ let item = fromJS(card).toJS()
+ item.search = item.search.filter(a => !a.origin)
+ item.action = item.action.filter(a => !a.origin)
+ item.cols = item.cols.filter(a => !a.origin)
+
+ delete item.isNew
+
+ this.setState({card: null}, () => {
+ this.setState({card: item})
+ })
+ }
+ }
+
+ 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
}
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+
+ if (!window.GLOB.styling || !card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
+ card.$c_ds = true
+ card.$c_ac = true
+ card.$c_cl = true
+
+ card.errors = checkComponent(card)
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
+ delete card.$c_ds
+ delete card.$c_ac
+ delete card.$c_cl
+ }
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
+ let _card = card.isNew ? fromJS(card).toJS() : card
+ if (_card.isNew) {
+ _card.cols = _card.cols.filter(a => !a.origin)
+ _card.search = _card.search.filter(a => !a.origin)
+ _card.action = _card.action.filter(a => !a.origin)
- this.props.updateConfig(component)
- }
-
-
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- deleteCard = () => {
- let card = fromJS(this.state.card).toJS()
- let _this = this
-
- confirm({
- content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
- onOk() {
- _this.setState({card})
- _this.props.updateConfig(card)
- },
- onCancel() {}
- })
+ delete _card.isNew
+ }
+
+ this.props.updateConfig(_card)
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ let style = {...card.style}
+ style.color = card.wrap.color || 'rgba(0, 0, 0, 0.65)'
+ style.fontSize = card.wrap.fontSize || 14
+ style.fontWeight = card.wrap.fontWeight || 'normal'
+
+ MKEmitter.emit('changeStyle', ['font1', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], style, this.getStyle)
}
- getStyle = (comIds, style) => {
+ getStyle = (style) => {
const { card } = this.state
- if (comIds[0] !== card.uuid) return
+ let _card = fromJS(card).toJS()
+ let _style = fromJS(style).toJS()
- let _card = {}
- if (comIds.length === 1) {
- _card = {...card, style}
- } else {
- return
- }
+ let color = style.color
+ let fontSize = style.fontSize
+ let fontWeight = style.fontWeight
- this.setState({
- card: _card
- })
-
- this.props.updateConfig(_card)
+ delete _style.color
+ delete _style.fontSize
+ delete _style.fontWeight
+
+ _card.style = _style
+ _card.wrap.color = color
+ _card.wrap.fontSize = fontSize
+ _card.wrap.fontWeight = fontWeight
+
+ this.updateComponent(_card)
}
- addColumns = () => {
- let card = fromJS(this.state.card).toJS()
+ addColumns = (id) => {
+ const { card } = this.state
- card.cols.push({ focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
+ if (id && id !== card.uuid) return
- this.setState({card})
+ let _card = fromJS(card).toJS()
+
+ _card.cols.push({ focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
+
+ this.setState({card: _card})
}
addSearch = () => {
- let card = fromJS(this.state.card).toJS()
+ const { card } = this.state
- card.search.push({uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '='})
+ let ratio = 6
- this.setState({card})
+ if (card.search.length) {
+ ratio = card.search[card.search.length - 1].ratio
+ }
+
+ MKEmitter.emit('plusSearch', card.uuid, {uuid: Utils.getuuid(), focus: true, label: 'label', type: 'text', match: '=', ratio}, 'simple')
}
addButton = () => {
@@ -201,106 +260,189 @@
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)
}
- /**
- * @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
- */
- updateconfig = (config) => {
- this.setState({
- card: config
- })
- this.props.updateConfig(config)
- }
+ setSubConfig = (item) => {
+ const { card, appType } = this.state
+ let btn = fromJS(item).toJS()
- setSubConfig = (btn) => {
- const { card } = this.state
-
- 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: 'tab',
- 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: []
}
}
MKEmitter.emit('changeModal', card, btn)
+ } else if (btn.OpenType === 'popview') {
+ MKEmitter.emit('changePopview', card, btn)
}
}
- handleSave = (_cards, btn, modal) => {
- let card = fromJS(this.state.card).toJS()
+ getWrapForms = () => {
+ const { card } = this.state
- if (card.uuid !== _cards.uuid) return
+ let _actions = []
- let _index = card.action.findIndex(cell => cell.uuid === btn.uuid)
+ card.cols.forEach(col => {
+ if (col.type === 'custom') {
+ col.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
- if (_index === -1) return
-
- card.action = card.action.map(cell => {
- if (cell.uuid === btn.uuid) {
- cell.modal = modal
+ _actions.push(cell)
+ })
}
-
- return cell
})
- this.setState({card})
- this.props.updateConfig(card)
+ return getWrapForm(card.wrap, _actions, card.columns, card.action, card.supNodes || [], card.uuid)
+ }
+
+ updateWrap = (res) => {
+ const { card } = this.state
+
+ res.color = card.wrap.color
+ res.fontSize = card.wrap.fontSize
+ res.fontWeight = card.wrap.fontWeight
+
+ res.show = card.wrap.show || 'true'
+ res.advanceType = card.wrap.advanceType || 'modal'
+ res.advanceWidth = card.wrap.advanceWidth || 1000
+ res.drawerPlacement = card.wrap.drawerPlacement || 'right'
+ res.searchRatio = card.wrap.searchRatio || 6
+ res.searchLwidth = card.wrap.searchLwidth !== undefined ? card.wrap.searchLwidth : 33.3
+ res.borderRadius = card.wrap.borderRadius || 0
+ res.resetContrl = card.wrap.resetContrl || 'init'
+
+ let _card = {...card, wrap: res}
+
+ if (res.supNodes) {
+ _card.supNodes = res.supNodes
+ _card.supNodes = _card.supNodes.map(item => {
+ item.componentId = item.nodes[item.nodes.length - 1]
+ return item
+ })
+
+ delete res.supNodes
+ } else {
+ delete _card.supNodes
+ }
+
+ this.updateComponent(_card)
+ }
+
+ updatecolumn = (config) => {
+ config.absFields = []
+ config.hasExtend = false
+ config.parCtrl = false
+ let mapCol = (cols) => {
+ cols.forEach(col => {
+ if (col.type === 'number') {
+ if (col.format === 'abs') {
+ config.absFields.push(col.field)
+ }
+ } else if (col.type === 'extend') {
+ config.hasExtend = true
+ if (col.supField) {
+ config.parCtrl = true
+ }
+ } else if (col.type === 'colspan' && col.subcols) {
+ mapCol(col.subcols)
+ }
+ })
+ }
+ mapCol(config.cols)
+
+ if (config.absFields.length) {
+ config.absFields = Array.from(new Set(config.absFields))
+ } else {
+ config.absFields = null
+ }
+
+ this.updateComponent(config)
+ }
+
+ clickComponent = (e) => {
+ if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
+ e.stopPropagation()
+ MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+ let _card = {...this.state.card}
+ _card.style = {..._card.style, ...style}
+
+ this.setState({ card: _card })
+ this.props.updateConfig(_card)
+ })
+ }
}
render() {
- const { card } = this.state
+ const { card, appType } = this.state
+
+ if (!card) return null
+
+ let options = ['action', 'search', 'form', 'cols']
+ let _style = resetStyle(card.style)
+
+ if (appType === 'mob') {
+ options = ['action', 'cols']
+ }
return (
- <div className="menu-normal-table-edit-box" style={{...card.style, height: card.wrap.height}}>
- <NormalHeader defaultshow="hidden" hideSearch="true" config={card} updateComponent={this.updateComponent}/>
+ <div className="menu-normal-table-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
+ <NormalHeader 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" />
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <PlusOutlined className="plus" title="娣诲姞鍒�" onClick={() => this.addColumns()}/>
+ {appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/>
+ <NormalForm title="琛ㄦ牸璁剧疆" width={850} update={this.updateWrap} getForms={this.getWrapForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
+ <CopyComponent type="normaltable" card={card}/>
+ <PasteComponent config={card} options={options} updateConfig={this.updateComponent} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ <ClockComponent config={card} updateConfig={this.updateComponent}/>
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
- <SearchComponent config={card} updatesearch={this.updateconfig}/>
+ {appType !== 'mob' ? <SearchComponent config={card} updatesearch={this.updateComponent}/> : null}
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <ColumnComponent config={card} updatecolumn={this.updateconfig}/>
+ <ColumnComponent config={card} updatecolumn={this.updatecolumn}/>
+ <div className="component-name">
+ <div className="center">
+ <div className="title" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{card.name}</div>
+ <div className="content">
+ {card.errors && card.errors.map((err, index) => {
+ if (err.level === 0) {
+ return <span key={index} className="error">{err.detail}</span>
+ } else {
+ return <span key={index} className="waring">{err.detail}锛�</span>
+ }
+ })}
+ </div>
+ </div>
+ </div>
</div>
)
}
}
-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