From 65da4dae29c621df1764cb5523c64e92be8b180a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 十月 2024 15:40:40 +0800
Subject: [PATCH] 2024-10-02
---
src/menu/components/editor/braft-editor/index.jsx | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/index.jsx b/src/menu/components/editor/braft-editor/index.jsx
index b032aec..ba699ef 100644
--- a/src/menu/components/editor/braft-editor/index.jsx
+++ b/src/menu/components/editor/braft-editor/index.jsx
@@ -6,7 +6,7 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { getTables } from '@/utils/utils-custom.js'
+import { getTables, checkComponent } from '@/utils/utils-custom.js'
import getWrapForm from './options'
import MKEmitter from '@/utils/events.js'
@@ -16,7 +16,6 @@
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
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 EditorContent = asyncIconComponent(() => import('./editorcontent'))
const BraftContent = asyncComponent(() => import('@/tabviews/custom/components/share/braftContent'))
@@ -39,14 +38,14 @@
let _card = {
uuid: card.uuid,
type: card.type,
- format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
+ format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
width: card.width || 24,
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, datatype: 'dynamic', width: card.width || 24, encryption: 'true', minHeight: 100 },
+ wrap: { name: card.name, datatype: 'dynamic', width: card.width || 24, encryption: 'true' },
style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -54,26 +53,24 @@
html: ''
}
- 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
- _card.html = config.html
-
- _card.setting = config.setting
- _card.columns = config.columns
- _card.scripts = config.scripts
- }
-
this.updateComponent(_card)
} else {
+ let _card = fromJS(card).toJS()
+
+ _card.format = 'array'
+ if (_card.wrap.firstTr === 'light') {
+ _card.wrap.tbStyle = 'th-light'
+ delete _card.wrap.firstTr
+ }
+
this.setState({
- card: fromJS(card).toJS()
+ card: _card
})
}
+ }
+
+ componentDidMount() {
+ MKEmitter.addListener('mkUpdateInter', this.mkUpdateInter)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -87,6 +84,21 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('mkUpdateInter', this.mkUpdateInter)
+ }
+
+ mkUpdateInter = (inter, split) => {
+ const { card } = this.state
+
+ if (card.wrap.datatype === 'public' && card.wrap.publicId === inter.uuid) {
+ let _card = {...card, columns: fromJS(inter.columns).toJS()}
+
+ split.delay = split.delay + 10
+
+ setTimeout(() => {
+ this.updateComponent(_card)
+ }, split.delay)
+ }
}
/**
@@ -97,21 +109,11 @@
card.name = card.wrap.name
card.errors = []
+ card.$tables = []
- let columns = card.columns.map(c => c.field)
-
- if (card.wrap.datatype !== 'static') {
- if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
- card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
- } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
- card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
- } else if (!card.setting.primaryKey) {
- card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
- } else if (!columns.includes(card.setting.primaryKey)) {
- card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
- } else if (!card.setting.supModule) {
- card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
- }
+ if (card.wrap.datatype === 'dynamic') {
+ card.$c_ds = true
+ card.errors = checkComponent(card)
if (card.errors.length === 0) {
card.$tables = getTables(card)
@@ -128,7 +130,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear', 'minHeight'], card.style, this.getStyle)
}
getStyle = (style) => {
@@ -144,7 +146,25 @@
}
updateWrap = (res) => {
- this.updateComponent({...this.state.card, wrap: res})
+ const { card } = this.state
+
+ if (res.tbStyle) {
+ res.tbStyle = res.tbStyle.join(' ')
+ }
+
+ let _card = {...card, wrap: res}
+
+ if (res.datatype === 'public') {
+ let interfaces = window.GLOB.customMenu.interfaces || []
+
+ let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0]
+
+ if (d) {
+ _card.columns = fromJS(d.columns).toJS()
+ }
+ }
+
+ this.updateComponent(_card)
}
clickComponent = (e) => {
@@ -164,25 +184,20 @@
const { card } = this.state
let style = {...card.style}
- if (card.wrap.minHeight) {
- style.minHeight = card.wrap.minHeight
- }
return (
- <div className="menu-normal-editor-box" style={style} onClick={this.clickComponent} id={card.uuid}>
+ <div className={'menu-normal-editor-box ' + (card.wrap.tbStyle || '')} 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">
- <NormalForm title="瀵屾枃鏈缃�" width={700} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="瀵屾枃鏈缃�" width={850} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- <CopyComponent type="normaltable" card={card}/>
+ <CopyComponent type="editor" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<EditorContent config={card} updateConfig={this.updateComponent}/>
- {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/> : null}
+ {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/>}
</div>
} trigger="hover">
<ToolOutlined />
--
Gitblit v1.8.0