From 7e5200a09b2c6282382ec8725220f5561de139f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 18:05:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/breadview/index.jsx | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/components/breadview/index.jsx b/src/components/breadview/index.jsx
index 29ae6c0..3a44900 100644
--- a/src/components/breadview/index.jsx
+++ b/src/components/breadview/index.jsx
@@ -6,7 +6,6 @@
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
-import options from '@/store/options.js'
import MKEmitter from '@/utils/events.js'
import Api from '@/api'
import './index.scss'
@@ -18,7 +17,6 @@
const TreePage = asyncComponent(() => import('@/tabviews/treepage'))
const Iframe = asyncComponent(() => import('@/tabviews/iframe'))
const RoleManage = asyncComponent(() => import('@/tabviews/rolemanage'))
-const FormTab = asyncComponent(() => import('@/tabviews/formtab'))
moment.locale('zh-cn')
@@ -32,7 +30,7 @@
const { tabview } = this.state
window.GLOB.CacheMap = new Map()
- if (options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
let roledefer = new Promise(resolve => {
Api.getSystemConfig({
func: 's_Get_TrdMenu_Role',
@@ -100,8 +98,6 @@
return (<CommonTable MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param} changeTemp={this.changeTemp}/>)
} else if (view.type === 'TreePage') {
return (<TreePage MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param}/>)
- } else if (view.type === 'FormTab') {
- return (<FormTab MenuNo={view.MenuNo} MenuID={view.MenuID} MenuName={view.MenuName} param={view.param}/>)
} else if (view.type === 'iframe') {
return (<Iframe MenuID={view.MenuID} title={view.MenuName} url={view.src}/>)
} else {
@@ -156,7 +152,7 @@
const { tabview, hasNavBar } = this.state
return (
- <section id="mk-breadview-wrap" className="mk-breadview-wrap">
+ <section id="mk-tabgroup-wrap" className="mk-breadview-wrap">
{hasNavBar && tabview ? <Breadcrumb separator="">
<Breadcrumb.Item>
<HomeOutlined onClick={this.gotoHome} />
--
Gitblit v1.8.0