From ee635de6fc758c044db0761faa003d0db1e82563 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 八月 2023 20:32:35 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/menudesign/index.jsx |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 1a52162..1fb51dc 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -48,7 +48,6 @@
 const StyleCombControlButton = asyncComponent(() => import('@/menu/stylecombcontrolbutton'))
 const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
 
-sessionStorage.setItem('isEditState', 'true')
 sessionStorage.setItem('appType', '')          // 搴旂敤绫诲瀷
 document.body.className = ''
 
@@ -81,7 +80,6 @@
     }
     
     if (!sessionStorage.getItem('UserID')) {
-      sessionStorage.removeItem('isEditState')
       sessionStorage.removeItem('appType')
       this.props.history.replace('/login')
       return
@@ -263,7 +261,7 @@
   
       param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
   
-      Api.getSystemConfig(param).then(res => {
+      Api.getCloudConfig(param).then(res => {
         if (res.status) {
           let temps = res.data.map(temp => {
             return {
@@ -296,19 +294,19 @@
     }
     deffers = [new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'image'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'image'}).then(res => {
           resolve(res.data)
         })
       }, 500)
     }), new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'video'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'video'}).then(res => {
           resolve(res.data)
         })
       }, 1000)
     }), new Promise(resolve => {
       setTimeout(() => {
-        Api.getSystemConfig({...param, typecharone: 'color'}).then(res => {
+        Api.getCloudConfig({...param, typecharone: 'color'}).then(res => {
           resolve(res.data)
         })
       }, 1500)
@@ -322,7 +320,7 @@
   }
 
   updateCustomComponent = () => {
-    Api.getSystemConfig({
+    Api.getCloudConfig({
       func: 's_get_custom_components',
       typename: '',
       typecharone: ''
@@ -438,7 +436,7 @@
       MenuID: MenuId
     }
 
-    Api.getSystemConfig(param).then(result => {
+    Api.getCloudConfig(param).then(result => {
       if (result.status) {
         let config = null
 
@@ -664,7 +662,7 @@
         }
     
         setTimeout(() => {
-          Api.getSystemConfig(param).then(res => {
+          Api.getCloudConfig(param).then(res => {
             let _config = null
             try {
               _config = res.LongParam ? JSON.parse(window.decodeURIComponent(window.atob(res.LongParam))) : null
@@ -975,7 +973,7 @@
   
             Api.fileuploadbase64(param).then(result => {
               if (result.status) {
-                Api.getSystemConfig({
+                Api.getCloudConfig({
                   func: 's_PrintTemplateMSub',
                   ID: config.uuid,
                   Images: Utils.getcloudurl(result.Images),
@@ -995,7 +993,7 @@
       }).then(res => { // 椤甸潰淇濆瓨
         if (!res || !res.status) return res
 
-        return Api.getSystemConfig(param)
+        return Api.getCloudConfig(param)
       }).then(res => { // 鎸夐挳鍒犻櫎
         if (!res || !res.status) return res
 
@@ -1018,7 +1016,7 @@
             func: 'sPC_MainMenu_Del',
             MenuID: this.state.delButtons.join(',')
           }
-          return Api.getSystemConfig(_param)
+          return Api.getCloudConfig(_param)
         }
       }, this.netError).then(res => { // 椤甸潰鎸夐挳鍏崇郴淇濆瓨
         if (!res || !res.status) return res
@@ -1028,7 +1026,7 @@
         })
 
         if (MenuType !== 'billPrint') {
-          return Api.getSystemConfig(btnParam)
+          return Api.getCloudConfig(btnParam)
         } else {
           return {
             status: true
@@ -1076,7 +1074,7 @@
   getRoleFields = () => {
     if (sessionStorage.getItem('sysRoles')) return
 
-    Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
+    Api.getCloudConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
       if (res.status) {
         let _permFuncField = []
         let _sysRoles = []

--
Gitblit v1.8.0