From c96108bd84050feb01b47db3f5cae96670fda435 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 30 十月 2024 12:54:24 +0800 Subject: [PATCH] 2024-10-30 --- src/menu/components/form/simple-form/index.jsx | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx index 245b90b..60e1f9f 100644 --- a/src/menu/components/form/simple-form/index.jsx +++ b/src/menu/components/form/simple-form/index.jsx @@ -7,7 +7,7 @@ import asyncComponent from '@/utils/asyncComponent' import asyncIconComponent from '@/utils/asyncIconComponent' import { getModalForm } from '@/templates/zshare/formconfig' -import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js' +import { resetStyle, getTables, checkComponent, getInterfaces } from '@/utils/utils-custom.js' import MKEmitter from '@/utils/events.js' import Utils from '@/utils/utils.js' import getWrapForm from './options' @@ -19,7 +19,7 @@ const CardComponent = asyncComponent(() => import('@/templates/modalconfig/dragelement')) const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement')) const FormAction = asyncComponent(() => import('../formaction')) -// const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork')) +const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork')) const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader')) const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent')) const PasteForms = asyncIconComponent(() => import('@/menu/components/share/pasteforms')) @@ -241,7 +241,7 @@ changecols = (type) => { let card = fromJS(this.state.card).toJS() - let _this = this + let that = this card.subcards[0].fields = card.subcards[0].fields.map(item => { item.labelwidth = 33.3 @@ -267,7 +267,7 @@ confirm({ content: `纭畾鍒囨崲涓�${type}鍒楀悧锛焋, onOk() { - _this.updateComponent(card) + that.updateComponent(card) }, onCancel() {} }) @@ -288,14 +288,14 @@ closeForm = (cell) => { let card = fromJS(this.state.card).toJS() - let _this = this + let that = this card.subcards[0].fields = card.subcards[0].fields.filter(item => item.uuid !== cell.uuid) confirm({ content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`, onOk() { - _this.updateComponent(card) + that.updateComponent(card) }, onCancel() {} }) @@ -340,6 +340,8 @@ card.subcards[0].fields = card.subcards[0].fields.filter(item => !item.focus) this.setState({card, visible: false, editform: null}) + + this.updateComponent(card) } /** @@ -466,9 +468,9 @@ _card.setting.supModule = '' } } else if (res.datatype === 'public') { - let interfaces = window.GLOB.customMenu.interfaces || [] + let interfaces = getInterfaces() - let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0] + let d = interfaces.filter(m => m.value === res.publicId)[0] if (d) { _card.columns = fromJS(d.columns).toJS() @@ -501,14 +503,14 @@ clearGroup = () => { let card = fromJS(this.state.card).toJS() - let _this = this + let that = this card.subcards[0].fields = [] confirm({ content: `纭畾娓呯┖琛ㄥ崟鍚楋紵`, onOk() { - _this.updateComponent(card) + that.updateComponent(card) }, onCancel() {} }) @@ -562,7 +564,7 @@ } trigger="hover"> <SwapOutlined /> </Popover> : null} - {/* <FormFork forms={card.subcards[0].fields}/> */} + <FormFork forms={card.subcards[0].fields}/> {/* <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} /> */} <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} /> </div> -- Gitblit v1.8.0