From 4ce77c01c1adcbd1b3cb2aa5b7103a827d189811 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 06 二月 2025 20:53:22 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/tabledesign/popview/index.jsx | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/views/tabledesign/popview/index.jsx b/src/views/tabledesign/popview/index.jsx index dbac3df..a824b3b 100644 --- a/src/views/tabledesign/popview/index.jsx +++ b/src/views/tabledesign/popview/index.jsx @@ -15,6 +15,7 @@ const MenuShell = asyncComponent(() => import('@/menu/tableshell')) const ReplaceField = asyncComponent(() => import('@/menu/replaceField')) +const NormalCopy = asyncComponent(() => import('@/menu/normalCopy')) const BgController = asyncComponent(() => import('@/pc/bgcontroller')) const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent')) @@ -195,6 +196,7 @@ <Panel header="鍩烘湰淇℃伅" key="basedata"> {/* 琛ㄥ悕娣诲姞 */} <TableComponent config={config} updatetable={this.updatetable}/> + <NormalCopy /> </Panel> {/* 缁勪欢娣诲姞 */} <Panel header="鎼滅储" key="search"> @@ -216,7 +218,7 @@ <div> {config.MenuName} </div> } bordered={false} extra={ <div> - <ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/> + <ReplaceField config={config} updateConfig={this.resetConfig}/> <Switch className="big" checkedChildren="鍚�" unCheckedChildren="鍋�" checked={config.enabled} onChange={this.onEnabledChange} /> <Button type="primary" id="save-pop-config" onClick={this.submitConfig} loading={menuloading}>淇濆瓨</Button> <Button type="default" disabled={menuloading} onClick={this.closeView}>杩斿洖</Button> -- Gitblit v1.8.0