From 17a178e8374d3a0a3da151b9472d77579811ad31 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 十一月 2024 16:37:06 +0800
Subject: [PATCH] 2024-11-18
---
src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx | 1
src/views/rolemanage/index.jsx | 18 --------
src/menu/components/card/cardcellcomponent/formconfig.jsx | 3 +
src/views/appmanage/index.jsx | 7 ---
src/components/normalform/modalform/mkTable/index.jsx | 15 -------
src/views/appmanage/transmenu/index.jsx | 2
src/menu/components/share/actioncomponent/formconfig.jsx | 3 +
src/views/mobdesign/index.jsx | 4 --
src/menu/components/card/cardcomponent/options.jsx | 10 ++--
src/mob/components/menubar/normal-menubar/menucomponent/options.jsx | 1
src/menu/components/card/cardcomponent/index.jsx | 32 +---------------
11 files changed, 16 insertions(+), 80 deletions(-)
diff --git a/src/components/normalform/modalform/mkTable/index.jsx b/src/components/normalform/modalform/mkTable/index.jsx
index 0ae8cfa..6c9d01f 100644
--- a/src/components/normalform/modalform/mkTable/index.jsx
+++ b/src/components/normalform/modalform/mkTable/index.jsx
@@ -220,21 +220,8 @@
changeMenu = (record) => {
let MenuId = record.menu
- if (MenuId === 'IM') {
- if (!sessionStorage.getItem('instantMessage')) return
- let param = {
- MenuID: sessionStorage.getItem('instantMessage'),
- copyMenuId: '',
- type: 'view'
- }
-
- param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
-
- MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
- } else {
- MKEmitter.emit('changeEditMenu', { ...record, MenuID: MenuId})
- }
+ MKEmitter.emit('changeEditMenu', { ...record, MenuID: MenuId})
}
isEditing = record => record.uuid === this.state.editingKey
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 99d6305..55eb030 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -124,6 +124,9 @@
} else {
appMenus = []
}
+ // if (appType === 'mob') {
+ // appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+ // }
appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
}
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 823a4b6..ce42f87 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -417,42 +417,14 @@
const { card, appType } = this.state
if (card.setting.click === 'menu' && card.setting.menu) {
- if (['IM'].includes(card.setting.menu)) {
- if (!sessionStorage.getItem('instantMessage')) return
-
- let param = {
- MenuID: sessionStorage.getItem('instantMessage'),
- copyMenuId: '',
- type: 'view'
- }
-
- param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
-
- MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
- } else {
- MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
- }
+ MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
} else if (card.setting.click === 'menus' && card.menus && card.menus.length > 0 && cards.subtype === 'datacard' && appType) {
this.setState({visible: true})
}
}
changeMenu = (MenuId) => {
- if (MenuId === 'IM') {
- if (!sessionStorage.getItem('instantMessage')) return
-
- let param = {
- MenuID: sessionStorage.getItem('instantMessage'),
- copyMenuId: '',
- type: 'view'
- }
-
- param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
-
- MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
- } else {
- MKEmitter.emit('changeEditMenu', {MenuID: MenuId})
- }
+ MKEmitter.emit('changeEditMenu', {MenuID: MenuId})
}
render() {
diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx
index 28d5b82..5e985e1 100644
--- a/src/menu/components/card/cardcomponent/options.jsx
+++ b/src/menu/components/card/cardcomponent/options.jsx
@@ -18,11 +18,11 @@
} else {
menulist = []
}
- if (appType === 'mob' && (subtype === 'datacard' || subtype === 'propcard') && cardType !== 'extendCard') { // 鏁版嵁鍗″彲鎵撳紑鍗虫椂閫氫俊
- menulist.push({
- value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'
- })
- }
+ // if (appType === 'mob' && (subtype === 'datacard' || subtype === 'propcard') && cardType !== 'extendCard') { // 鏁版嵁鍗″彲鎵撳紑鍗虫椂閫氫俊
+ // menulist.push({
+ // value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'
+ // })
+ // }
} else {
menulist = sessionStorage.getItem('fstMenuList')
if (menulist) {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 28a24bd..b2c5d4b 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -187,6 +187,9 @@
} else {
appMenus = []
}
+ // if (appType === 'mob') {
+ // appMenus.push({value: 'sign', text: '绛惧悕锛堢郴缁熼〉锛�'})
+ // }
appMenus.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
} else {
menulist = sessionStorage.getItem('fstMenuList')
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index eace136..c8ead06 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -108,7 +108,6 @@
extendName: 'MenuNo',
options: [
...menulist,
- // {value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'},
{value: 'AIService', label: '鏅鸿兘瀹㈡湇锛堢郴缁熼〉锛�'}
]
},
diff --git a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
index bb3818d..a8d4381 100644
--- a/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menus/menuform/index.jsx
@@ -149,7 +149,6 @@
option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
>
{appMenus.map(item => (<Select.Option key={item.MenuID} extend={item.MenuNo || ''} value={item.MenuID}>{item.MenuName}</Select.Option>))}
- {/* <Select.Option key="IM" value="IM">鍗虫椂閫氫俊锛堢郴缁熼〉锛�</Select.Option> */}
<Select.Option key="AIService" extend={''} value="AIService">鏅鸿兘瀹㈡湇锛堢郴缁熼〉锛�</Select.Option>
</Select>
)}
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 8781fbf..76ce934 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -495,7 +495,6 @@
}
cell.userbind = _param.userbind || ''
- cell.instantMessage = _param.instantMessage || ''
}
if (cell.user_binding !== 'true') {
@@ -670,7 +669,6 @@
sublist = sublist.map(item => {
if (item.typename !== 'pc') {
item.userbind = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{8}/, 'userbind')
- item.instantMessage = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{14}/, 'instantmessage')
}
return item
})
@@ -951,7 +949,6 @@
selectApp.sublist = selectApp.sublist.map(item => {
if (item.typename !== 'pc') {
item.userbind = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{8}/, 'userbind')
- item.instantMessage = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{14}/, 'instantmessage')
}
return item
})
@@ -1005,9 +1002,6 @@
}
if (item.userbind) {
_par.userbind = item.userbind
- }
- if (item.instantMessage) {
- _par.instantMessage = item.instantMessage
}
if (item.apptype) {
_par.apptype = item.apptype
@@ -1098,7 +1092,6 @@
sublist = sublist.map(item => {
if (item.typename !== 'pc') {
item.userbind = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{8}/, 'userbind')
- item.instantMessage = md5(selectApp.kei_no + item.typename + item.lang).replace(/^.{14}/, 'instantmessage')
}
return item
})
diff --git a/src/views/appmanage/transmenu/index.jsx b/src/views/appmanage/transmenu/index.jsx
index 52f0433..a70592a 100644
--- a/src/views/appmanage/transmenu/index.jsx
+++ b/src/views/appmanage/transmenu/index.jsx
@@ -97,7 +97,7 @@
if (result.status) {
let menus = []
result.menus.forEach(item => {
- if (zhApp.userbind === item.MenuID || zhApp.instantMessage === item.MenuID) return
+ if (zhApp.userbind === item.MenuID) return
menus.push(item)
})
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 4a44a02..dab7a68 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -114,7 +114,6 @@
sessionStorage.setItem('sysBgColor', param.sysBgColor || '#ffffff')
sessionStorage.setItem('direction', param.direction || 'vertical')
sessionStorage.setItem('userbind', param.userbind || '')
- sessionStorage.setItem('instantMessage', param.instantMessage || '')
if (param.applangList) {
sessionStorage.setItem('applangList', param.applangList)
@@ -765,9 +764,6 @@
// if (sessionStorage.getItem('userbind')) {
// appIndeList = appIndeList + ',' + sessionStorage.getItem('userbind')
// }
- if (sessionStorage.getItem('instantMessage')) {
- appIndeList = appIndeList + ',' + sessionStorage.getItem('instantMessage')
- }
let menus = res.menus.filter(item => appIndeList.indexOf(item.MenuID) === -1)
menus = menus.map(item => {
diff --git a/src/views/rolemanage/index.jsx b/src/views/rolemanage/index.jsx
index 80bcd8a..736c83f 100644
--- a/src/views/rolemanage/index.jsx
+++ b/src/views/rolemanage/index.jsx
@@ -148,7 +148,6 @@
Api.getCloudConfig(param).then(result => {
if (result.status) {
let ub = app.user_binding === 'true' && app.userbind ? false : true
- let im = app.instantMessage ? false : true
let menus = result.menus.map(item => {
item.nodes = ''
@@ -166,15 +165,13 @@
item.type = pageParam.type
}
- if (item.type === 'navbar' || item.type === 'im') {
+ if (item.type === 'navbar') {
item.backend = 'level1'
}
if (pageParam.version !== '1.0') {
item.nodes = ''
} else if (pageParam.login || pageParam.pass) {
- item.nodes = ''
- } else if (pageParam.type === 'im') {
item.nodes = ''
}
} catch (e) {
@@ -188,17 +185,10 @@
item.extra = true
ub = true
}
- if (app.instantMessage === item.MenuID) {
- item.extra = true
- im = true
- }
return item
})
- if (!im) {
- menus.push({nodes: '', type: 'none', backend: 'level1', extra: true, MenuID: app.instantMessage, MenuName: '鍗虫椂閫氫俊'})
- }
if (!ub) {
menus.push({nodes: '', type: 'none', backend: 'level1', extra: true, MenuID: app.userbind, MenuName: '鐢ㄦ埛缁戝畾'})
}
@@ -554,8 +544,6 @@
item.nodes = ''
} else if (pageParam.login || pageParam.pass) {
item.nodes = ''
- } else if (pageParam.type === 'im') {
- item.nodes = ''
}
} catch (e) {
item.nodes = ''
@@ -893,10 +881,6 @@
duration: 5
})
return
- }
-
- if (app.instantMessage && item.MenuID === app.instantMessage) {
- route = 'imdesign'
}
window.open(window.location.href.replace(/#.+/ig, `#/${route}/${window.btoa(window.encodeURIComponent(JSON.stringify({...app, MenuID: item.MenuID, type: 'app'})))}`))
--
Gitblit v1.8.0