From 80d36d8c53986b30e7fbf55924023d81a3edb4db Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:00 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/index.js | 32 +++--
src/views/sso/index.jsx | 19 ++-
src/tabviews/zshare/actionList/funczip/index.jsx | 8
src/views/design/header/index.jsx | 13 +-
src/views/printTemplate/index.jsx | 8
src/views/pcdesign/index.jsx | 6
src/tabviews/zshare/topSearch/index.jsx | 87 ++++++++++++----
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 16 +-
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 14 ++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 12 +-
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 3
src/tabviews/zshare/actionList/printbutton/index.jsx | 4
src/api/index.js | 6
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4
src/views/mobdesign/index.jsx | 6
src/views/design/sidemenu/thdmenuplus/index.jsx | 6
src/utils/utils.js | 20 ----
src/views/login/index.jsx | 20 ++-
18 files changed, 163 insertions(+), 121 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index e01aca6..ff77975 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -631,7 +631,7 @@
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
- return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
+ return Promise.resolve({ErrCode: 'S', LongParam: '', message: '', status: false})
}
}
@@ -735,7 +735,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
+ _resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
}
if (!token) return
@@ -838,7 +838,7 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
+ return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
diff --git a/src/index.js b/src/index.js
index df31aa8..be1891c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -168,6 +168,16 @@
GLOB.navBar = _systemMsg.navBar || 'shutter'
GLOB.appVersion = _systemMsg.app_version || ''
+ let levels = [30, 10, 20, 40, 50, 60, 70, 80, 90, 100]
+
+ levels.some(m => {
+ if (_systemMsg.Member_Level === md5('mksoft' + GLOB.appkey + m)) {
+ GLOB.memberLevel = m
+ return true
+ }
+ return false
+ })
+
if (GLOB.favicon) {
let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
link.type = 'image/x-icon'
@@ -223,19 +233,6 @@
let lang = localStorage.getItem(_href + 'lang') || (config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
sessionStorage.setItem('lang', lang)
- let _level = 0
- let _Mlevel = sessionStorage.getItem('Member_Level')
-
- if (_Mlevel) {
- if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
- _level = 10
- } else if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
- _level = 20
- } else if (_Mlevel === md5('mksoft' + GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
- _level = 30
- }
- }
- GLOB.memberLevel = _level
GLOB.mkThdMenus = [] // 涓夌骇鑿滃崟
GLOB.mkActions = {} // 鎸夐挳鏉冮檺闆�
@@ -268,6 +265,15 @@
value: GLOB.cloudServiceApi || ''
})
+ if (GLOB.memberLevel) {
+ Object.defineProperty(GLOB, 'memberLevel', {
+ writable: false,
+ value: GLOB.memberLevel
+ })
+ } else {
+ GLOB.memberLevel = 0
+ }
+
if (GLOB.sysType === 'cloud') {
Object.defineProperty(GLOB, 'debugger', {
writable: false,
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 10f41bf..71db29c 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1727,12 +1727,12 @@
if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || '鎵ц鎴愬姛',
+ message: res.message || '鎵ц鎴愬姛',
duration: submit.stime ? submit.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || '鎵ц鎴愬姛'
+ title: res.message || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -1768,23 +1768,23 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: submit.ntime ? submit.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: submit.ftime ? submit.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
this.setState({
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 2a9e4a7..6764de0 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -526,7 +526,8 @@
}).then(response => {
if (!response || response.ErrCode === 'LoginError') return
// 鍥炶皟璇锋眰
- if (ver_token && response.ErrMesg === 'token_error') {
+ if (ver_token && response.ErrCode === 'token_error') {
+ response.ErrCode = 'E'
this.execError(response)
} else if (btn.callbackFunc ) {
// 瀛樺湪鍥炶皟鍑芥暟鏃讹紝璋冪敤
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 6da5dc4..c1df199 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -292,7 +292,7 @@
}
if (error) {
- this.execError({ErrCode: 'E', ErrMesg: error})
+ this.execError({ErrCode: 'E', message: error})
return
}
@@ -312,7 +312,7 @@
if (datas.length > 0) {
this.addUser(ip, datas, sessionId)
} else {
- this.execSuccess({ErrCode: 'S', ErrMesg: '鎵ц鎴愬姛銆�'})
+ this.execSuccess({ErrCode: 'S', message: '鎵ц鎴愬姛銆�'})
}
}, (err) => {
this.execPreError(err, data)
@@ -333,12 +333,12 @@
if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || '鎵ц鎴愬姛',
+ message: res.message || '鎵ц鎴愬姛',
duration: btn.verify && btn.verify.stime ? btn.verify.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || '鎵ц鎴愬姛'
+ title: res.message || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -409,23 +409,23 @@
if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
this.setState({
diff --git a/src/tabviews/zshare/actionList/funczip/index.jsx b/src/tabviews/zshare/actionList/funczip/index.jsx
index 28d6ed2..cf511b5 100644
--- a/src/tabviews/zshare/actionList/funczip/index.jsx
+++ b/src/tabviews/zshare/actionList/funczip/index.jsx
@@ -381,23 +381,23 @@
return
} else if (res.ErrCode === 'E') {
Modal.error({
- title: res.message || res.ErrMesg,
+ title: res.message || '鎵ц澶辫触锛�',
})
} else if (res.ErrCode === 'N') {
notification.error({
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
- message: res.message || res.ErrMesg,
+ message: res.message || '鎵ц澶辫触锛�',
duration: 10
})
} else if (res.ErrCode === 'NM') {
- message.error(res.message || res.ErrMesg)
+ message.error(res.message || '鎵ц澶辫触锛�')
}
if (btn.execError !== 'never') {
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index a5c366c..2a39aab 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1438,7 +1438,6 @@
result.status = false
result.message = result.$ErrMesg
result.ErrCode = 'E'
- result.ErrMesg = result.$ErrMesg
} else {
result.status = result.status !== false
result.ErrCode = result.ErrCode || '-1'
@@ -1890,7 +1889,8 @@
Api.genericInterface(result).then(res => {
if (!res) return // LoginError鏃朵腑鏂姹�
- if (ver_token && res.ErrMesg === 'token_error') {
+ if (ver_token && res.ErrCode === 'token_error') {
+ res.ErrCode = 'E'
this.execError(res)
return
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index db4fd6a..bf0fe1b 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -405,7 +405,6 @@
errorMsg = {
ErrCode: 'N',
message: _temp.error,
- ErrMesg: _temp.error,
status: false
}
} else {
@@ -1264,7 +1263,8 @@
}).then(response => {
if (!response || response.ErrCode === 'LoginError') return
- if (ver_token && response.ErrMesg === 'token_error') {
+ if (ver_token && response.ErrCode === 'token_error') {
+ response.ErrCode = 'E'
this.execError(response)
_resolve({next: false, list: []})
} else if (btn.callbackFunc) {
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 11d86ec..9c97e94 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -114,22 +114,11 @@
if (item.advanced && !forbid) {
_setting.showAdv = true
+ if (!['group', 'check', 'switch'].includes(item.type)) {
+ item.signValue = true
+ }
} else {
item.advanced = false
- }
-
- if (item.advanced && item.initval) {
- let val = item.initval
- if (item.precision === 'hour') {
- if (/,/ig.test(val)) {
- val = val.split(',').map(m => m + ':00').join(',')
- } else {
- val = val + ':00'
- }
- }
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
- }
}
if (item.type === 'group') {
@@ -179,6 +168,29 @@
if (item.type === 'checkcard' && item.multiple === 'dropdown' && item.resourceType === '0') {
this.resetCheckcard(item)
}
+ }
+
+ if (item.signValue && item.initval) {
+ let val = item.initval
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
+ }
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
fieldMap.set(item.field, item)
@@ -621,7 +633,7 @@
if (visible) {
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -632,9 +644,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
this.setState({advanceValues})
@@ -720,7 +741,7 @@
} else {
record[item.field] = item.initval
}
- if (item.advanced && item.initval) {
+ if (item.signValue && item.initval) {
let val = item.initval
if (item.precision === 'hour') {
if (/,/ig.test(val)) {
@@ -729,9 +750,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
return item
@@ -835,7 +865,7 @@
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -846,9 +876,18 @@
val = val + ':00'
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
@@ -886,7 +925,7 @@
return (
<div key={index}>
<span>{item.label}: </span>
- <span className="advance-value">{item.value}</span>
+ <span className="advance-value">{item.text}</span>
<CloseOutlined onClick={() => this.closeAdvanceForm(item)} />
</div>)
})}
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index b5bd01f..081c790 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form, Switch, Radio, Checkbox } from 'antd'
import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -113,6 +113,18 @@
} else if (card.type === 'checkcard') {
type = 'checkcard'
formItem = <CheckCard config={card} />
+ } else if (card.type === 'switch') {
+ formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} checked={card.initval === card.openVal}/>)
+ } else if (card.type === 'radio') {
+ let options = card.options
+ if (options.length === 0) {
+ options = [{Value: '1', Text: '閫夐」1'}, {Value: '2', Text: '閫夐」2'}]
+ }
+ formItem = (<Radio.Group value={card.initval} style={{lineHeight: '36px'}}>
+ {options.map((item, i) => (<Radio key={i} value={item.Value}> {item.Text} </Radio>))}
+ </Radio.Group>)
+ } else if (card.type === 'check') {
+ formItem = <Checkbox style={{lineHeight: '36px'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox>
}
let labelwidth = card.labelwidth || 33.3
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c216d77..77e646d 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -39,26 +39,6 @@
export default class Utils {
/**
- * @description 鑾峰彇浼氬憳绛夌骇
- * @return {String} level
- */
- static getMemberLevel () {
- let _level = 10
- let _Mlevel = sessionStorage.getItem('Member_Level')
-
- if (_Mlevel) {
- if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 10)) {
- _level = 10
- } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 20)) {
- _level = 20
- } else if (_Mlevel === md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + 30)) {
- _level = 30
- }
- }
- return _level
- }
-
- /**
* @description 鑾峰彇鍥捐〃楂樺害
*/
static getHeight (val) {
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index 6908e81..aac2998 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -23,7 +23,6 @@
menulist: null, // 涓�绾ц彍鍗�
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
- memberLevel: Utils.getMemberLevel(),
visible: false,
loading: false
}
@@ -154,7 +153,7 @@
trdItem.PageParam = {OpenType: 'newtab'}
}
- if (trdItem.type === 'CustomPage' && this.state.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
+ if (trdItem.type === 'CustomPage' && window.GLOB.memberLevel < 20) { // 浼氬憳绛夌骇澶т簬绛変簬20鏃讹紝鏈夌紪杈戞潈闄�
trdItem.forbidden = true
}
@@ -407,7 +406,7 @@
render () {
const { mainMenu, editLevel } = this.props
- const { menulist, memberLevel, visible, loading } = this.state
+ const { menulist, visible, loading } = this.state
return (
<header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
@@ -449,7 +448,7 @@
<div className="icon"><HomeOutlined /></div>
<div className="title">棣栭〉</div>
<div className="detail">鍩轰簬鑷畾涔夐〉闈㈢殑棣栭〉璁捐锛屽彲瀹炵幇鐏垫椿鐨勫厓绱犻厤缃強鏍峰紡璋冩暣锛屽睍鐜板綋鍓嶇郴缁熺殑椋庢牸銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/menudesign/JTdCJTIyTWVudVR5cGUlMjIlM0ElMjJob21lJTIyJTJDJTIyTWVudUlkJTIyJTNBJTIyaG9tZV9wYWdlX2lkJTIyJTJDJTIyTWVudU5hbWUlMjIlM0ElMjIlRTklQTYlOTYlRTklQTElQjUlMjIlN0Q=')}}>
缂栬緫
</Button>
</div> : null
@@ -458,7 +457,7 @@
<div className="icon"><ApiOutlined /></div>
<div className="title">鎺ュ彛璋冭瘯</div>
<div className="detail">鍙嚜鍔ㄥ鐞嗙櫥褰曟帴鍙ｇ殑鍙傛暟鍔犲瘑锛屼互鍙婁笟鍔℃帴鍙ｇ殑绛惧悕璁＄畻锛屾柟渚垮紑鍙戜汉鍛樼殑鎺ュ彛娴嬭瘯宸ヤ綔銆�</div>
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/interface')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/interface')}}>
缂栬緫
</Button>
</div>
@@ -467,10 +466,10 @@
<div className="title">搴旂敤绠＄悊</div>
<div className="detail">鍙垱寤哄強绠＄悊PC銆乸ad鍙婄Щ鍔ㄧ绛変笉鍚岃澶囩殑搴旂敤锛屽疄鐜版槑绉戜簯APP銆佸井淇″叕浼楀彿銆佸皬绋嬪簭绛夊骞冲彴鐨勫簲鐢ㄥ叡浜��</div>
{window.GLOB.systemType !== 'production' ?
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appmanage')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/appmanage')}}>
缂栬緫
</Button> :
- <Button type="primary" disabled={!(memberLevel >= 20)} title={memberLevel >= 20 ? '' : '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'} onClick={() => {window.open('#/appcheck')}}>
+ <Button type="primary" disabled={window.GLOB.memberLevel < 20} title={window.GLOB.memberLevel < 20 ? '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��' : ''} onClick={() => {window.open('#/appcheck')}}>
鏌ョ湅
</Button>
}
diff --git a/src/views/design/sidemenu/thdmenuplus/index.jsx b/src/views/design/sidemenu/thdmenuplus/index.jsx
index 7131595..3033939 100644
--- a/src/views/design/sidemenu/thdmenuplus/index.jsx
+++ b/src/views/design/sidemenu/thdmenuplus/index.jsx
@@ -49,7 +49,7 @@
getUsedTemplate = () => {
let { sysTemplates } = this.state
- let memberLevel = Utils.getMemberLevel()
+
const illust = { // 妯℃澘鍥剧墖锛岀敤浜庡凡浣跨敤妯℃澘
BaseTable: mainsubtable,
TreePage: treepage,
@@ -63,7 +63,7 @@
res.UserTemp.forEach(temp => {
if (!['BaseTable', 'CustomPage'].includes(temp.Template)) {
return
- } else if (temp.Template === 'CustomPage' && memberLevel < 20) {
+ } else if (temp.Template === 'CustomPage' && window.GLOB.memberLevel < 20) {
temp.disabled = true
temp.disTitle = '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'
}
@@ -80,7 +80,7 @@
})
sysTemplates = sysTemps.map(temp => {
- if (temp.type === 'CustomPage' && memberLevel < 20) {
+ if (temp.type === 'CustomPage' && window.GLOB.memberLevel < 20) {
temp.disabled = true
temp.disTitle = '浼氬憳绛夌骇涓嶅锛屾棤寮�鍙戞潈闄愩��'
}
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index b0a2552..7b61e91 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -613,7 +613,18 @@
showline: res.split_line_show || 'true',
webSite: res.WebSite || '',
navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤�
- app_version: res.app_version
+ app_version: res.app_version,
+ Member_Level: 0
+ }
+
+ if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
+ systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
+ if (!window.GLOB.memberLevel) {
+ Object.defineProperty(window.GLOB, 'memberLevel', {
+ writable: false,
+ value: res.member_level
+ })
+ }
}
let level = res.pwd_level || ''
@@ -701,13 +712,6 @@
link.rel = 'shortcut icon'
link.href = res.titlelogo
document.getElementsByTagName('head')[0].appendChild(link)
- }
-
- let memberLevel = res.member_level
-
- if (typeof(memberLevel) === 'number' && memberLevel > 0 && parseInt(memberLevel / 10) * 10 === memberLevel) {
- sessionStorage.setItem('Member_Level', md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + memberLevel))
- window.GLOB.memberLevel = memberLevel
}
// positecgroup
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 9b01279..7db3469 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -57,8 +57,6 @@
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
-const memberLevel = Utils.getMemberLevel()
-
class MobDesign extends Component {
state = {
loading: true,
@@ -94,7 +92,7 @@
return
}
- if (memberLevel < 30) return
+ if (window.GLOB.memberLevel < 30) return
window.GLOB.developing = true
@@ -157,7 +155,7 @@
componentDidMount () {
if (!sessionStorage.getItem('UserID')) return
- if (memberLevel < 30) {
+ if (window.GLOB.memberLevel < 30) {
document.getElementById('mk-mob-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">鏈簲鐢ㄦ病鏈塒C绔〉闈㈢殑缂栬緫鏉冮檺锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 79bb8c8..2c136f0 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -52,8 +52,6 @@
sessionStorage.setItem('typename', 'pc')
document.body.className = ''
-const memberLevel = Utils.getMemberLevel()
-
class MenuDesign extends Component {
state = {
loading: true,
@@ -87,7 +85,7 @@
return
}
- if (memberLevel < 30) return
+ if (window.GLOB.memberLevel < 30) return
sessionStorage.setItem('editMenuType', 'menu') // 缂栬緫鑿滃崟绫诲瀷
@@ -137,7 +135,7 @@
componentDidMount () {
if (!sessionStorage.getItem('UserID')) return
- if (memberLevel < 30) {
+ if (window.GLOB.memberLevel < 30) {
document.getElementById('mk-pc-design-view').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh; height: 100vh; background: #fff;">鏈簲鐢ㄦ病鏈塒C绔〉闈㈢殑缂栬緫鏉冮檺锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx
index 3375efd..39c625f 100644
--- a/src/views/printTemplate/index.jsx
+++ b/src/views/printTemplate/index.jsx
@@ -413,7 +413,7 @@
} else {
notification.warning({
top: 92,
- message: result.ErrMesg,
+ message: result.message,
duration: 5
})
}
@@ -489,7 +489,7 @@
if (error) {
notification.warning({
top: 92,
- message: error.ErrMesg,
+ message: error.message,
duration: 5
})
return
@@ -787,7 +787,7 @@
} else {
notification.warning({
top: 92,
- message: result.ErrMesg,
+ message: result.message,
duration: 5
})
this.setState({
@@ -814,7 +814,7 @@
} else {
notification.warning({
top: 92,
- message: res.ErrMesg,
+ message: res.message,
duration: 5
})
}
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index 053eaf1..48b2474 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -82,7 +82,18 @@
showline: res.split_line_show || 'true',
webSite: res.WebSite || '',
navBar: res.menu_type,
- app_version: res.app_version
+ app_version: res.app_version,
+ Member_Level: 0
+ }
+
+ if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
+ systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
+ if (!window.GLOB.memberLevel) {
+ Object.defineProperty(window.GLOB, 'memberLevel', {
+ writable: false,
+ value: res.member_level
+ })
+ }
}
let level = res.pwd_level || ''
@@ -133,12 +144,6 @@
document.getElementsByTagName('head')[0].appendChild(link)
}
- let memberLevel = res.member_level
-
- if (typeof(memberLevel) === 'number' && memberLevel > 0 && parseInt(memberLevel / 10) * 10 === memberLevel) {
- sessionStorage.setItem('Member_Level', md5('mksoft' + window.GLOB.appkey + new Date().getFullYear() + new Date().getMonth() + memberLevel))
- window.GLOB.memberLevel = memberLevel
- }
this.props.history.replace('/main')
} else {
notification.warning({
--
Gitblit v1.8.0