From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 10 十月 2022 00:07:06 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/menu/components/card/table-card/index.jsx | 78 ++------------------------------------ 1 files changed, 5 insertions(+), 73 deletions(-) diff --git a/src/menu/components/card/table-card/index.jsx b/src/menu/components/card/table-card/index.jsx index 689e208..0775056 100644 --- a/src/menu/components/card/table-card/index.jsx +++ b/src/menu/components/card/table-card/index.jsx @@ -6,7 +6,7 @@ import asyncComponent from '@/utils/asyncComponent' import asyncIconComponent from '@/utils/asyncIconComponent' -import { resetStyle } from '@/utils/utils-custom.js' +import { resetStyle, getTables } from '@/utils/utils-custom.js' import MKEmitter from '@/utils/events.js' import Utils from '@/utils/utils.js' import getWrapForm from '../data-card/options' @@ -18,7 +18,6 @@ const MobPagination = asyncIconComponent(() => import('@/menu/components/share/mobPagination')) const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent')) const PasteComponent = asyncIconComponent(() => import('@/components/paste')) -// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent')) const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent')) const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader')) const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent')) @@ -71,7 +70,6 @@ elements: [] }], action: [], - btnlog: [], } if (card.config) { @@ -150,24 +148,12 @@ } } - // logButton = (id, item) => { - // const { card } = this.state - - // if (id !== card.uuid) return - - // let btnlog = card.btnlog || [] - // btnlog.push(item) - - // this.updateComponent({...card, btnlog}) - // } - /** * @description 鍗$墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級 */ updateComponent = (card) => { card.width = card.wrap.width card.name = card.wrap.name - card.btnlog = [] if (window.GLOB.styling && card.errors) { // 鏍峰紡淇敼鏃朵笉鍋氱瓫鏌� this.setState({ @@ -203,6 +189,10 @@ card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'}) } + if (card.errors.length === 0) { + card.$tables = getTables(card) + } + card.subcards.forEach((item, i) => { let linkbtn = item.setting.linkbtn || '' item.elements.forEach(cell => { @@ -210,14 +200,6 @@ 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}鈥濅腑琛ㄥ崟灏氭湭娣诲姞`}) - // } else { - // cell.modal.fields.forEach(m => { - // if (m.type === 'linkMain' && !supModule) { - // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄}) - // } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) { - // card.errors.push({ level: 1, detail: `鎸夐挳鈥�${cell.label}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻}) - // } - // }) } } if (linkbtn && linkbtn === cell.uuid) { @@ -266,10 +248,6 @@ content: '纭畾鍒犻櫎鍗$墖鍚楋紵', onOk() { card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid) - - // if (card.btnlog) { - // card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid) - // } _this.updateComponent(card) @@ -358,51 +336,6 @@ // 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储 MKEmitter.emit('addSearch', card.uuid, newcard) } - - // handleLog = (type, logs, item) => { - // let card = fromJS(this.state.card).toJS() - - // if (type === 'revert') { - // let done = false - // if (item.$parentId) { - // card.subcards.forEach(col => { - // if (item.$parentId === col.uuid) { - // if (item.$side !== 'back') { - // col.elements = col.elements ? [...col.elements, item] : [item] - // } else { - // col.backElements = col.backElements ? [...col.backElements, item] : [item] - // } - // done = true - // } - // }) - // } - - // card.btnlog = logs - - // this.updateComponent(card) - // if (!done) { - // notification.warning({ - // top: 92, - // message: '闄勫睘鍗$墖宸插垹闄わ紒', - // duration: 2 - // }) - // } else { - // notification.success({ - // top: 92, - // message: '鎭㈠鎴愬姛锛�', - // duration: 2 - // }) - // } - // } else { - // card.btnlog = logs - // this.updateComponent(card) - // notification.success({ - // top: 92, - // message: '娓呴櫎鎴愬姛锛�', - // duration: 2 - // }) - // } - // } move = (item, direction) => { let card = fromJS(this.state.card).toJS() @@ -589,7 +522,6 @@ <CopyComponent type="tablecard" card={card}/> <PasteComponent options={['cardcell', 'search', 'form']} updateConfig={this.pasteComponent} /> <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/> - {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} /> */} <ClockComponent config={card} updateConfig={this.updateComponent}/> <UserComponent config={card}/> <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} /> -- Gitblit v1.8.0