From fe15ff1f9136ec964abdc8b8e3bad8466e215c3d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 五月 2022 11:53:26 +0800
Subject: [PATCH] 2022-05-11
---
public/options.json | 14 +++---
src/views/menudesign/index.scss | 36 +++++++++++++++--
src/views/menudesign/index.jsx | 17 ++++++--
src/views/login/index.jsx | 2
4 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/public/options.json b/public/options.json
index 59b1cc1..f5f2215 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,18 +1,18 @@
{
- "appId": "202109161556242376DEC38C96FFF414E8DEF",
- "appkey": "20210916155606327FB54C811DE824AFEB22C",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
- "externalDatabase": "",
+ "externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
+ "licenseKey": "7EFE13KIKLILIJB64C12",
+ "probation": "2021-12-31",
"keepPassword": "true",
"host": "http://demo.mk9h.cn",
- "service": "kalai_mes/"
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 146a321..09d4090 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -531,7 +531,7 @@
style: res.CSS || '',
showline: res.split_line_show || 'true',
webSite: res.WebSite || '',
- navBar: res.menu_type,
+ navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤�
app_version: res.app_version
}
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 7a1b16c..1150a86 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -4,6 +4,7 @@
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
import { ConfigProvider, notification, Modal, Collapse, Card, Switch, Button, Typography } from 'antd'
+import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons'
import html2canvas from 'html2canvas'
import Api from '@/api'
@@ -72,7 +73,8 @@
popBtn: null, // 寮圭獥鏍囩椤�
visible: false,
customComponents: [],
- comloading: false
+ comloading: false,
+ settingshow: !['linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(window.GLOB.navBar)
}
UNSAFE_componentWillMount() {
@@ -397,7 +399,9 @@
config = null
}
+ let _settingshow = this.state.settingshow
if (!config) {
+ _settingshow = true
config = {
version: 1.0,
uuid: MenuId,
@@ -442,6 +446,7 @@
window.GLOB.urlFields = config.urlFields || []
this.setState({
+ settingshow: _settingshow,
oriConfig: config,
config: fromJS(config).toJS()
})
@@ -1089,7 +1094,7 @@
}
render () {
- const { activeKey, comloading, MenuType, popBtn, visible, dict, MenuId, config, ParentId, MenuName, MenuNo, menuloading, customComponents } = this.state
+ const { activeKey, comloading, MenuType, popBtn, visible, dict, MenuId, config, settingshow, ParentId, MenuName, MenuNo, menuloading, customComponents } = this.state
return (
<ConfigProvider locale={_locale}>
@@ -1097,7 +1102,11 @@
<Header />
{!popBtn && !visible ? <DndProvider backend={HTML5Backend}>
<div className="menu-body">
- <div className="menu-setting">
+ <div className={'menu-setting ' + (!settingshow ? 'hidden' : '')}>
+ <div className="draw">
+ {settingshow ? <DoubleLeftOutlined onClick={() => this.setState({settingshow: false})}/> : null}
+ {!settingshow ? <DoubleRightOutlined onClick={() => this.setState({settingshow: true})}/> : null}
+ </div>
<Collapse accordion activeKey={activeKey} bordered={false} onChange={(key) => this.setState({activeKey: key})}>
{/* 鍩烘湰淇℃伅 */}
<Panel header={dict['mob.basemsg']} key="basedata">
@@ -1146,7 +1155,7 @@
</div>
<div className={'menu-view ' + (menuloading ? 'saving' : '')}>
<Card title={
- <div> {config && config.MenuName} </div>
+ <div style={{paddingLeft: '15px'}}> {config && config.MenuName} </div>
} bordered={false} extra={
<div>
<Versions MenuId={MenuId} open_edition={config ? config.open_edition : ''}/>
diff --git a/src/views/menudesign/index.scss b/src/views/menudesign/index.scss
index e8b1e83..b676532 100644
--- a/src/views/menudesign/index.scss
+++ b/src/views/menudesign/index.scss
@@ -27,11 +27,28 @@
width: 300px;
background: #ffffff;
box-shadow: 0px 2px 5px #bcbcbc;
- overflow-y: auto;
- overflow-x: hidden;
+ transition: left 0.3s;
+ .draw {
+ position: absolute;
+ z-index: 11;
+ background: #ffffff;
+ right: -20px;
+ top: 0px;
+ box-shadow: 0 0 1px #959595;
+ border-radius: 0 2px 2px 0px;
+
+ .anticon {
+ padding: 12px 3px;
+ }
+ }
> .ant-collapse {
+ height: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
background-color: #ffffff;
+ border-radius: 0px;
+ padding-bottom: 30px;
.ant-collapse-item.ant-collapse-item-active {
border-bottom: 1px solid #d9d9d9;
}
@@ -93,19 +110,27 @@
}
}
}
- .menu-setting::-webkit-scrollbar {
+ .menu-setting >.ant-collapse::-webkit-scrollbar {
width: 4px;
}
- .menu-setting::-webkit-scrollbar-thumb {
+ .menu-setting >.ant-collapse::-webkit-scrollbar-thumb {
border-radius: 5px;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.08);
background: rgba(0, 0, 0, 0.08);
}
- .menu-setting::-webkit-scrollbar-track {
+ .menu-setting >.ant-collapse::-webkit-scrollbar-track {
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.05);
border-radius: 3px;
border: 1px solid rgba(0, 0, 0, 0.07);
background: rgba(0, 0, 0, 0);
+ }
+
+ .menu-setting.hidden {
+ left: -300px;
+ }
+ .menu-setting.hidden + .menu-view {
+ width: 100vw;
+ margin-left: 0px;
}
.menu-view {
@@ -114,6 +139,7 @@
margin-left: 300px;
height: calc(100vh - 50px);
overflow-y: auto;
+ transition: all 0.3s;
> .ant-card {
>.ant-card-head {
--
Gitblit v1.8.0