From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/tabviews/treepage/index.jsx | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 29bc25e..00b7d2f 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -5,20 +5,15 @@
import { FolderOpenOutlined, FolderOutlined, FileOutlined } from '@ant-design/icons'
import Api from '@/api'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
-import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import MkIcon from '@/components/mk-icon'
import NotFount from '@/components/404'
import './index.scss'
const SubTable = asyncSpinComponent(() => import('@/tabviews/subtable'))
-const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
-const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
const { TabPane } = Tabs
const { TreeNode } = Tree
@@ -33,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
ContainerId: Utils.getuuid(), // 鑿滃崟澶栧眰html Id
loadingview: true, // 椤甸潰鍔犺浇涓�
BID: null, // 椤甸潰璺宠浆鏃舵惡甯D
@@ -108,7 +102,7 @@
this.setState({
loadingview: false,
viewlost: true,
- lostmsg: this.state.dict['main.view.unenabled']
+ lostmsg: '鎶辨瓑锛屾偍璁块棶鐨勯〉闈㈡湭鍚敤锛岃鑱旂郴绠＄悊鍛樸��'
})
return
}
@@ -171,10 +165,8 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
- config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
- config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*')
- config.setting.customScript = config.setting.customScript.replace(/@\$/ig, '*/')
+ config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
+ config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
} else {
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
@@ -182,11 +174,6 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
@@ -198,6 +185,8 @@
config.setting.customScript = config.setting.customScript.replace(cell.reg, cell.value)
})
}
+
+ config.setting.arr_field = `${config.setting.valueField},${config.setting.labelField},${config.setting.parentField}`
this.setState({
BID: param && param.$BID ? param.$BID : '',
@@ -274,8 +263,7 @@
loading: true
})
- let arr_field = `${setting.valueField},${setting.labelField},${setting.parentField}`
- let param = UtilsDM.getQueryDataParams(setting, arr_field, [], setting.order, '', '', BID)
+ let param = UtilsDM.getQueryDataParams(setting, [], setting.order, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -575,7 +563,7 @@
}
render() {
- const { setting, loadingview, viewlost, config, tabgroups, treeNodes, treedata, expandedKeys, selectedKeys, shortcuts } = this.state
+ const { setting, loadingview, viewlost, tabgroups, treeNodes, treedata, expandedKeys, selectedKeys } = this.state
return (
<div className="tree-page" id={this.state.ContainerId}>
@@ -637,8 +625,6 @@
)}
</Col>
</Row> : null}
- {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
- {!window.GLOB.mkHS && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
--
Gitblit v1.8.0