From c5e5a7580632bc39a9e0c78d548f22a8be5f2019 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十月 2023 18:04:51 +0800
Subject: [PATCH] 2023-10-18
---
src/menu/components/table/edit-table/index.jsx | 65 ++++++++------------------------
1 files changed, 17 insertions(+), 48 deletions(-)
diff --git a/src/menu/components/table/edit-table/index.jsx b/src/menu/components/table/edit-table/index.jsx
index fd53e91..f211286 100644
--- a/src/menu/components/table/edit-table/index.jsx
+++ b/src/menu/components/table/edit-table/index.jsx
@@ -19,7 +19,6 @@
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 ColumnComponent = asyncComponent(() => import('./columns'))
@@ -66,46 +65,6 @@
isNew: true
}
- 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
-
- 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 === '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
- })
- }
-
this.updateComponent(_card)
} else {
this.setState({
@@ -141,7 +100,9 @@
delete item.isNew
- this.setState({card: item})
+ this.setState({card: null}, () => {
+ this.setState({card: item})
+ })
}
}
@@ -158,6 +119,10 @@
card.$c_cl = true
card.errors = checkComponent(card)
+
+ if (!card.submit.sheet) {
+ card.errors.push({ level: 0, detail: '鎻愪氦鎸夐挳鏈缃紒'})
+ }
if (card.errors.length === 0) {
card.$tables = getTables(card)
@@ -214,7 +179,7 @@
addColumns = () => {
let card = fromJS(this.state.card).toJS()
- card.cols.push({ focus: true, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
+ card.cols.push({ focus: true, Width: 120, uuid: Utils.getuuid(), label: 'label', field: '', type: 'text' })
this.setState({card})
}
@@ -273,9 +238,9 @@
}
getWrapForms = () => {
- const { wrap, action } = this.state.card
+ const { wrap, columns } = this.state.card
- return getWrapForm(wrap, action)
+ return getWrapForm(wrap, columns)
}
updateWrap = (res) => {
@@ -291,6 +256,8 @@
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}
@@ -343,8 +310,11 @@
render() {
const { card, appType } = this.state
+
+ if (!card) return null
+
let _style = resetStyle(card.style)
-
+
return (
<div className="menu-editable-table-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
@@ -353,13 +323,12 @@
<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={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="琛ㄦ牸璁剧疆" width={900} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="editable" card={card}/>
<PasteComponent config={card} options={['action', 'search', 'form', 'cols']} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
--
Gitblit v1.8.0