From 958377f8ed9ca55070da9aa319f23e3ee9d94701 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 七月 2020 10:06:50 +0800
Subject: [PATCH] 2020-07-07

---
 src/tabviews/commontable/index.jsx |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 52f6d59..7a1935c 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -642,7 +642,13 @@
       param = this.getDefaultParam()
     }
 
-    param.BID = BID
+    if (BID) {
+      param.BID = BID
+    }
+    // 鏁版嵁绠$悊鏉冮檺
+    if (this.props.dataManager) {
+      param.dataM = 'Y'
+    }
 
     let result = await Api.genericInterface(param)
     if (result.status) {
@@ -682,7 +688,6 @@
 
     let param = {
       OrderCol: orderBy || setting.order,
-      dataM: this.props.dataManager ? 'Y' : '',
       ..._search
     }
 
@@ -694,10 +699,18 @@
     if (setting.interType === 'inner') {
       param.func = setting.innerFunc
     } else {
-      if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) {
-        param.rduri = window.GLOB.mainSystemApi
-      } else if (setting.sysInterface !== 'true') {
-        param.rduri = setting.interface
+      if (this.props.menuType === 'HS') {
+        if (setting.sysInterface === 'true' && options.cloudServiceApi) {
+          param.rduri = options.cloudServiceApi
+        } else if (setting.sysInterface !== 'true') {
+          param.rduri = setting.interface
+        }
+      } else {
+        if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) {
+          param.rduri = window.GLOB.mainSystemApi
+        } else if (setting.sysInterface !== 'true') {
+          param.rduri = setting.interface
+        }
       }
 
       if (setting.outerFunc) {
@@ -732,8 +745,7 @@
       obj_name: 'data',
       arr_field: arr_field,
       custom_script: setting.customScript || '',
-      default_sql: setting.default || 'true',
-      dataM: this.props.dataManager ? 'Y' : ''
+      default_sql: setting.default || 'true'
     }
     
     let _orderBy = orderBy || setting.order

--
Gitblit v1.8.0