From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/menu/components/tree/antd-tree/index.jsx | 163 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 42 deletions(-)
diff --git a/src/menu/components/tree/antd-tree/index.jsx b/src/menu/components/tree/antd-tree/index.jsx
index 5911a79..c7afa92 100644
--- a/src/menu/components/tree/antd-tree/index.jsx
+++ b/src/menu/components/tree/antd-tree/index.jsx
@@ -1,13 +1,14 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Tree } from 'antd'
-import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, FileOutlined, FolderOpenOutlined } from '@ant-design/icons'
+import { Popover, Tree, message } from 'antd'
+import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, FileOutlined, FolderOpenOutlined, PlusSquareOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
+import Utils from '@/utils/utils.js'
import getWrapForm from './options'
import './index.scss'
@@ -18,6 +19,7 @@
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
+const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
const { TreeNode } = Tree
@@ -40,10 +42,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
- dataName: card.dataName || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
@@ -56,6 +54,7 @@
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
scripts: [],
+ action: [],
}
if (card.config) {
@@ -71,19 +70,15 @@
_card.scripts = config.scripts
}
+ this.updateComponent(_card)
+ } else {
+ let _card = fromJS(card).toJS()
+ _card.action = _card.action || [] // 鍏煎
+
this.setState({
card: _card
})
- this.props.updateConfig(_card)
- } else {
- this.setState({
- card: fromJS(card).toJS()
- })
}
- }
-
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -97,51 +92,105 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+
+ card.$c_ds = true
+
+ card.errors = checkComponent(card)
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
+ if (!card.wrap.parentField || !card.wrap.valueField || !card.wrap.labelField) {
+ card.errors.push({ level: 0, detail: '鏈缃熀鏈俊鎭紒'})
+ } else {
+ let columns = card.columns.map(c => c.field)
+ if (!columns.includes(card.wrap.parentField)) {
+ card.errors.push({ level: 0, detail: '涓婄骇瀛楁鍦ㄥ瓧娈甸泦涓笉瀛樺湪'})
+ } else if (!columns.includes(card.wrap.valueField)) {
+ card.errors.push({ level: 0, detail: '鍊煎瓧娈靛湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ } else if (!columns.includes(card.wrap.labelField)) {
+ card.errors.push({ level: 0, detail: '鏂囨湰瀛楁鍦ㄥ瓧娈甸泦涓笉瀛樺湪'})
+ }
+ }
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['height', 'background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
+
+ this.updateComponent(_card)
+ }
+
+ addButton = (copy) => {
const { card } = this.state
- if (comIds[0] !== card.uuid || comIds.length !== 1) return
+ let newcard = {}
- let _card = {...card, style}
+ if (copy) {
+ newcard = copy
+ newcard.focus = true
+ } else {
+ newcard.uuid = Utils.getuuid()
+ newcard.focus = true
+
+ newcard.label = 'label'
+ newcard.Ot = 'requiredSgl'
+ newcard.OpenType = 'pop'
+ newcard.icon = ''
+ newcard.class = 'green'
+ newcard.intertype = card.setting.interType || 'system'
+ newcard.innerFunc = card.setting.innerFunc || ''
+ newcard.sysInterface = card.setting.sysInterface || ''
+ newcard.outerFunc = card.setting.outerFunc || ''
+ newcard.interface = card.setting.interface || ''
+ newcard.execSuccess = 'grid'
+ newcard.execError = 'never'
+ newcard.verify = null
+ newcard.show = 'button'
+ newcard.style = {marginRight: '15px'}
+ }
- this.setState({
- card: _card
- })
-
- this.props.updateConfig(_card)
+ // 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
+ 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()
+
+ if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
+ if (!btn.modal) {
+ btn.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' && appType !== 'mob') {
+ MKEmitter.emit('changePopview', card, btn)
+ }
}
getWrapForms = () => {
@@ -157,7 +206,13 @@
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
+ 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)
+ })
}
}
@@ -168,12 +223,14 @@
return (
<div className="menu-tree-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
+ <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.addButton()}/>
<NormalForm title="鍩烘湰璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- <CopyComponent type="normaltable" card={card}/>
+ <CopyComponent type="tree" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
<UserComponent config={card}/>
@@ -195,6 +252,28 @@
</TreeNode>
</Tree>
</div>
+ <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>
)
}
--
Gitblit v1.8.0