From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/navbar/normal-navbar/menus/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/mob/components/navbar/normal-navbar/menus/index.jsx b/src/mob/components/navbar/normal-navbar/menus/index.jsx
index 43e0e28..e1c5951 100644
--- a/src/mob/components/navbar/normal-navbar/menus/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/menus/index.jsx
@@ -114,7 +114,7 @@
}
if (editMenu.MenuID && editMenu.property === 'menu' && res.property !== 'menu') {
- const _this = this
+ const that = this
confirm({
content: '鑿滃崟灏嗚閲嶇疆锛岀‘瀹氫慨鏀瑰悧锛�',
onOk() {
@@ -124,8 +124,8 @@
}
return item
})
- _this.setState({menus: _menus, editMenu: null, visible: false}, () => {
- _this.props.updateConfig(_menus)
+ that.setState({menus: _menus, editMenu: null, visible: false}, () => {
+ that.props.updateConfig(_menus)
})
},
onCancel() {}
@@ -143,17 +143,17 @@
*/
deleteElement = (card) => {
const { menus } = this.state
- let _this = this
+ let that = this
confirm({
content: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
onOk() {
let _menus = menus.filter(item => item.MenuID !== card.MenuID)
- _this.setState({
+ that.setState({
menus: _menus
}, () => {
- _this.props.updateConfig(_menus)
+ that.props.updateConfig(_menus)
})
},
onCancel() {}
@@ -161,7 +161,7 @@
}
render() {
- const { columns } = this.props
+ const { columns, datatype } = this.props
const { menus, visible, editMenu } = this.state
return (
@@ -184,6 +184,7 @@
<ElementForm
menu={editMenu}
cols={columns}
+ datatype={datatype}
inputSubmit={this.handleSubmit}
wrappedComponentRef={(inst) => this.menuFormRef = inst}
/>
--
Gitblit v1.8.0