From f2acacad2b7ff966165a05df708f844f0a96be66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 十月 2024 17:03:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/menudesign/index.jsx | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 08d59ff..ae6e8cd 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -808,6 +808,10 @@
delete config.force
}
+ if (config.MenuID === 'home_page_id' || MenuType === 'billPrint') {
+ config.permission = 'false'
+ }
+
let long_data = ''
if (config.enabled) {
let sqls = getAllSqls(config)
@@ -822,20 +826,20 @@
}
long_data = []
- let oriIds = {}
- if (config.allSqls) {
- config.allSqls.forEach(item => {
- if (!item.md5) return
- oriIds[item.uuid + item.md5] = item.v_id
- })
- }
+ // let oriIds = {}
+ // if (config.allSqls) {
+ // config.allSqls.forEach(item => {
+ // if (!item.md5) return
+ // oriIds[item.uuid + item.md5] = item.v_id
+ // })
+ // }
config.allSqls = sqls.map(item => {
let v_id = _t + getguid()
- if (oriIds[item.uuid + item.md5]) {
- v_id = oriIds[item.uuid + item.md5]
- }
+ // if (oriIds[item.uuid + item.md5]) {
+ // v_id = oriIds[item.uuid + item.md5]
+ // }
long_data.push(`${md5(window.GLOB.appkey + v_id)},${item.uuid},${v_id},${window.btoa(window.encodeURIComponent(item.LText))},${config.permission === 'false' ? '' : item.roleId || ''}`)
@@ -844,7 +848,7 @@
v_id: v_id,
type: item.type,
reps: item.reps,
- md5: item.md5 || '',
+ // md5: item.md5 || '',
luser: item.luser === true
}
})
@@ -856,10 +860,6 @@
if (config.cacheUseful !== 'true') {
config.components = this.resetSyncQuery(config.components)
- }
-
- if (config.MenuID === 'home_page_id') {
- config.permission = 'false'
}
let tbs = []
--
Gitblit v1.8.0