From 2dadcbe39d6211bb08139cd600d6b8c9ca92d508 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 二月 2024 20:44:30 +0800
Subject: [PATCH] 2024-02-28
---
src/tabviews/custom/components/table/edit-table/index.jsx | 9 ++++-----
src/tabviews/custom/components/table/base-table/index.jsx | 9 ++++-----
src/api/index.js | 8 ++++++--
src/tabviews/custom/components/card/double-data-card/index.jsx | 8 +++-----
src/tabviews/custom/components/table/normal-table/index.jsx | 9 ++++-----
src/tabviews/custom/components/card/data-card/index.jsx | 8 +++-----
6 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 27f1e1f..09170ce 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -57,6 +57,9 @@
return Promise.reject(response.data)
} else {
+ if (response.config.requestId) {
+ response.data.$requestId = response.config.requestId
+ }
return Promise.resolve(response.data)
}
}, (error) => {
@@ -834,7 +837,7 @@
* @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
* 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
*/
- genericInterface (param, script = '', position) {
+ genericInterface (param, script = '', position, requestId = '') {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -947,7 +950,8 @@
return axios({
url: `${url}${param.func ? '/' + param.func : ''}`,
method: 'post',
- data: JSON.stringify(param)
+ data: JSON.stringify(param),
+ requestId
})
}
}
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index d11af8d..de3f1a8 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -790,13 +790,11 @@
let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
let start = 1
if (config.setting.laypage) {
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 57af326..4903092 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -633,13 +633,11 @@
let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
let start = 1
if (config.setting.laypage) {
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 2cc683f..ec29c8f 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -104,6 +104,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -139,13 +140,11 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param, setting.js_script)
+ let result = await Api.genericInterface(param, setting.js_script, '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
let _pageIndex = Math.ceil(result.total / pageSize)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 4d2a761..14776ec 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -271,6 +271,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
@@ -301,13 +302,11 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 498c717..92c7018 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -390,6 +390,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -428,13 +429,11 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
this.loaded = true
if (config.$cache && type === 'init') {
--
Gitblit v1.8.0