From 465be8b618c1fb139d56ed779ff6f4dbc8d89b89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 八月 2023 15:47:14 +0800
Subject: [PATCH] 2023-08-04

---
 src/views/basedesign/index.jsx |   68 ++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/views/basedesign/index.jsx b/src/views/basedesign/index.jsx
index bc036a1..da66e53 100644
--- a/src/views/basedesign/index.jsx
+++ b/src/views/basedesign/index.jsx
@@ -14,12 +14,11 @@
 const Header = asyncComponent(() => import('@/menu/header'))
 const ComTableConfig = asyncLoadComponent(() => import('@/templates/comtableconfig'))
 const TreePageConfig = asyncLoadComponent(() => import('@/templates/treepageconfig'))
-const FormTabConfig = asyncLoadComponent(() => import('@/templates/formtabconfig'))
 const ModalConfig = asyncLoadComponent(() => import('@/templates/modalconfig'))
 const SubTable = asyncLoadComponent(() => import('@/templates/subtableconfig'))
+const UpdateFormTab = asyncLoadComponent(() => import('./updateFormTab'))
 
 document.body.className = ''
-sessionStorage.setItem('isEditState', 'true')
 
 class BaseDesign extends Component {
   state = {
@@ -48,7 +47,6 @@
     }
 
     if (!sessionStorage.getItem('UserID')) {
-      sessionStorage.removeItem('isEditState')
       this.props.history.replace('/login')
       return
     }
@@ -94,7 +92,7 @@
       loading: true
     })
 
-    Api.getSystemConfig(param).then(res => {
+    Api.getCloudConfig(param).then(res => {
       if (res.status) {
         editMenu.open_edition = res.open_edition || ''
         editMenu.LongParam = ''
@@ -114,7 +112,7 @@
             MenuID: editMenu.PageParam.copyMenuId
           }
       
-          Api.getSystemConfig(_param).then(res => {
+          Api.getCloudConfig(_param).then(res => {
             if (res.status) {
               if (res.LongParam) {
                 let _LongParam = ''
@@ -187,57 +185,57 @@
   }
 
   render () {
-    const { loading } = this.state
+    const { loading, editMenu, subConfig, btnTab } = this.state
 
     return (
       <div className="mk-base-design-wrap">
         <ConfigProvider locale={_locale}>
           <Header/>
-          {this.state.tabview === 'TreePage' ?
-            <TreePageConfig
-              menu={this.state.editMenu}
-              reloadmenu={() => {localStorage.setItem('menuUpdate', new Date().getTime())}}
-              handleView={this.handleView}
-            /> : null
-          }
           {this.state.tabview === 'CommonTable' ?
             <ComTableConfig
-              menu={this.state.editMenu}
+              menu={editMenu}
               reloadmenu={() => {localStorage.setItem('menuUpdate', new Date().getTime())}}
-              handleView={this.handleView}
-            /> : null
-          }
-          {this.state.tabview === 'Modal' ?
-            <ModalConfig
-              menu={this.state.editMenu}
-              editTab={this.state.editTab}
-              tabConfig={this.state.tabConfig}
-              editSubTab={this.state.editSubTab}
-              subTabConfig={this.state.subTabConfig}
-              btnTab={this.state.btnTab}
-              btnTabConfig={this.state.btnTabConfig}
-              editAction={this.state.editAction}
-              subConfig={this.state.subConfig}
               handleView={this.handleView}
             /> : null
           }
           {this.state.tabview === 'SubTable' ?
             <SubTable
-              menu={this.state.editMenu}
+              menu={editMenu}
               editTab={this.state.editTab}
               editSubTab={this.state.editSubTab}
               tabConfig={this.state.tabConfig}
-              btnTab={this.state.btnTab}
+              btnTab={btnTab}
               btnTabConfig={this.state.btnTabConfig}
-              config={this.state.subConfig}
+              config={subConfig}
+              handleView={this.handleView}
+            /> : null
+          }
+          {this.state.tabview === 'Modal' ?
+            <ModalConfig
+              menu={editMenu}
+              editTab={this.state.editTab}
+              tabConfig={this.state.tabConfig}
+              editSubTab={this.state.editSubTab}
+              subTabConfig={this.state.subTabConfig}
+              btnTab={btnTab}
+              btnTabConfig={this.state.btnTabConfig}
+              editAction={this.state.editAction}
+              subConfig={subConfig}
+              handleView={this.handleView}
+            /> : null
+          }
+          {this.state.tabview === 'TreePage' ?
+            <TreePageConfig
+              menu={editMenu}
+              reloadmenu={() => {localStorage.setItem('menuUpdate', new Date().getTime())}}
               handleView={this.handleView}
             /> : null
           }
           {this.state.tabview === 'FormTab' ?
-            <FormTabConfig
-              menu={this.state.editMenu}
-              btnTab={this.state.btnTab}
-              config={this.state.subConfig}
+            <UpdateFormTab
+              menu={editMenu}
+              btnTab={btnTab}
+              config={subConfig}
               handleView={this.handleView}
             /> : null
           }

--
Gitblit v1.8.0