From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/basedesign/index.jsx | 107 +++++++++++++++++++++++++----------------------------
1 files changed, 51 insertions(+), 56 deletions(-)
diff --git a/src/views/basedesign/index.jsx b/src/views/basedesign/index.jsx
index da66e53..5e9d0f5 100644
--- a/src/views/basedesign/index.jsx
+++ b/src/views/basedesign/index.jsx
@@ -1,7 +1,5 @@
import React, {Component} from 'react'
-import { notification, Spin, ConfigProvider } from 'antd'
-import enUS from 'antd/es/locale/en_US'
-import zhCN from 'antd/es/locale/zh_CN'
+import { notification, Spin } from 'antd'
import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
@@ -10,7 +8,6 @@
import '@/assets/css/design.scss'
import './index.scss'
-const _locale = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
const Header = asyncComponent(() => import('@/menu/header'))
const ComTableConfig = asyncLoadComponent(() => import('@/templates/comtableconfig'))
const TreePageConfig = asyncLoadComponent(() => import('@/templates/treepageconfig'))
@@ -189,58 +186,56 @@
return (
<div className="mk-base-design-wrap">
- <ConfigProvider locale={_locale}>
- <Header/>
- {this.state.tabview === 'CommonTable' ?
- <ComTableConfig
- menu={editMenu}
- reloadmenu={() => {localStorage.setItem('menuUpdate', new Date().getTime())}}
- handleView={this.handleView}
- /> : null
- }
- {this.state.tabview === 'SubTable' ?
- <SubTable
- menu={editMenu}
- editTab={this.state.editTab}
- editSubTab={this.state.editSubTab}
- tabConfig={this.state.tabConfig}
- btnTab={btnTab}
- btnTabConfig={this.state.btnTabConfig}
- 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' ?
- <UpdateFormTab
- menu={editMenu}
- btnTab={btnTab}
- config={subConfig}
- handleView={this.handleView}
- /> : null
- }
- {loading ? <Spin className="loading-view" size="large"/> : null}
- </ConfigProvider>
+ <Header/>
+ {this.state.tabview === 'CommonTable' ?
+ <ComTableConfig
+ menu={editMenu}
+ reloadmenu={() => {localStorage.setItem('menuUpdate', new Date().getTime())}}
+ handleView={this.handleView}
+ /> : null
+ }
+ {this.state.tabview === 'SubTable' ?
+ <SubTable
+ menu={editMenu}
+ editTab={this.state.editTab}
+ editSubTab={this.state.editSubTab}
+ tabConfig={this.state.tabConfig}
+ btnTab={btnTab}
+ btnTabConfig={this.state.btnTabConfig}
+ 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' ?
+ <UpdateFormTab
+ menu={editMenu}
+ btnTab={btnTab}
+ config={subConfig}
+ handleView={this.handleView}
+ /> : null
+ }
+ {loading ? <Spin className="loading-view" size="large"/> : null}
</div>
)
}
--
Gitblit v1.8.0