From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/design/header/editfirstmenu/index.jsx | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/design/header/editfirstmenu/index.jsx b/src/views/design/header/editfirstmenu/index.jsx
index c565b22..add92a2 100644
--- a/src/views/design/header/editfirstmenu/index.jsx
+++ b/src/views/design/header/editfirstmenu/index.jsx
@@ -60,7 +60,7 @@
this.setState({
loading: true
})
- Api.getSystemConfig(param).then(res => {
+ Api.getCloudConfig(param).then(res => {
if (res.status) {
this.setState({
loading: false,
@@ -92,7 +92,7 @@
return
}
- let _this = this
+ let that = this
confirm({
title: `纭畾鍒犻櫎鑿滃崟銆�${item.MenuName}銆嬪悧锛焋,
content: '',
@@ -101,9 +101,9 @@
func: 'sPC_MainMenu_Del',
MenuID: item.MenuID
}
- return Api.getSystemConfig(param).then(res => {
+ return Api.getCloudConfig(param).then(res => {
if (res.status) {
- _this.props.reload()
+ that.props.reload()
} else {
notification.warning({
top: 92,
@@ -118,30 +118,32 @@
}
handleButton = (type) => {
+ const that = this
// 鑿滃崟缂栬緫锛氭坊鍔狅紝纭畾锛屽彇娑�
let _menuchange = !is(fromJS(this.state.menulist), fromJS(this.props.menulist))
if (type === 'confirm' && _menuchange) {
- let _this = this
let param = {
func: 'sPC_Menu_SortUpt',
+ exec_type: 'x',
LText: this.state.menulist.map((item, index) => {
return 'select \'' + item.MenuID + '\' as Menuid,' + (index + 1) * 10 + ' as sort'
})
}
- param.LText = param.LText.join(' union ') // sql鎷兼帴
- param.LText = Utils.formatOptions(param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- param.secretkey = Utils.encrypt(param.LText, param.timestamp) // md5瀵嗛挜
+ param.LText = param.LText.join(' union ')
+ param.LText = Utils.formatOptions(param.LText, 'x')
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ param.secretkey = Utils.encrypt('', param.timestamp)
confirm({
title: '纭璋冩暣鑿滃崟椤哄簭鍚楋紵',
content: '',
onOk() {
- return Api.getSystemConfig(param).then(res => {
+ return Api.getCloudConfig(param).then(res => {
if (res.status) {
- _this.props.reload()
+ that.setState({ change: false })
+ that.props.reload()
} else {
notification.warning({
top: 92,
@@ -154,13 +156,11 @@
onCancel() {}
})
} else if (type === 'cancel' && _menuchange) {
- let _this = this
-
confirm({
title: '鑿滃崟椤哄簭宸茶皟鏁达紝鏀惧純淇濆瓨鍚楋紵',
content: '',
onOk() {
- _this.props.exitEdit()
+ that.props.exitEdit()
},
onCancel() {}
})
--
Gitblit v1.8.0