From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/api/index.js |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 48de454..1633765 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -698,6 +698,12 @@
         }
       }
 
+      if (param.$type) {
+        url += '/' + param.$type
+      }
+
+      delete param.$type
+
       param = this.encryptParam(param)
 
       return new Promise((resolve) => {
@@ -716,7 +722,7 @@
             res.ErrCode = '-2'
             MKEmitter.emit('reloadTabs')
           }
-          if (res.status) {
+          if (res.status && id) {
             window.GLOB.CacheMap.set(id, res)
           }
           resolve(res)
@@ -1003,6 +1009,12 @@
         }
       }
 
+      if (param.$type) {
+        url += '/' + param.$type
+      }
+
+      delete param.$type
+
       param.username = sessionStorage.getItem('User_Name') || ''
       param.fullname = sessionStorage.getItem('Full_Name') || ''
       param.s_debug = window.GLOB.debugger ? 'Y' : ''
@@ -1024,9 +1036,14 @@
               window.mkInfo(n)
             })
           }
-          if (res.ErrCode === 'version_error') {
-            res.ErrCode = '-2'
-            MKEmitter.emit('reloadTabs')
+          if (!res.status) {
+            if (res.ErrCode === 'version_error') {
+              res.ErrCode = '-2'
+              MKEmitter.emit('reloadTabs')
+            } else if (res.message === 'permission deny') {
+              res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+              res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+            }
           }
           resolve(res)
         })
@@ -1050,6 +1067,29 @@
   }
 
   /**
+   * @description 娓呯┖鍚庣缂撳瓨
+   */
+  cacheInterface (param) {
+    param.appkey = window.GLOB.appkey || ''
+    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
+
+    let url = '/webapi/excache'
+    if (param.rduri && !window.GLOB.transfer) {
+      url = param.rduri
+      delete param.rduri
+    }
+
+    param = this.encryptParam(param)
+
+    return axios({
+      url: url,
+      method: 'post',
+      data: JSON.stringify(param),
+    })
+  }
+
+  /**
    * @description 涓婁紶base64
    * @param {String} base64 base64鍥剧墖缂栫爜
    */

--
Gitblit v1.8.0