From f0bf8c399c354c22227f8f1a76ed806098db59c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:51:02 +0800
Subject: [PATCH] 2024-05-21

---
 src/views/menudesign/index.jsx |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 7d3ece5..ad11d1f 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -654,7 +654,7 @@
         
         if (item.action && item.action.length > 0) {
           item.action.forEach(btn => {
-            if (btn.hidden === 'true') return
+            if (btn.hidden === 'true' || btn.permission === 'false') return
             buttons.push(`select '${btn.uuid}' as menuid, '${item.name + '-' + btn.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
             _sort++
           })
@@ -669,13 +669,13 @@
           item.subcards.forEach(card => {
             card.elements && card.elements.forEach(cell => {
               if (cell.eleType !== 'button') return
-              if (cell.hidden === 'true') return
+              if (cell.hidden === 'true' || cell.permission === 'false') return
               buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
               _sort++
             })
             card.backElements && card.backElements.forEach(cell => {
               if (cell.eleType !== 'button') return
-              if (cell.hidden === 'true') return
+              if (cell.hidden === 'true' || cell.permission === 'false') return
               buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
               _sort++
             })
@@ -683,7 +683,7 @@
         } else if (item.type === 'balcony') {
           item.elements && item.elements.forEach(cell => {
             if (cell.eleType !== 'button') return
-            if (cell.hidden === 'true') return
+            if (cell.hidden === 'true' || cell.permission === 'false') return
             buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
             _sort++
           })
@@ -694,7 +694,7 @@
                 loopCol(col.subcols)
               } else if (col.type === 'custom') {
                 col.elements.forEach(cell => {
-                  if (cell.eleType !== 'button' || cell.hidden === 'true') return
+                  if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return
                   buttons.push(`select '${cell.uuid}' as menuid, '${item.name + '-' + cell.label}' as menuname, '${_sort * 10}' as Sort, '${config.uuid}' as parentid, 40 as Type`)
                   _sort++
                 })
@@ -799,6 +799,11 @@
 
       let tbs = []
       let btns = this.getMenuMessage(config, tbs)
+
+      if (config.permission === 'false') {
+        btns = []
+      }
+
       let arr = []
       tbs = tbs.filter(tb => {
         let _tb = tb.toLowerCase()
@@ -828,6 +833,7 @@
       }
 
       let interfaces = getFuncsAndInters(config)
+      let urlFields = config.urlFields ? config.urlFields.join(',') : ''
 
       let param = {
         func: 'sPC_TrdMenu_AddUpt',
@@ -839,7 +845,7 @@
         EasyCode: config.easyCode || '',
         Template: 'CustomPage',
         MenuName: config.MenuName || '',
-        PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces}),
+        PageParam: JSON.stringify({Template: 'CustomPage', OpenType: config.OpenType || 'newtab', hidden: config.hidden || 'false', menuColor: config.menuColor || '', interfaces, urlFields}),
         open_edition: config.open_edition,
         LText: '',
         LTexttb: '',
@@ -882,10 +888,21 @@
   
             Api.fileuploadbase64(param).then(result => {
               if (result.status) {
+                let url = result.Images
+                let baseurl = ''
+    
+                if (window.GLOB.cloudServiceApi) {
+                  baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
+                } else {
+                  baseurl = window.GLOB.baseurl
+                }
+
+                url = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
+
                 Api.getCloudConfig({
                   func: 's_PrintTemplateMSub',
                   ID: config.uuid,
-                  Images: Utils.getcloudurl(result.Images),
+                  Images: url,
                   Remark: '',
                   temp_type: 'billprint',
                 }).then(response => {
@@ -1154,6 +1171,7 @@
   updateLogConfig = (config) => {
     config.fstMenuId = this.state.config.fstMenuId || config.fstMenuId || ''
     config.parentId = this.state.config.parentId || config.parentId || ''
+    config.open_edition = this.state.config.open_edition || ''
     
     this.setState({
       config: null

--
Gitblit v1.8.0