From 5e1d4d5155c57c43739d61914e2d29a64f9bb683 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:40:38 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/sharecomponent/tablecomponent/index.jsx |  164 +++---------------------------------------------------
 1 files changed, 11 insertions(+), 153 deletions(-)

diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 5f6c49a..69e7a3b 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -23,7 +23,6 @@
 
   state = {
     tables: [],          // 绯荤粺琛�
-    tableFields: [],     // 宸查�夎〃瀛楁闆�
     selectedTables: [],  // 宸查�夎〃
   }
 
@@ -39,8 +38,6 @@
 
     this.setState({
       selectedTables: tables
-    }, () => {
-      this.gettableFields()
     })
   }
 
@@ -96,163 +93,28 @@
     })
   }
 
-  gettableFields = () => {
-    let deffers = this.state.selectedTables.map((item, i) => {
-      return new Promise(resolve => {
-        let param = {func: 'sPC_Get_FieldName', TBName: item.TbName}
-        if (window.GLOB.cloudServiceApi) { // 涓斿瓨鍦ㄤ簯绔湴鍧�
-          param.rduri = window.GLOB.cloudServiceApi
-          param.userid = sessionStorage.getItem('CloudUserID') || ''
-          param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-        }
-
-        setTimeout(() => {
-          Api.getSystemCacheConfig(param).then(res => {
-            res.TBName = item.TbName
-            resolve(res)
-          })
-        }, (i + 1) * 100)
-      })
-    })
-    Promise.all(deffers).then(response => {
-      let _columns = []
-      response.forEach(res => {
-        if (res.status) {
-          let tabmsg = {
-            tableName: res.TBName,
-            columns: res.FDName.map(item => {
-              let _type = item.FieldType.toLowerCase()
-              let _decimal = 0
-              let _length = 50
-              if (/^nvarchar/.test(_type)) {
-                try { // 瀛樺湪max
-                  _length = +_type.match(/\d+/)[0] || 50
-                } catch (e) {
-                  _length = 2048
-                }
-                _type = 'text'
-              } else if (/^int/.test(_type)) {
-                _type = 'number'
-              } else if (/^decimal/.test(_type)) {
-                _decimal = _type.split(',')[1]
-                _decimal = parseInt(_decimal)
-                _type = 'number'
-              } else if (/^datetime/.test(_type)) {
-                _type = 'datetime'
-              } else if (/^date/.test(_type)) {
-                _type = 'date'
-              } else {
-                _type = 'text'
-              }
-  
-              return {
-                field: item.FieldName || '',
-                label: item.FieldDec,
-                type: _type,
-                datatype: _type,
-                decimal: _decimal,
-                length: _length,
-                $datatype: item.FieldType.toLowerCase()
-              }
-            })
-          }
-          _columns.push(tabmsg)
-        } else {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-        }
-      })
-
-      this.setState({
-        tableFields: _columns
-      })
-      window.GLOB.tableFields = _columns
-    })
-  }
-
   /**
    * @description 娣诲姞琛ㄥ悕
    */
   onTableChange = (value) => {
     const { config } = this.props
-    const { tables, tableFields, selectedTables } = this.state
+    const { tables, selectedTables } = this.state
 
     let _table = tables.filter(item => item.TbName === value)[0]
-    let isSelected = !!selectedTables.filter(cell => cell.TbName === value)[0]
-    if (!isSelected) {
-      let _tables = [...selectedTables, _table]
 
-      window.GLOB.publicTables = _tables
+    if (selectedTables.findIndex(cell => cell.TbName === value) > -1) return
 
-      this.setState({
-        selectedTables: _tables
-      })
+    let _tables = [...selectedTables, _table]
 
-      let _config = {...config, tables: _tables}
-      
-      Api.getCloudConfig({func: 'sPC_Get_FieldName', TBName: value}).then(res => {
-        if (res.status) {
-          let tabmsg = {
-            tableName: _table.TbName,
-            columns: res.FDName.map(item => {
-              let _type = item.FieldType.toLowerCase()
-              let _decimal = 0
-              let _length = 50
+    window.GLOB.publicTables = _tables
 
-              if (/^nvarchar/.test(_type)) {
-                try { // 瀛樺湪max
-                  _length = +_type.match(/\d+/)[0] || 50
-                } catch (e) {
-                  _length = 2048
-                }
-                _type = 'text'
-              } else if (/^int/.test(_type)) {
-                _type = 'number'
-              } else if (/^decimal/.test(_type)) {
-                _decimal = _type.split(',')[1]
-                _decimal = parseInt(_decimal)
-                _type = 'number'
-              } else if (/^datetime/.test(_type)) {
-                _type = 'datetime'
-              } else if (/^date/.test(_type)) {
-                _type = 'date'
-              } else {
-                _type = 'text'
-              }
+    this.setState({
+      selectedTables: _tables
+    })
 
-              return {
-                field: item.FieldName,
-                label: item.FieldDec,
-                type: _type,
-                datatype: _type,
-                decimal: _decimal,
-                length: _length,
-                $datatype: item.FieldType.toLowerCase()
-              }
-            })
-          }
-
-          let _columns = [...tableFields, tabmsg]
-
-          this.setState({
-            tableFields: _columns
-          })
-
-          window.GLOB.tableFields = _columns
-
-          this.props.updatetable(_config)
-        } else {
-          notification.warning({
-            top: 92,
-            message: res.message,
-            duration: 5
-          })
-        }
-      })
-    }
+    let _config = {...config, tables: _tables}
+    
+    this.props.updatetable(_config)
   }
 
   /**
@@ -260,19 +122,15 @@
    */
   deleteTable = (table) => {
     const { config } = this.props
-    const { selectedTables, tableFields } = this.state
+    const { selectedTables } = this.state
 
     let _tables = selectedTables.filter(item => item.TbName !== table.TbName)
-    let _fields = tableFields.filter(item => item.tableName !== table.TbName)
 
     window.GLOB.publicTables = _tables
 
     this.setState({
       selectedTables: _tables,
-      tableFields: _fields
     })
-
-    window.GLOB.tableFields = _fields
 
     this.props.updatetable({...config, tables: _tables})
   }

--
Gitblit v1.8.0