From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/tree/antd-tree/index.jsx | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/src/menu/components/tree/antd-tree/index.jsx b/src/menu/components/tree/antd-tree/index.jsx
index 8e91c46..8f2c11d 100644
--- a/src/menu/components/tree/antd-tree/index.jsx
+++ b/src/menu/components/tree/antd-tree/index.jsx
@@ -6,7 +6,7 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables } 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'
@@ -15,9 +15,9 @@
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
+const PasteComponent = asyncIconComponent(() => import('@/components/paste'))
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 ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
@@ -56,19 +56,6 @@
scripts: [],
action: [],
}
-
- 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.setting = config.setting
- _card.columns = config.columns
- _card.scripts = config.scripts
- }
this.updateComponent(_card)
} else {
@@ -101,28 +88,29 @@
card.width = card.wrap.width
card.name = card.wrap.name
- card.errors = []
-
- let columns = card.columns.map(c => c.field)
-
- 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: '鏈缃笂绾х粍浠讹紒'})
- }
+ card.$c_ds = true
+ card.$c_ac = true
+
+ card.errors = checkComponent(card)
if (card.errors.length === 0) {
card.$tables = getTables(card)
}
+ delete card.$c_ds
+ delete card.$c_ac
+
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({
@@ -177,6 +165,20 @@
MKEmitter.emit('addButton', card.uuid, newcard)
}
+ pasteComponent = (res, resolve) => {
+ if (res.style) {
+ delete res.style.width
+ delete res.style.float
+ }
+
+ res.Ot = res.Ot === 'requiredSgl' ? 'requiredSgl' : 'notRequired'
+
+ resolve({status: true})
+
+ res.uuid = Utils.getuuid()
+ this.addButton(res)
+ }
+
setSubConfig = (item) => {
const { card, appType } = this.state
let btn = fromJS(item).toJS()
@@ -197,9 +199,9 @@
}
getWrapForms = () => {
- const { wrap, columns } = this.state.card
+ const { wrap, columns, action } = this.state.card
- return getWrapForm(wrap, columns)
+ return getWrapForm(wrap, columns, action.findIndex(item => item.Ot === 'requiredSgl') > -1)
}
updateWrap = (res) => {
@@ -222,6 +224,9 @@
render() {
const { card } = this.state
let _style = resetStyle(card.style)
+ if (card.wrap.lineHeight) {
+ _style['--mk-tree-line-height'] = card.wrap.lineHeight + 'px'
+ }
return (
<div className="menu-tree-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
@@ -234,9 +239,9 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="tree" card={card}/>
+ <PasteComponent options={['action']} updateConfig={this.pasteComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
@@ -259,7 +264,7 @@
<div className="center">
<div className="title" onDoubleClick={() => {
let oInput = document.createElement('input')
- oInput.value = card.uuid
+ oInput.value = 'anchor' + card.uuid
document.body.appendChild(oInput)
oInput.select()
document.execCommand('Copy')
--
Gitblit v1.8.0