From c14ad8237b10d9e24ad3101e706e90c4366636c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 十月 2022 23:28:09 +0800
Subject: [PATCH] 2022-10-05
---
src/views/mobdesign/index.jsx | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 4402d28..7d19e54 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -2,16 +2,16 @@
import { DndProvider } from 'react-dnd'
import { withRouter } from 'react-router'
import { is, fromJS } from 'immutable'
-import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined, ArrowLeftOutlined, EyeOutlined, EyeInvisibleOutlined } from '@ant-design/icons'
+import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/mob.js'
import enUS from '@/locales/en-US/mob.js'
-import antdEnUS from 'antd/es/locale/en_US'
import antdZhCN from 'antd/es/locale/zh_CN'
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
@@ -33,6 +33,7 @@
const ViewNodes = asyncComponent(() => import('@/menu/viewnodes'))
const SourceWrap = asyncComponent(() => import('@/mob/modulesource'))
const Modulecell = asyncComponent(() => import('@/menu/modulecell'))
+const TableNodes = asyncComponent(() => import('@/menu/tablenodes'))
const BgController = asyncComponent(() => import('@/pc/bgcontroller'))
const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
const SysInterface = asyncComponent(() => import('@/menu/sysinterface'))
@@ -61,7 +62,6 @@
class MobDesign extends Component {
state = {
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loading: true,
MenuId: '',
@@ -89,10 +89,9 @@
if (param.type === 'app') {
sessionStorage.setItem('appId', param.ID || '')
+ sessionStorage.setItem('appName', param.remark || '')
sessionStorage.setItem('lang', param.lang || 'zh-CN')
sessionStorage.setItem('kei_no', param.kei_no || '')
- sessionStorage.setItem('role_type', param.role_type || 'true')
- sessionStorage.setItem('login_types', param.login_types || 'false')
sessionStorage.setItem('typename', param.typename || 'mob')
sessionStorage.setItem('adapter', param.adapter || '')
sessionStorage.setItem('sysBgColor', param.sysBgColor || '#ffffff')
@@ -100,7 +99,6 @@
sessionStorage.setItem('instantMessage', param.instantMessage || '')
this.setState({
- localedict: sessionStorage.getItem('lang') !== 'en-US' ? antdZhCN : antdEnUS,
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
})
this.getAppMessage(param.MenuID)
@@ -919,12 +917,16 @@
})
}
- getMenuMessage = () => {
+ getMenuMessage = (tbs) => {
const { config } = this.state
let traversal = (components) => {
let list = []
components.forEach(item => {
+ if (item.$tables) {
+ tbs.push(...item.$tables)
+ }
+
let m = {
key: item.uuid,
title: item.name,
@@ -1320,10 +1322,50 @@
config.enabled = false
}
+ let tbs = []
let roleParam = {type: 'view', version: '1.0', key: config.uuid, title: config.MenuName, children: []}
- roleParam.children = this.getMenuMessage()
+ roleParam.children = this.getMenuMessage(tbs)
config.loginview = false
config.tabview = false
+
+ let arr = []
+ tbs = tbs.filter(tb => {
+ let _tb = tb.toLowerCase()
+
+ if (arr.includes(_tb)) return false
+ arr.push(_tb)
+
+ return true
+ })
+ tbs.sort()
+ if (tbs.length && sessionStorage.getItem('mk_tb_names')) {
+ let names = sessionStorage.getItem('mk_tb_names')
+ tbs = tbs.filter(tb => names.indexOf(',' + tb.toLowerCase() + ',') > -1)
+ }
+ tbs = tbs.map(tb => `'${tb}'`).join(';')
+
+ let key = md5(config.uuid + sessionStorage.getItem('kei_no') + sessionStorage.getItem('typename') + sessionStorage.getItem('lang') + tbs.toLowerCase())
+ let url = ''
+
+ if (config.tbkey === key) {
+ key = ''
+ } else {
+ let urlparam = {
+ type: 'app',
+ MenuID: config.uuid,
+ ID: sessionStorage.getItem('appId') || '',
+ remark: sessionStorage.getItem('appName') || '',
+ lang: sessionStorage.getItem('lang') || '',
+ kei_no: sessionStorage.getItem('kei_no') || '',
+ typename: sessionStorage.getItem('typename') || '',
+ adapter: sessionStorage.getItem('adapter') || '',
+ sysBgColor: sessionStorage.getItem('sysBgColor') || '',
+ MenuName: config.MenuName || '',
+ }
+
+ url = window.btoa(window.encodeURIComponent(JSON.stringify(urlparam)))
+ config.tbkey = key
+ }
if (roleParam.children.length === 0) {
roleParam.pass = true
@@ -1377,7 +1419,10 @@
menus_rolelist: window.btoa(window.encodeURIComponent(JSON.stringify(roleParam))),
LText: '',
LTexttb: '',
- menus_used_list
+ menus_used_list,
+ debug_md5: key,
+ debug_url: url,
+ debug_list: window.btoa(tbs)
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -1921,10 +1966,10 @@
render () {
- const { viewType, localedict, comloading, loading, settingshow, controlshow, activeKey, dict, MenuId, config, menuloading, customComponents, adapters, eyeopen } = this.state
+ const { viewType, comloading, loading, settingshow, controlshow, activeKey, dict, MenuId, config, menuloading, customComponents, adapters, eyeopen } = this.state
return (
- <ConfigProvider locale={localedict}>
+ <ConfigProvider locale={antdZhCN}>
<div className={'mk-mob-view ' + viewType} id="mk-mob-design-view">
<Header changeView={this.changeView}/>
{loading ? <Spin className="view-spin" size="large" /> : null}
@@ -1979,6 +2024,7 @@
<Button className="mk-border-purple" onClick={() => this.setState({eyeopen: !eyeopen})}>{!eyeopen ? <EyeOutlined /> : <EyeInvisibleOutlined />} 缁勪欢鍚�</Button>
<CreateView resetmenu={this.getAppMenus} />
<PasteController insert={this.insert} />
+ <TableNodes config={config} />
<ViewNodes config={config} MenuId={MenuId}/>
<SysInterface config={config} updateConfig={this.updateConfig}/>
<PictureController/>
--
Gitblit v1.8.0