From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/sharecomponent/tablecomponent/index.jsx |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/templates/sharecomponent/tablecomponent/index.jsx b/src/templates/sharecomponent/tablecomponent/index.jsx
index 04a1a64..f2da2b6 100644
--- a/src/templates/sharecomponent/tablecomponent/index.jsx
+++ b/src/templates/sharecomponent/tablecomponent/index.jsx
@@ -1,7 +1,8 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { fromJS } from 'immutable'
-import { Icon, Tooltip, Select, List, notification } from 'antd'
+import { Tooltip, Select, List, notification } from 'antd'
+import { QuestionCircleOutlined, CloseOutlined } from '@ant-design/icons'
 import moment from 'moment'
 
 import Api from '@/api'
@@ -23,7 +24,7 @@
   }
 
   state = {
-    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     tables: [],          // 绯荤粺琛�
     tableFields: [],     // 宸查�夎〃瀛楁闆�
     selectedTables: [],  // 宸查�夎〃
@@ -112,7 +113,7 @@
               if (/^nvarchar/.test(_type)) {
                 try { // 瀛樺湪max
                   _length = +_type.match(/\d+/)[0] || 50
-                } catch {
+                } catch (e) {
                   _length = 2048
                 }
                 _type = 'text'
@@ -137,6 +138,7 @@
                 datatype: _type,
                 decimal: _decimal,
                 length: _length,
+                $datatype: item.FieldType.toLowerCase()
               }
             })
           }
@@ -153,8 +155,7 @@
       this.setState({
         tableFields: _columns
       })
-
-      this.props.updatetable(this.props.config, _columns)
+      window.GLOB.tableFields = _columns
     })
   }
 
@@ -182,8 +183,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'
@@ -205,15 +211,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,
@@ -240,7 +252,9 @@
       tableFields: _fields
     })
 
-    this.props.updatetable({...config, tables: _tables}, _fields)
+    window.GLOB.tableFields = _fields
+
+    this.props.updatetable({...config, tables: _tables})
   }
 
   /**
@@ -261,8 +275,8 @@
         {/* 琛ㄥ悕娣诲姞 */}
         <div className="ant-col ant-form-item-label">
           <label>
-            <Tooltip placement="topLeft" title={dict['model.tooltip.table.guide']}>
-              <Icon type="question-circle" />
+            <Tooltip placement="topLeft" title="姝ゅ鍙互娣诲姞椤甸潰閰嶇疆鐩稿叧鐨勫父鐢ㄨ〃锛屽彲閫氳繃宸ュ叿鏍忎腑鐨勬坊鍔犳寜閽紝鍙壒閲忔坊鍔犺〃鏍肩浉鍏冲瓧娈点��">
+              <QuestionCircleOutlined className="mk-form-tip" />
               {dict['header.menu.table.add']}
             </Tooltip>
           </label>
@@ -272,17 +286,18 @@
           className="tables"
           style={{ width: '100%' }}
           optionFilterProp="children"
-          value={dict['header.menu.table.placeholder']}
-          onChange={this.onTableChange}
+          value="璇烽�夋嫨琛ㄥ悕"
+          onSelect={this.onTableChange}
+          dropdownClassName="mk-tables"
           showArrow={false}
           getPopupContainer={() => containerId ? document.getElementById(containerId) : document.body}
           filterOption={(input, option) => {
-            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
-              option.props.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            return option.props.children[0].toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+              option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0
           }}
         > 
           {tables.map((table, index) => (
-            <Option key={index} title={table.TbName} value={table.TbName}>{table.Remark}</Option>
+            <Option key={index} title={table.TbName} value={table.TbName}>{table.Remark}<br/>{table.TbName}</Option>
           ))}
         </Select>
         {selectedTables.length > 0 && <List
@@ -291,7 +306,7 @@
           dataSource={selectedTables}
           renderItem={(item, index) => <List.Item key={index} title={item.Remark + ' (' + item.TbName + ')'}>
             {item.Remark + ' (' + item.TbName + ')'}
-            <Icon type="close" onClick={() => this.deleteTable(item)}/>
+            <CloseOutlined onClick={() => this.deleteTable(item)}/>
             <div className="bottom-mask"></div>
           </List.Item>}
         />}

--
Gitblit v1.8.0