From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02

---
 src/templates/sharecomponent/fieldscomponent/index.jsx |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/templates/sharecomponent/fieldscomponent/index.jsx b/src/templates/sharecomponent/fieldscomponent/index.jsx
index 4edb4e3..b2337f8 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.jsx
+++ b/src/templates/sharecomponent/fieldscomponent/index.jsx
@@ -19,6 +19,7 @@
 
   state = {
     dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+    appType: sessionStorage.getItem('appType'),
     fields: [],          // 瀛楁闆�
     tableVisible: false,    // 妯℃�佹鎺у埗
   }
@@ -54,7 +55,7 @@
     } else if (type === 'columns') {
       // 娣诲姞鏄剧ず鍒楋紝瀛楁闆嗕腑瀛樺湪鏄剧ず鍒楀瓧娈碉紝浣跨敤鏄剧ず鍒楀璞℃浛鎹㈠瓧娈甸泦锛岃缃暟鎹被鍨�
       config.columns.forEach(item => {
-        if (columns.has(item.field.toLowerCase())) {
+        if (item.field && columns.has(item.field.toLowerCase())) {
           let _datatype = columns.get(item.field.toLowerCase()).datatype
           columns.set(item.field.toLowerCase(), {...item, selected: true, datatype: _datatype})
         }
@@ -162,7 +163,7 @@
       config.search = items
     } else if (type === 'columns') {
       config.columns.forEach(item => {
-        if (columnsMap.has(item.field.toLowerCase())) {
+        if (item.field && columnsMap.has(item.field.toLowerCase())) {
           let cell = columnsMap.get(item.field.toLowerCase())
 
           if (cell.selected) {
@@ -247,7 +248,10 @@
   
       let _columns = [...columnsMap.values()]
       let lastItem = config.fields[config.fields.length - 1]
-      let span = lastItem ? lastItem.span : 12
+      let span = this.state.appType === 'mob' ? 24 : 12
+      if (lastItem && lastItem.span) {
+        span = lastItem.span
+      }
 
       _columns.forEach(item => { // 寰幆娣诲姞鏂板瀛楁
         if (item.selected) {

--
Gitblit v1.8.0