From 08cdae93f171dc807a3caf3c98ff0aeda923aacd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 七月 2023 09:36:17 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/mkiframe/index.jsx | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/mkiframe/index.jsx b/src/views/mkiframe/index.jsx
index b2f079b..e3a1cde 100644
--- a/src/views/mkiframe/index.jsx
+++ b/src/views/mkiframe/index.jsx
@@ -1,5 +1,6 @@
import React, {Component} from 'react'
-import { Spin, notification } from 'antd'
+import { Spin, notification, ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
import Api from '@/api'
import asyncComponent from '@/utils/asyncLoadComponent'
@@ -38,7 +39,7 @@
localStorage.removeItem('getSysPermission')
localStorage.removeItem('sysPermissions')
- if (window.GLOB.mkActions) {
+ if (window.GLOB.mkActions && window.GLOB.mkActions.loaded) {
this.setState({loading: false})
} else {
this.getPermRole()
@@ -176,9 +177,11 @@
return (
<div className="main-iframe">
- {loading ? <Spin size="large" /> : null}
- {!loading && type === 'CustomPage' ? <CustomPage MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
- {!loading && type === 'BaseTable' ? <BaseTable MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
+ <ConfigProvider locale={zhCN}>
+ {loading ? <Spin size="large" /> : null}
+ {!loading && type === 'CustomPage' ? <CustomPage MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
+ {!loading && type === 'BaseTable' ? <BaseTable MenuID={MenuId} param={{$BID: BID}} changeTemp={this.changeTemp}/> : null}
+ </ConfigProvider>
</div>
)
}
--
Gitblit v1.8.0