From f3ec8c20eeabee6eaab1508d2f3896c28aab611c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 七月 2021 14:42:42 +0800
Subject: [PATCH] 修改页面中按钮保存
---
src/menu/components/share/logcomponent/index.jsx | 7
src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx | 12
src/menu/components/card/cardcellcomponent/index.jsx | 17
src/menu/components/card/table-card/index.jsx | 24 +
src/menu/components/group/groupcomponents/index.jsx | 44 --
src/mob/mobshell/index.jsx | 5
src/menu/components/carousel/prop-card/index.jsx | 24 +
src/utils/utils-custom.js | 75 ++--
src/menu/components/form/normal-form/index.jsx | 27 -
src/pc/menushell/index.jsx | 5
src/menu/components/card/data-card/index.jsx | 33 +
src/menu/components/share/actioncomponent/index.jsx | 12
src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx | 17 -
src/menu/components/tabs/tabcomponents/index.jsx | 5
src/menu/components/card/prop-card/index.jsx | 38 +-
src/menu/components/table/normal-table/columns/index.jsx | 24 +
src/views/mobdesign/index.jsx | 423 +++++++----------------------
src/menu/components/tabs/antv-tabs/index.jsx | 7
src/menu/menushell/index.jsx | 5
src/menu/components/carousel/data-card/index.jsx | 24 +
20 files changed, 303 insertions(+), 525 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 5fa02a8..e46935d 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -34,6 +34,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
elements: null, // 鎸夐挳缁�
@@ -63,9 +64,9 @@
}
componentDidMount () {
- MKEmitter.addListener('cardAddElement', this.cardAddElement)
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
+ MKEmitter.addListener('cardAddElement', this.cardAddElement)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -92,9 +93,9 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('cardAddElement', this.cardAddElement)
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
+ MKEmitter.removeListener('cardAddElement', this.cardAddElement)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
@@ -414,17 +415,14 @@
*/
deleteElement = (card) => {
const { cards, cardCell, side } = this.props
- const { dict, elements } = this.state
+ const { dict, elements, appType } = this.state
let _this = this
confirm({
content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
onOk() {
let _elements = elements.filter(item => item.uuid !== card.uuid)
-
- if (card.eleType === 'button') {
- MKEmitter.emit('delButtons', [card.uuid])
- }
+
if (card.OpenType === 'popview' || card.verify || card.modal) {
card.$parentId = cardCell.uuid
card.$side = side || ''
@@ -437,6 +435,11 @@
}, () => {
_this.props.updateElement(_elements)
})
+
+ if (card.eleType !== 'button') return
+ if (appType === 'mob' || (appType === 'pc' && card.OpenType !== 'popview')) return
+
+ MKEmitter.emit('delButtons', [card.uuid])
},
onCancel() {}
})
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 4b42656..5c85b95 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -194,6 +194,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -202,25 +203,31 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- cell.backElements && cell.backElements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
-
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
}
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+ cell.backElements && cell.backElements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index e9bff6e..e132a91 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -33,15 +33,16 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null,
back: false
}
UNSAFE_componentWillMount () {
const { card } = this.props
+ const { appType } = this.state
if (card.isNew) {
- let ismob = sessionStorage.getItem('appType') === 'mob'
let _card = {
uuid: card.uuid,
type: card.type,
@@ -63,7 +64,7 @@
scripts: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: { width: ismob ? 24 : 6, type: 'simple'},
+ setting: { width: appType === 'mob' ? 24 : 6, type: 'simple'},
style: {
borderWidth: '1px', borderColor: '#e8e8e8',
paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
@@ -195,6 +196,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -202,19 +204,6 @@
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- cell.backElements && cell.backElements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
@@ -222,6 +211,25 @@
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+ cell.backElements && cell.backElements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/card/table-card/index.jsx b/src/menu/components/card/table-card/index.jsx
index c9eb392..a7d5efe 100644
--- a/src/menu/components/card/table-card/index.jsx
+++ b/src/menu/components/card/table-card/index.jsx
@@ -173,6 +173,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -180,15 +181,6 @@
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
-
- MKEmitter.emit('delButtons', uuids)
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
@@ -196,6 +188,20 @@
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/carousel/data-card/index.jsx b/src/menu/components/carousel/data-card/index.jsx
index e69ebc9..9a3ab4f 100644
--- a/src/menu/components/carousel/data-card/index.jsx
+++ b/src/menu/components/carousel/data-card/index.jsx
@@ -30,6 +30,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null,
back: false
}
@@ -163,6 +164,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -171,20 +173,26 @@
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
-
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
}
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/carousel/prop-card/index.jsx b/src/menu/components/carousel/prop-card/index.jsx
index c3f565b..404d434 100644
--- a/src/menu/components/carousel/prop-card/index.jsx
+++ b/src/menu/components/carousel/prop-card/index.jsx
@@ -31,6 +31,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null,
back: false
}
@@ -180,6 +181,7 @@
* @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
*/
deleteCard = (cell) => {
+ const { appType } = this.state
let card = fromJS(this.state.card).toJS()
let _this = this
@@ -187,14 +189,6 @@
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
if (card.btnlog) {
card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
@@ -202,6 +196,20 @@
_this.setState({card})
_this.props.updateConfig(card)
+
+ if (appType === 'mob') return
+
+ let uuids = []
+
+ cell.elements && cell.elements.forEach(c => {
+ if (c.eleType !== 'button' || (appType === 'pc' && c.OpenType !== 'popview')) return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index 915753b..eae27ac 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -182,33 +182,6 @@
this.props.updateConfig(card)
}
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- deleteCard = (cell) => {
- let card = fromJS(this.state.card).toJS()
- let _this = this
-
- confirm({
- content: '纭畾鍒犻櫎琛ㄥ崟鍚楋紵',
- onOk() {
- card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
-
- _this.setState({card})
- _this.props.updateConfig(card)
- },
- onCancel() {}
- })
- }
-
changeStyle = () => {
const { card } = this.state
diff --git a/src/menu/components/group/groupcomponents/index.jsx b/src/menu/components/group/groupcomponents/index.jsx
index b35112f..ac14bfa 100644
--- a/src/menu/components/group/groupcomponents/index.jsx
+++ b/src/menu/components/group/groupcomponents/index.jsx
@@ -6,6 +6,7 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
+import MenuUtils from '@/utils/utils-custom.js'
import Card from './card'
import './index.scss'
@@ -38,49 +39,16 @@
const deleteCard = (id) => {
const { card } = findCard(id)
- let uuids = []
- if (card.action && card.action.length) {
- card.action.forEach(act => {
- if (!act.origin) {
- uuids.push(act.uuid)
- }
- })
- }
- if (card.type === 'card') {
- card.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- _card.backElements && _card.backElements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (card.type === 'table' && card.subtype === 'tablecard') {
- card.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (card.type === 'table' && card.subtype === 'normaltable') {
- card.cols && card.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements && col.elements.forEach(cell => {
- uuids.push(cell.uuid)
- })
- })
- }
+ let uuids = MenuUtils.getDelButtonIds(card)
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
onOk() {
- MKEmitter.emit('delButtons', uuids)
handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 7c9c615..32764df 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -32,6 +32,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
actionlist: null, // 鎸夐挳缁�
@@ -273,7 +274,7 @@
*/
deleteElement = (card) => {
const { config } = this.props
- const { dict } = this.state
+ const { dict, appType } = this.state
let _this = this
confirm({
@@ -282,10 +283,6 @@
let _actionlist = fromJS(_this.state.actionlist).toJS()
_actionlist = _actionlist.filter(item => item.uuid !== card.uuid)
-
- if (!card.origin) {
- MKEmitter.emit('delButtons', [card.uuid])
- }
let btnlog = config.btnlog || []
if (card.OpenType === 'popview' || card.verify || card.modal) {
@@ -297,6 +294,11 @@
}, () => {
_this.props.updateaction({...config, action: _actionlist, btnlog})
})
+
+ if (card.origin || appType === 'mob') return
+ if (appType === 'pc' && card.OpenType !== 'popview') return
+
+ MKEmitter.emit('delButtons', [card.uuid])
},
onCancel() {}
})
diff --git a/src/menu/components/share/logcomponent/index.jsx b/src/menu/components/share/logcomponent/index.jsx
index 570e93d..403d3bc 100644
--- a/src/menu/components/share/logcomponent/index.jsx
+++ b/src/menu/components/share/logcomponent/index.jsx
@@ -18,6 +18,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
visible: false,
data: [],
columns: [
@@ -69,11 +70,15 @@
}
revert = (item) => {
+ const { appType } = this.state
const data = this.state.data.filter(d => d.uuid !== item.uuid)
this.setState({data})
- MKEmitter.emit('thawButtons', item.uuid)
this.props.handlelog('revert', data, item)
+
+ if (appType === 'mob' || (appType === 'pc' && item.OpenType !== 'popview')) return
+
+ MKEmitter.emit('thawButtons', item.uuid)
}
handleDelete = (item) => {
diff --git a/src/menu/components/table/normal-table/columns/index.jsx b/src/menu/components/table/normal-table/columns/index.jsx
index 338f763..c88a996 100644
--- a/src/menu/components/table/normal-table/columns/index.jsx
+++ b/src/menu/components/table/normal-table/columns/index.jsx
@@ -179,6 +179,7 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ appType: sessionStorage.getItem('appType'),
tableId: '',
data: [{uuid: Utils.getuuid()}],
refresh: false, // 寮哄埗鍒锋柊
@@ -383,22 +384,29 @@
}
deleteCol = (col) => {
+ const { appType } = this.state
let _columns = fromJS(this.state.columns).toJS()
- _columns = this.loopDelCol(_columns, col)
- if (col.type === 'action') {
- let uuids = []
- col.elements && col.elements.forEach(c => {
- uuids.push(c.uuid)
- })
- MKEmitter.emit('delButtons', uuids)
- }
+ _columns = this.loopDelCol(_columns, col)
this.setState({
columns: _columns
}, () => {
this.props.updatecolumn({...this.props.config, cols: _columns})
})
+
+ if (col.type !== 'action' || appType === 'mob') return
+
+ let uuids = []
+ col.elements && col.elements.forEach(c => {
+ if (appType === 'pc' && c.OpenType !== 'popview') return
+
+ uuids.push(c.uuid)
+ })
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
}
updateLineMarks = (vals) => {
diff --git a/src/menu/components/tabs/antv-tabs/index.jsx b/src/menu/components/tabs/antv-tabs/index.jsx
index 8f64880..0cb7d7d 100644
--- a/src/menu/components/tabs/antv-tabs/index.jsx
+++ b/src/menu/components/tabs/antv-tabs/index.jsx
@@ -8,6 +8,7 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import DraggableTabs from './dragabletabs'
import { resetStyle } from '@/utils/utils-custom.js'
+import MenuUtils from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
@@ -249,12 +250,18 @@
tabs.subtabs = tabs.subtabs.filter(t => t.uuid !== tab.uuid)
+ let uuids = MenuUtils.getDelButtonIds({...tab, type: 'group'})
+
confirm({
title: '纭畾鍒犻櫎鏍囩锛�',
content: '',
onOk() {
_this.setState({tabs})
_this.props.updateConfig(tabs)
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index f25da70..412a698 100644
--- a/src/menu/components/tabs/tabcomponents/index.jsx
+++ b/src/menu/components/tabs/tabcomponents/index.jsx
@@ -54,8 +54,11 @@
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
- MKEmitter.emit('delButtons', uuids)
handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 308e390..7e03f6c 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -57,9 +57,12 @@
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
const _cards = cards.filter(item => item.uuid !== card.uuid)
- MKEmitter.emit('delButtons', uuids)
handleList({...menu, components: _cards})
setCards(_cards)
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index 3379a03..6ea4914 100644
--- a/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -84,20 +84,10 @@
const _this = this
confirm({
- title: (record.property === 'classify' && record.sublist.length > 0 ? '鑿滃崟涓嬪惈鏈夊瓙鑿滃崟锛�' : '') + '纭畾鍒犻櫎鍚楋紵',
+ title: '纭畾鍒犻櫎鍚楋紵',
content: '',
onOk() {
_this.setState({data: data.filter(item => item.MenuID !== record.MenuID)})
-
- // let uuids = [record.MenuID]
- // record.sublist && record.sublist.forEach(item => {
- // uuids.push(item.MenuID)
-
- // item.sublist && item.sublist.forEach(cell => {
- // uuids.push(cell.MenuID)
- // })
- // })
- // MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index 0552568..5cdb407 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -56,10 +56,13 @@
title: `纭畾鍒犻櫎${card.name ? `銆�${card.name}銆媊 : '缁勪欢'}鍚楋紵`,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
- MKEmitter.emit('delButtons', uuids)
const _cards = cards.filter(item => item.uuid !== card.uuid)
handleList({...menu, components: _cards})
setCards(_cards)
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
index d5a629a..a96ea84 100644
--- a/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/menusetting/menutable/index.jsx
@@ -97,7 +97,6 @@
let _data = _this.state.data.filter(item => item.MenuID !== record.MenuID)
_this.setState({data: _data})
_this.props.menuUpdate({...menu, sublist: _data})
- // MKEmitter.emit('delButtons', [record.MenuID])
},
onCancel() {}
})
@@ -263,12 +262,6 @@
let _data = _this.state.data.filter(item => item.MenuID !== record.MenuID)
_this.setState({data: _data})
_this.props.menuUpdate({...menu, sublist: _data})
-
- // let uuids = [record.MenuID]
- // record.sublist && record.sublist.forEach(item => {
- // uuids.push(item.MenuID)
- // })
- // MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -444,16 +437,6 @@
content: '',
onOk() {
_this.setState({data: data.filter(item => item.MenuID !== record.MenuID)})
-
- // let uuids = [record.MenuID]
- // record.sublist && record.sublist.forEach(item => {
- // uuids.push(item.MenuID)
-
- // item.sublist && item.sublist.forEach(cell => {
- // uuids.push(cell.MenuID)
- // })
- // })
- // MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index acc2b18..24e3910 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -56,10 +56,13 @@
title: `纭畾鍒犻櫎${card.name ? `銆�${card.name}銆媊 : '缁勪欢'}鍚楋紵`,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
- MKEmitter.emit('delButtons', uuids)
const _cards = cards.filter(item => item.uuid !== card.uuid)
handleList({...menu, components: _cards})
setCards(_cards)
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 43a7b75..058d369 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -244,7 +244,11 @@
* @return {String} name
*/
static getDelButtonIds (card) {
+ let appType = sessionStorage.getItem('appType')
let uuids = []
+
+ if (appType === 'mob') return uuids
+
const getUuids = (item) => {
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
@@ -257,48 +261,41 @@
getUuids(c)
})
} else {
- if (item.action && item.action.length > 0) {
- item.action.forEach(act => {
- if (!act.origin) {
- uuids.push(act.uuid)
- }
- })
- }
- if (item.type === 'card') {
- item.subcards.forEach(_card => {
+ item.action && item.action.forEach(act => {
+ if (act.origin || (appType === 'pc' && act.OpenType !== 'popview')) return
+
+ uuids.push(act.uuid)
+ })
+
+ if (card.type === 'card' || item.type === 'carousel' || (card.type === 'table' && card.subtype === 'tablecard')) {
+ card.subcards.forEach(_card => {
_card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- _card.backElements && _card.backElements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'carousel') {
- item.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'table' && item.subtype === 'tablecard') {
- item.subcards.forEach(_card => {
- _card.elements && _card.elements.forEach(cell => {
- if (cell.eleType === 'button') {
- uuids.push(cell.uuid)
- }
- })
- })
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
- item.cols && item.cols.forEach(col => {
- if (col.type !== 'action') return
- col.elements && col.elements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (appType === 'pc' && cell.OpenType !== 'popview') return
+
uuids.push(cell.uuid)
})
+ _card.backElements && _card.backElements.forEach(cell => {
+ if (cell.eleType !== 'button') return
+ if (appType === 'pc' && cell.OpenType !== 'popview') return
+
+ uuids.push(cell.uuid)
+ })
+ })
+ } else if (card.type === 'table' && card.subtype === 'normaltable') {
+ card.cols && card.cols.forEach(col => {
+ if (col.type !== 'action') return
+ col.elements && col.elements.forEach(cell => {
+ if (appType === 'pc' && cell.OpenType !== 'popview') return
+
+ uuids.push(cell.uuid)
+ })
+ })
+ } else if (card.type === 'balcony') {
+ card.elements && card.elements.forEach(cell => {
+ if (appType === 'pc' && cell.OpenType !== 'popview') return
+
+ uuids.push(cell.uuid)
})
}
}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 8638eb2..fc84f6d 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -59,9 +59,6 @@
MenuId: '',
MenuName: '',
MenuNo: '',
- delButtons: [],
- copyButtons: [],
- thawButtons: [],
activeKey: 'component',
menuloading: false,
oriConfig: null,
@@ -135,9 +132,6 @@
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
}
- MKEmitter.addListener('delButtons', this.delButtons)
- MKEmitter.addListener('thawButtons', this.thawButtons)
- MKEmitter.addListener('copyButtons', this.copyButtons)
MKEmitter.addListener('changeEditMenu', this.changeEditMenu)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.addListener('updateCustomComponent', this.updateCustomComponent)
@@ -156,9 +150,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('delButtons', this.delButtons)
- MKEmitter.removeListener('thawButtons', this.thawButtons)
- MKEmitter.removeListener('copyButtons', this.copyButtons)
MKEmitter.removeListener('changeEditMenu', this.changeEditMenu)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
MKEmitter.removeListener('updateCustomComponent', this.updateCustomComponent)
@@ -383,23 +374,6 @@
comloading: false
})
})
- }
-
- delButtons = (items) => {
- const { copyButtons, delButtons } = this.state
-
- this.setState({
- delButtons: [...delButtons, ...items],
- copyButtons: copyButtons.filter(item => !items.includes(item.uuid))
- })
- }
-
- copyButtons = (items) => {
- this.setState({copyButtons: [...this.state.copyButtons, ...items]})
- }
-
- thawButtons = (item) => {
- this.setState({thawButtons: [...this.state.thawButtons, item]})
}
closeView = () => {
@@ -693,35 +667,57 @@
getMenuMessage = () => {
const { config } = this.state
- let buttons = []
- let _sort = 1
-
+
let traversal = (components) => {
- components.forEach(item => {
+ let list = components.map(item => {
+ let m = {
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
if (item.type === 'tabs') {
+ let tabs = []
item.subtabs.forEach(tab => {
- traversal(tab.components)
+ let s = traversal(tab.components)
+
+ if (s.length === 0) return
+
+ tabs.push({
+ key: tab.uuid,
+ title: tab.label,
+ children: s
+ })
})
+
+ if (tabs.length > 0) {
+ m.children = tabs
+ }
} else if (item.type === 'group') {
- traversal(item.components)
+ m.children = traversal(item.components)
} else if (item.type === 'card' || (item.type === 'table' && item.subtype === 'tablecard')) {
item.action && item.action.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
})
item.subcards.forEach(card => {
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
})
card.backElements && card.backElements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
})
})
} else if (item.type === 'carousel') {
@@ -729,44 +725,65 @@
card.elements && card.elements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
})
})
} else if (item.type === 'balcony') {
item.elements && item.elements.forEach(cell => {
if (cell.eleType !== 'button') return
this.checkBtn(cell)
- buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: cell.uuid,
+ title: cell.label,
+ })
})
- } else if (item.type === 'line' || item.type === 'bar') {
- item.action && item.action.forEach(btn => {
- this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ } else if (item.type === 'menubar') {
+ if (item.wrap.title) {
+ m.title = item.wrap.title
+ }
+
+ m.children = item.subMenus.map(menu => {
+ return {
+ key: menu.uuid,
+ title: menu.setting.name
+ }
})
} else if (item.type === 'table' && item.subtype === 'normaltable') {
item.action && item.action.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
})
item.cols && item.cols.forEach(col => {
if (col.type !== 'action') return
col.elements.forEach(btn => {
this.checkBtn(btn)
- buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort`)
- _sort++
+ m.children.push({
+ key: btn.uuid,
+ title: btn.label,
+ })
})
})
}
+
+ if (m.children.length === 0) return null
+
+ return m
})
+
+ list = list.filter(Boolean)
+
+ return list
}
- traversal(config.components)
+ let trees = traversal(config.components)
- return buttons
+ return trees
}
checkBtn = (btn) => {
@@ -807,7 +824,6 @@
}
submitConfig = () => {
- const { delButtons, copyButtons, thawButtons } = this.state
let config = fromJS(this.state.config).toJS()
if (!config.MenuName || !config.MenuNo || (config.cacheUseful === 'true' && !config.cacheTime)) {
@@ -856,25 +872,9 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
- let btnParam = { // 娣诲姞鑿滃崟鎸夐挳
- func: 'sPC_Button_AddUpt',
- Type: 40, // 娣诲姞鑿滃崟涓嬬殑鎸夐挳type涓�40锛屾寜閽笅鐨勬寜閽畉ype涓�60
- ParentID: config.uuid,
- MenuNo: config.MenuNo,
- Template: 'webPage',
- PageParam: '',
- LongParam: '',
- LText: []
- }
-
- btnParam.LText = this.getMenuMessage()
- btnParam.LText = btnParam.LText.join(' union all ')
-
- let btnIds = btnParam.LText // 鐢ㄤ簬澶嶅埗鎸夐挳鐨勮繃婊�
-
- btnParam.LText = Utils.formatOptions(btnParam.LText)
- btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
+ let roleParam = {key: config.uuid, title: config.MenuName, children: []}
+ roleParam.children = this.getMenuMessage()
+ console.log(roleParam)
new Promise(resolve => {
let _config = fromJS(config).toJS()
@@ -927,87 +927,34 @@
_param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_param.secretkey = Utils.encrypt('', _param.timestamp)
- // let appMenuParam = null
- // if (item.type === 'navbar') {
- // appMenuParam = {
- // func: 's_appmenus_addupt',
- // exec_type: 'y'
- // }
-
- // appMenuParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- // appMenuParam.secretkey = Utils.encrypt('', _param.timestamp)
+ let roles = {
+ key: item.uuid,
+ title: item.name,
+ children: []
+ }
+
+ roles.children = item.menus.map(menu => {
+ return {
+ key: menu.MenuID,
+ title: menu.name
+ }
+ })
+ console.log(roles)
+
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ this.setState({ menuloading: false })
+ return
+ }
- // let LText = []
- // let app_param = []
- // let kei_no = sessionStorage.getItem('kei_no')
- // let userid = sessionStorage.getItem('CloudUserID') || ''
-
- // item.menus.forEach((fst, findex) => {
- // // LText.push(`select '${fst.MenuID}','${fst.name}','','0','${sessionStorage.getItem('appId')}','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
- // LText.push(`select '${fst.MenuID}','${fst.name}','','0','0','0','${(findex + 1) * 10}','10','','${userid}','${window.GLOB.appkey}','${fst.MenuNo || ''}','${kei_no}','pc'`)
- // app_param.push(`select '${window.GLOB.appkey}','${fst.MenuID}','${userid}','${(findex + 1) * 10}','','${fst.name}','${fst.MenuNo || ''}','0','10','${kei_no}','pc'`)
- // if (fst.property === 'classify' && fst.sublist.length > 0) {
- // fst.sublist.forEach(scd => {
- // LText.push(`select '${scd.MenuID}','${scd.name}','','0','${fst.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${scd.MenuNo || ''}','${kei_no}','pc'`)
- // app_param.push(`select '${window.GLOB.appkey}','${scd.MenuID}','${userid}','${(findex + 1) * 10}','','${scd.name}','${scd.MenuNo || ''}','${fst.MenuID}','20','${kei_no}','pc'`)
-
- // if (scd.property === 'classify' && scd.sublist.length > 0) {
- // scd.sublist.forEach(thd => {
- // LText.push(`select '${thd.MenuID}','${thd.name}','','0','${scd.MenuID}','0','${(findex + 1) * 10}','20','','${userid}','${window.GLOB.appkey}','${thd.MenuNo || ''}','${kei_no}','pc'`)
- // app_param.push(`select '${window.GLOB.appkey}','${thd.MenuID}','${userid}','${(findex + 1) * 10}','','${thd.name}','${thd.MenuNo || ''}','${scd.MenuID}','20','${kei_no}','pc'`)
- // })
- // }
- // })
- // }
- // })
- // appMenuParam.LText = Utils.formatOptions(LText.join(' union '))
- // appMenuParam.LText1 = Utils.formatOptions(app_param.join(' union '))
- // }
-
- // if (appMenuParam) {
- // Api.getSystemConfig(appMenuParam).then(_res => {
- // if (!_res.status) {
- // notification.warning({
- // top: 92,
- // message: _res.message,
- // duration: 5
- // })
- // this.setState({ menuloading: false })
- // return
- // }
-
- // Api.getSystemConfig(_param).then(res => {
- // if (!res.status) {
- // notification.warning({
- // top: 92,
- // message: res.message,
- // duration: 5
- // })
- // this.setState({ menuloading: false })
- // return
- // }
-
- // new_open_edition[item.uuid] = res.open_edition || ''
-
- // resolve()
- // })
- // })
- // } else {
- Api.getSystemConfig(_param).then(res => {
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- this.setState({ menuloading: false })
- return
- }
-
- new_open_edition[item.uuid] = res.open_edition || ''
- resolve()
- })
- // }
+ new_open_edition[item.uuid] = res.open_edition || ''
+ resolve()
+ })
})
})
Promise.all(deffers).then(() => {
@@ -1075,55 +1022,11 @@
}
})
}
- }).then(res => { // 鎸夐挳鎴栬彍鍗曞垹闄�
- if (!res) return
-
- if (delButtons.length === 0) {
- return { status: true, nonexec: true }
- } else {
- let appHomeId = sessionStorage.getItem('appHomeId')
- let _param = {
- func: 'sPC_MainMenu_Del',
- MenuID: delButtons.filter(id => id !== appHomeId).join(',')
- }
- return Api.getSystemConfig(_param)
- }
- }).then(res => { // 鎸夐挳瑙ｉ櫎鍐荤粨
- if (!res) return
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- } else if (!res.nonexec) { // 鎵ц鍒犻櫎鍚庡埛鏂拌彍鍗曞垪琛�
- this.getAppMenus()
- }
-
- let ids = thawButtons.filter(item => btnIds.indexOf(item) !== -1)
- if (ids.length === 0) {
- return { status: true }
- } else {
- return Api.getSystemConfig({
- func: 'sPC_MainMenu_ReDel',
- MenuID: ids.join(',')
- })
- }
}).then(res => { // 椤甸潰淇濆瓨
if (!res) return
- if (res.status) {
- return Api.getSystemConfig(param)
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
+ return Api.getSystemConfig(param)
+ }).then(res => {
if (!res) return
if (res.status) {
@@ -1132,122 +1035,6 @@
this.setState({
config,
oriConfig: fromJS(config).toJS(),
- })
-
- if (btnParam.LText) {
- return Api.getSystemConfig(btnParam)
- } else {
- return {
- status: true
- }
- }
- } else {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
- }).then(res => { // 鎸夐挳澶嶅埗
- if (!res) return
- if (!res.status) {
- notification.warning({
- top: 92,
- message: res.message,
- duration: 5
- })
- return false
- }
-
- if (copyButtons.length === 0) {
- return {
- status: true
- }
- } else {
- return new Promise(resolve => {
- let deffers = copyButtons.map(item => {
- return new Promise(resolve => {
- if (btnIds.indexOf(item.uuid) === -1) { // 澶嶅埗鐨勬寜閽凡鍒犻櫎
- resolve({
- status: true
- })
- return
- }
-
- Api.getSystemConfig({
- func: 'sPC_Get_LongParam',
- MenuID: item.$originUuid
- }).then(result => {
- if (result.status) {
- let _conf = ''
-
- try {
- _conf = result.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(result.LongParam))) : ''
- } catch (e) {
- console.warn('Parse Failure')
- _conf = ''
- }
-
- if (_conf) {
- _conf.components = MenuUtils.resetConfig(_conf.components)
- _conf.uuid = item.uuid
- _conf.MenuID = item.uuid
- _conf.Template = 'webPage'
- } else {
- resolve({
- status: true
- })
- return
- }
-
- let _param = {
- func: 'sPC_ButtonParam_AddUpt',
- ParentID: config.uuid,
- MenuID: item.uuid,
- MenuNo: '',
- Template: 'webPage',
- MenuName: item.label,
- PageParam: JSON.stringify({Template: 'webPage'}),
- LongParam: window.btoa(window.encodeURIComponent(JSON.stringify(_conf)))
- }
-
- Api.getSystemConfig(_param).then(response => {
- resolve(response)
- })
- }
- })
- })
- })
- Promise.all(deffers).then(result => {
- let error = null
- result.forEach(response => {
- if (!response.status) {
- error = response
- }
- })
-
- if (error) {
- notification.warning({
- top: 92,
- message: error.message,
- duration: 5
- })
- resolve(false)
- } else {
- resolve({
- status: true
- })
- }
- })
- })
- }
- }).then(res => {
- if (res && res.status) {
- this.setState({
- delButtons: [],
- copyButtons: [],
- thawButtons: [],
menuloading: false,
comloading: true
}, () => {
@@ -1255,12 +1042,18 @@
comloading: false
})
})
+
notification.success({
top: 92,
message: '淇濆瓨鎴愬姛',
duration: 2
})
} else {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
this.setState({
menuloading: false
})
--
Gitblit v1.8.0