From b20a4d7c75c2ff8951e93d9c0394df9277fc6093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:05:17 +0800
Subject: [PATCH] 2023-05-15
---
src/menu/components/table/base-table/index.jsx | 118 +++++++++++++++++++++++++++++------------------------------
1 files changed, 58 insertions(+), 60 deletions(-)
diff --git a/src/menu/components/table/base-table/index.jsx b/src/menu/components/table/base-table/index.jsx
index ef4980f..30ad6c2 100644
--- a/src/menu/components/table/base-table/index.jsx
+++ b/src/menu/components/table/base-table/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 MKEmitter from '@/utils/events.js'
import getWrapForm from './options'
import Utils from '@/utils/utils.js'
@@ -56,7 +56,7 @@
setting: { interType: 'system' },
wrap: { bordered: 'true', tableType: 'checkbox', show: 'true' },
style: {},
- headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
+ headerStyle: {},
columns: [],
cols: [
{ origin: true, uuid: Utils.getuuid(), Align: 'left', label: 'label1', field: '', Hide: 'false', type: 'text', Width: 120 },
@@ -65,6 +65,10 @@
],
scripts: [],
isNew: true
+ }
+
+ if (card.name === '涓昏〃') {
+ _card.setting.supModule = ['empty']
}
this.updateComponent(_card)
@@ -95,6 +99,39 @@
MKEmitter.removeListener('completeSave', this.completeSave)
}
+ // updateFix = (card) => {
+ // let fixs = {}
+
+ // card.cols.forEach(col => {
+ // if (!col.field) return
+ // if (col.postfix || col.prefix) {
+ // fixs[col.field] = col
+ // }
+ // })
+
+ // card.cols.forEach(col => {
+ // if (col.type === 'custom') {
+ // col.elements.forEach(cell => {
+ // if (cell.datatype === 'dynamic') {
+ // cell.height = ''
+ // cell.innerHeight = 'auto'
+
+ // if (fixs[cell.field]) {
+ // if (!cell.prefix && fixs[cell.field].prefix) {
+ // cell.prefix = fixs[cell.field].prefix
+ // }
+ // if (!cell.postfix && fixs[cell.field].postfix) {
+ // cell.postfix = fixs[cell.field].postfix
+ // }
+ // }
+ // }
+ // })
+ // }
+ // })
+
+ // return card
+ // }
+
completeSave = () => {
const { card } = this.state
@@ -105,7 +142,9 @@
item.cols = item.cols.filter(a => !a.origin)
delete item.isNew
- this.setState({card: item}, () => { MKEmitter.emit('revert') })
+ this.setState({card: null}, () => {
+ this.setState({card: item})
+ })
}
}
@@ -131,64 +170,14 @@
*/
updateComponent = (card) => {
if (!window.GLOB.styling || !card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌�
- card.errors = []
-
- let doubleClick = card.wrap.doubleClick || ''
-
- 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.$c_cl = true
+
+ card.errors = checkComponent(card)
if (card.errors.length === 0) {
card.$tables = getTables(card)
- }
-
- card.action.forEach(cell => {
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (!cell.modal || cell.modal.fields.length === 0) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- }
- }
- if (doubleClick === cell.uuid) {
- doubleClick = ''
- }
- })
-
- card.cols.forEach(col => {
- if (col.type === 'action') {
- col.elements.forEach(cell => {
- if (cell.OpenType === 'pop' || (cell.OpenType === 'funcbutton' && cell.execMode === 'pop')) {
- if (!cell.modal || cell.modal.fields.length === 0) {
- card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`})
- }
- }
- if (doubleClick === cell.uuid) {
- doubleClick = ''
- }
- })
- } else if (col.type === 'custom') {
- col.elements.forEach(cell => {
- if (cell.datatype === 'dynamic' && cell.field && !columns.includes(cell.field)) {
- card.errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑鍔ㄦ�佸瓧娈碘��${cell.field}鈥濇棤鏁坄})
- }
- })
- } else if (col.field && !columns.includes(col.field)) {
- card.errors.push({ level: 1, detail: `鏄剧ず鍒椻��${col.label}鈥濅腑瀛楁鈥�${col.field}鈥濇棤鏁坄})
- }
- })
-
- if (doubleClick) {
- card.errors.push({ level: 1, detail: `缁戝畾鐨勫弻鍑绘寜閽凡鍒犻櫎`})
}
}
@@ -348,9 +337,18 @@
this.updateComponent(config)
}
+ parseComponent = (config, type) => {
+ if (type === 'cols') {
+ this.updatecolumn(config)
+ }
+ this.updateComponent(config)
+ }
+
render() {
const { card } = this.state
let options = ['action', 'search', 'form', 'cols']
+
+ if (!card) return null
return (
<div className="menu-base-table-edit-box" style={card.style} id={card.uuid}>
@@ -359,8 +357,8 @@
<NormalForm title="琛ㄦ牸璁剧疆" width={800} 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} />
+ <CopyComponent type="basetable" card={card}/>
+ <PasteComponent config={card} options={options} updateConfig={this.parseComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
--
Gitblit v1.8.0