From bd9dfa6b6ff25dbab21ba9a249fc9d9f4d03dce2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:08:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/api/index.js | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index cb9a698..f450c51 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -645,7 +645,7 @@
param.sign = md5(values)
param.t = new Date().getTime();
- ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+ ['arr_field', 'custom_script', 'LText', 'DateCount'].forEach(key => {
if (param[key]) {
let val = param[key]
delete param[key]
@@ -755,7 +755,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -804,7 +804,7 @@
param = this.encryptParam(param)
axios({
- url: token.interface,
+ url: `${token.interface}${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
}).then(res => {
@@ -834,7 +834,7 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
* 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
*/
- genericInterface (param) {
+ genericInterface (param, script = '', position) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -859,7 +859,25 @@
}
}
- if (param.$login) {
+ if (script) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('axios', 'Api', 'param', 'position', 'systemType', script)
+ let promise = func(axios, this, param, position, window.GLOB.systemType)
+
+ if (promise instanceof Promise) {
+ return promise
+ }
+ } catch (e) {
+ console.warn(e)
+ }
+
+ return Promise.resolve({
+ status: false,
+ message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+ ErrCode: 'E'
+ })
+ } else if (param.$login) {
let rduri = param.rduri || ''
delete param.$login
@@ -1053,7 +1071,7 @@
sDebug (sql, rduri = null) {
let param = {
func: 's_debug_sql',
- exec_type: 'y',
+ exec_type: window.GLOB.execType || 'y',
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
userid: sessionStorage.getItem('UserID') || '',
lang: sessionStorage.getItem('lang') || '',
@@ -1072,7 +1090,7 @@
sql = sql.replace(/\n/ig, ' ')
- param.LText = Utils.formatOptions(sql)
+ param.LText = Utils.formatOptions(sql, param.exec_type)
param.secretkey = Utils.encrypt('', param.timestamp)
param = this.encryptParam(param)
--
Gitblit v1.8.0