From c29a1e1c8278a25b83b6158c2d426aa26c427569 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 16:18:30 +0800
Subject: [PATCH] 2021-09-01

---
 src/templates/sharecomponent/tablecomponent/index.jsx |   55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 72431bb..d6aca93 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -5,6 +5,7 @@
 import moment from 'moment'
 
 import Api from '@/api'
+import options from '@/store/options.js'
 import Utils from '@/utils/utils.js'
 import zhCN from '@/locales/zh-CN/model.js'
 import enUS from '@/locales/en-US/model.js'
@@ -22,12 +23,10 @@
   }
 
   state = {
-    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     tables: [],          // 绯荤粺琛�
-    tableFields: [],    // 宸查�夎〃瀛楁闆�
+    tableFields: [],     // 宸查�夎〃瀛楁闆�
     selectedTables: [],  // 宸查�夎〃
-    searchlist: null,    // 鎼滅储鏉′欢闆�
-    visible: false       // 妯℃�佹鎺у埗
   }
 
   /**
@@ -63,7 +62,13 @@
     param.secretkey = Utils.encrypt(param.LText, param.timestamp)
     param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉
 
-    Api.getSystemConfig(param).then(res => {
+    if (options.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
+      param.rduri = options.cloudServiceApi
+      param.userid = sessionStorage.getItem('CloudUserID') || ''
+      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+    }
+
+    Api.getSystemCacheConfig(param).then(res => {
       if (res.status) {
         this.setState({
           tables: res.data
@@ -81,7 +86,14 @@
   gettableFields = () => {
     let deffers = this.state.selectedTables.map(item => {
       return new Promise(resolve => {
-        Api.getSystemConfig({func: 'sPC_Get_FieldName', TBName: item.TbName}).then(res => {
+        let param = {func: 'sPC_Get_FieldName', TBName: item.TbName}
+        if (options.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
+          param.rduri = options.cloudServiceApi
+          param.userid = sessionStorage.getItem('CloudUserID') || ''
+          param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+        }
+
+        Api.getSystemCacheConfig(param).then(res => {
           res.TBName = item.TbName
           resolve(res)
         })
@@ -100,7 +112,7 @@
               if (/^nvarchar/.test(_type)) {
                 try { // 瀛樺湪max
                   _length = +_type.match(/\d+/)[0] || 50
-                } catch {
+                } catch (e) {
                   _length = 2048
                 }
                 _type = 'text'
@@ -119,12 +131,13 @@
               }
   
               return {
-                field: item.FieldName,
+                field: item.FieldName || '',
                 label: item.FieldDec,
                 type: _type,
                 datatype: _type,
                 decimal: _decimal,
                 length: _length,
+                $datatype: item.FieldType.toLowerCase()
               }
             })
           }
@@ -141,8 +154,7 @@
       this.setState({
         tableFields: _columns
       })
-
-      this.props.updatetable(this.props.config, _columns)
+      window.GLOB.tableFields = _columns
     })
   }
 
@@ -170,8 +182,13 @@
               let _type = item.FieldType.toLowerCase()
               let _decimal = 0
               let _length = 50
+
               if (/^nvarchar/.test(_type)) {
-                _length = +_type.match(/\d+/)[0] || 50
+                try { // 瀛樺湪max
+                  _length = +_type.match(/\d+/)[0] || 50
+                } catch (e) {
+                  _length = 2048
+                }
                 _type = 'text'
               } else if (/^int/.test(_type)) {
                 _type = 'number'
@@ -193,15 +210,21 @@
                 type: _type,
                 datatype: _type,
                 decimal: _decimal,
-                length: _length
+                length: _length,
+                $datatype: item.FieldType.toLowerCase()
               }
             })
           }
+
+          let _columns = [...tableFields, tabmsg]
+
           this.setState({
-            tableFields: [...tableFields, tabmsg]
+            tableFields: _columns
           })
 
-          this.props.updatetable(_config, [...tableFields, tabmsg])
+          window.GLOB.tableFields = _columns
+
+          this.props.updatetable(_config)
         } else {
           notification.warning({
             top: 92,
@@ -228,7 +251,9 @@
       tableFields: _fields
     })
 
-    this.props.updatetable({...config, tables: _tables}, _fields)
+    window.GLOB.tableFields = _fields
+
+    this.props.updatetable({...config, tables: _tables})
   }
 
   /**

--
Gitblit v1.8.0