From c51f5e007a3e03c9d6731ab7f28f0080de009990 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 17 十一月 2021 18:38:32 +0800
Subject: [PATCH] 2021-11-17

---
 src/tabviews/custom/components/table/normal-table/index.jsx |  511 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 321 insertions(+), 190 deletions(-)

diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 28544c6..2f53d2c 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -2,42 +2,45 @@
 import PropTypes from 'prop-types'
 import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { notification, Switch } from 'antd'
+import { notification, Collapse } from 'antd'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
-import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import asyncComponent from '@/utils/asyncComponent'
 import MKEmitter from '@/utils/events.js'
-
-import MainSearch from '@/tabviews/zshare/topSearch'
 import './index.scss'
 
 // 閫氱敤缁勪欢
-const MainAction = asyncSpinComponent(() => import('@/tabviews/zshare/actionList'))
-const MainTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))
+const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
+const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
+const MainTable = asyncComponent(() => import('@/tabviews/custom/components/share/normalTable'))
+const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
+
+const { Panel } = Collapse
 
 class NormalTable extends Component {
   static propTpyes = {
-    param: PropTypes.any,        // 鍏朵粬椤甸潰浼犻�掔殑鎼滅储鏉′欢绛夊弬鏁�
-    MenuID: PropTypes.string,    // 鑿滃崟Id
-    MenuNo: PropTypes.string,    // 鑿滃崟鍙傛暟
-    MenuName: PropTypes.string   // 鑿滃崟鍚嶇О
+    BID: PropTypes.any,              // 鐖剁骇Id
+    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
+    config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
+    mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
+    menuType: PropTypes.any,         // 鑿滃崟绫诲瀷
   }
 
   state = {
     dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
-    BID: null,            // 椤甸潰璺宠浆鏃舵惡甯D
+    BID: '',              // 涓婄骇ID
+    BData: '',            // 涓婄骇缁勪欢琛屾暟鎹�
     config: {},           // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
     searchlist: null,     // 鎼滅储鏉′欢
     actions: null,        // 鎸夐挳闆�
     columns: null,        // 鏄剧ず鍒�
-    logcolumns: null,     // 鏃ュ織涓樉绀虹殑鍒椾俊鎭� (澧炲姞鑷冲叏閮ㄥ垪锛岄櫎鍘诲悎骞跺垪)
     arr_field: '',        // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
     setting: null,        // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
-    data: null,           // 鍒楄〃鏁版嵁闆�
+    data: [],             // 鍒楄〃鏁版嵁闆�
     selectedData: [],     // 宸查�夎〃鏍兼暟鎹�
     total: 0,             // 鎬绘暟
     loading: false,       // 鍒楄〃鏁版嵁鍔犺浇涓�
@@ -45,9 +48,6 @@
     pageSize: 10,         // 姣忛〉鏁版嵁鏉℃暟
     orderBy: '',          // 鎺掑簭
     search: '',           // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
-    BIDs: {},             // 涓婄骇琛╥d
-    pickup: false,        // 涓昏〃鏁版嵁闅愯棌鏄剧ず鍒囨崲
-    statFields: [],       // 鍚堣瀛楁
     statFValue: []        // 鍚堣鍊�
   }
 
@@ -56,12 +56,16 @@
    * 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
    */
   UNSAFE_componentWillMount () {
-    const { data, initdata } = this.props
+    const { data, initdata, BID, BData } = this.props
     let _config = fromJS(this.props.config).toJS()
     let _cols = new Map()
-
     let _data = null
     let _sync = _config.setting.sync === 'true'
+    let setting = {..._config.setting, ..._config.wrap, style: {}}
+
+    if (setting.selected !== 'always' && setting.selected !== 'init') {
+      setting.selected = 'false'
+    }
 
     if (_config.setting.sync === 'true' && data) {
       _data = data[_config.dataName] || []
@@ -69,6 +73,26 @@
     } else if (_config.setting.sync === 'true' && initdata) {
       _data = initdata || []
       _sync = false
+    }
+
+    if (_data) {
+      _data = _data.map((item, index) => {
+        item.key = index
+        item.$$uuid = item[_config.setting.primaryKey] || ''
+        item.$$BID = BID || ''
+        item.$$BData = BData || ''
+        item.$Index = index + 1 + ''
+        return item
+      })
+
+      if (setting.selected !== 'false' && _data && _data.length > 0) {
+        setTimeout(() => {
+          MKEmitter.emit('mkCheckTopLine', _config.uuid)
+        }, 200)
+        if (setting.selected === 'init') {
+          setting.selected = 'false'
+        }
+      }
     }
 
     _config.columns.forEach(item => {
@@ -83,19 +107,31 @@
           }
           return item
         })
-      } else if (column.type === 'colspan') {
-        column.unfold = 'true'
       } else if (column.type === 'action') {
         column.operations = column.elements
       }
     })
 
+    if (setting.color) {
+      setting.style.color = setting.color
+    }
+    if (setting.fontSize) {
+      setting.style.fontSize = setting.fontSize
+    }
+
+    if (_config.wrap.collapse === 'true') {
+      _config.wrap.title = _config.wrap.title || ' '
+    }
+
     this.setState({
+      pageSize: setting.pageSize || 10,
+      BID: BID || '',
+      BData: BData || '',
       title: _config.wrap.title,
       sync: _sync,
       data: _data,
       config: _config,
-      setting: {..._config.setting, ..._config.wrap},
+      setting: setting,
       searchlist: _config.search,
       actions: _config.action,
       columns: _config.cols,
@@ -105,35 +141,47 @@
       if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
         this.loadmaindata()
         this.getStatFieldsValue()
+      } else if (_config.setting.onload === 'true') {
+        this.getStatFieldsValue()
       }
     })
   }
 
   /**
    * @description 涓昏〃鏁版嵁鍔犺浇
-   */ 
-  async loadmaindata () {
-    const { setting, arr_field, BIDs, search, orderBy, BID, pageIndex, pageSize } = this.state
-    let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+   * @param { Boolean } reset  琛ㄦ牸鏄惁閲嶇疆
+   * @param { String }  repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
+   */
+  async loadmaindata (reset, repage) {
+    const { mainSearch } = this.props
+    const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
 
-    this.setState({
-      selectedData: [],
-      BIDs: {
-        ...BIDs,
-        mainTable: '',
-        mainTabledata: ''
-      }
-    })
-
-    if (requireFields.length > 0) {
-      let labels = requireFields.map(item => item.label)
-      labels = Array.from(new Set(labels))
-
-      notification.warning({
-        top: 92,
-        message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
-        duration: 3
+    if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+      this.setState({
+        data: [],
+        selectedData: [],
+        total: 0
       })
+      MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
+      reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+      if (setting.$hasSyncModule) {
+        MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+      }
+      return
+    }
+
+    let searches = fromJS(search).toJS()
+    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+      let keys = searches.map(item => item.key.toLowerCase())
+      mainSearch.forEach(item => {
+        if (!keys.includes(item.key.toLowerCase())) {
+          searches.push(item)
+        }
+      })
+    }
+
+    let requireFields = searches.filter(item => item.required && item.value === '')
+    if (requireFields.length > 0) {
       return
     }
 
@@ -142,22 +190,43 @@
     })
 
     let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager)
-
-    if (param.func === 'sPC_Get_TableData') {
-      param.menuname = this.props.MenuName || ''
-    }
+    let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
+      if (setting.selected !== 'false' && result.data && result.data.length > 0) {
+        setTimeout(() => {
+          MKEmitter.emit('mkCheckTopLine', config.uuid)
+        }, 200)
+        if (setting.selected === 'init') {
+          this.setState({setting: {...setting, selected: 'false'}})
+        }
+      } else {
+        MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
+        if (setting.$hasSyncModule) {
+          MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+        }
+      }
+      
+      reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+
+      let start = 1
+      if (setting.laypage) {
+        start = pageSize * (pageIndex - 1) + 1
+      }
+
       this.setState({
         data: result.data.map((item, index) => {
           item.key = index
+          item.$$uuid = item[setting.primaryKey] || ''
+          item.$$BID = BID || ''
+          item.$$BData = BData || ''
+          item.$Index = start + index + ''
           return item
         }),
+        selectedData: [],
         total: result.total,
-        loading: false,
-        pickup: false
+        loading: false
       })
     } else {
       this.setState({
@@ -175,41 +244,59 @@
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
   async loadmainLinedata (id) {
-    const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize } = this.state
+    const { mainSearch } = this.props
+    const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+
+    let searches = fromJS(search).toJS()
+    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+      let keys = searches.map(item => item.key.toLowerCase())
+      mainSearch.forEach(item => {
+        if (!keys.includes(item.key.toLowerCase())) {
+          searches.push(item)
+        }
+      })
+    }
 
     this.setState({
       loading: true
     })
 
     let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager, id)
-
-    if (param.func === 'sPC_Get_TableData') {
-      param.menuname = this.props.MenuName || ''
-    }
+    let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
       let data = fromJS(this.state.data).toJS()
+      let selectedData = fromJS(this.state.selectedData).toJS()
       if (result.data && result.data[0]) {
-        let _data = result.data[0]
-
+        let _data = result.data[0] || {}
+        _data.$$uuid = _data[setting.primaryKey] || ''
+        _data.$$BID = BID || ''
+        _data.$$BData = BData || ''
         try {
           data = data.map(item => {
-            if (item[setting.primaryKey] === _data[setting.primaryKey]) {
+            if (item.$$uuid === _data.$$uuid) {
               _data.key = item.key
+              _data.$Index = item.$Index
               return _data
             } else {
               return item
             }
           })
-        } catch {
+          selectedData = selectedData.map(item => {
+            if (_data.$$uuid === item.$$uuid) {
+              return _data
+            }
+            return item
+          })
+        } catch (e) {
           console.warn('鏁版嵁鏌ヨ閿欒')
         }
       }
 
       this.setState({
-        data: data,
+        data,
+        selectedData,
         loading: false
       })
     } else {
@@ -228,21 +315,34 @@
    * @description 鑾峰彇鍚堣瀛楁鍊�
    */
   getStatFieldsValue = () => {
-    const { setting, search, BID, orderBy, statFields } = this.state
+    const { mainSearch } = this.props
+    const { setting, config, search, BID, orderBy } = this.state
 
-    if (statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
+    if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+      this.setState({
+        statFValue: []
+      })
+      return
+    }
 
-    let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
+    if (config.statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
+
+    let searches = fromJS(search).toJS()
+    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+      let keys = searches.map(item => item.key.toLowerCase())
+      mainSearch.forEach(item => {
+        if (!keys.includes(item.key.toLowerCase())) {
+          searches.push(item)
+        }
+      })
+    }
+    let requireFields = searches.filter(item => item.required && item.value === '')
     if (requireFields.length > 0) {
       return
     }
 
     let _orderBy = orderBy || setting.order
-    let param = UtilsDM.getStatQueryDataParams(setting, statFields, search, _orderBy, BID, this.props.menuType, this.props.dataManager)
-
-    if (param.func === 'sPC_Get_TableData') {
-      param.menuname = this.props.MenuName || ''
-    }
+    let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID, this.props.menuType)
 
     Api.genericInterface(param).then(res => {
       if (res.status) {
@@ -250,7 +350,7 @@
         let values = []
 
         if (_data) {
-          statFields.forEach(item => {
+          config.statFields.forEach(item => {
             if (_data[item.field] || _data[item.field] === 0) {
               let val = +_data[item.field]
               if (isNaN(val)) {
@@ -294,12 +394,11 @@
         this.getStatFieldsValue()
       })
     } else {
-      MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
       this.setState({
         pageIndex: 1,
         search: searches
       }, () => {
-        this.loadmaindata()
+        this.loadmaindata(true, 'true')
         this.getStatFieldsValue()
       })
     }
@@ -331,87 +430,51 @@
    */
   reloadtable = (btn) => {
     if (!btn || btn.resetPageIndex !== 'false') {
-      MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
       this.setState({
         pageIndex: 1
       }, () => {
-        this.loadmaindata()
+        this.loadmaindata(true, 'true')
         this.getStatFieldsValue()
       })
     } else {
-      MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable', 'false') // 鍒楄〃閲嶇疆
-      this.loadmaindata()
+      this.loadmaindata(true, 'false')
       this.getStatFieldsValue()
-    }
-  }
-
-  /**
-   * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
-   */
-  refreshbyaction = (position, btn) => {
-    if (position === 'grid' || position === 'view') {
-      this.reloadtable(btn)
     }
   }
 
   /**
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
-  getexceloutparam = () => {
-    const { MenuName } = this.props
-    const { arr_field, orderBy, search, setting} = this.state
+  queryModuleParam = (menuId, btnId) => {
+    const { mainSearch } = this.props
+    const { arr_field, config, orderBy, search, setting} = this.state
 
-    return {
+    if (config.uuid !== menuId) return
+
+    let searches = search ? fromJS(search).toJS() : []
+    if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+      let keys = searches.map(item => item.key.toLowerCase())
+      mainSearch.forEach(item => {
+        if (!keys.includes(item.key.toLowerCase())) {
+          searches.push(item)
+        }
+      })
+    }
+
+    MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
       arr_field: arr_field,
       orderBy: orderBy || setting.order,
-      search: search,
-      menuName: MenuName
-    }
-  }
-
-  /**
-   * @description 琛ㄦ牸閫夋嫨椤瑰垏鎹�
-   */
-  changeSelectedData = (selectedData) => {
-    this.setState({selectedData})
-  }
-
-  /**
-   * @description 琛ㄦ牸Id鍙樺寲
-   */
-  handleTableId = (type, id, data) => {
-    const { BIDs } = this.state
-
-    this.setState({
-      BIDs: {
-        ...BIDs,
-        [type]: id,
-        [type + 'data']: data
-      }
-    })
-  }
-  
-  /**
-   * @description 鏁版嵁灞曞紑鍚堝苟鍒囨崲
-   */
-  pickupChange = () => {
-    const { pickup } = this.state
-    this.setState({
-      pickup: !pickup
+      search: searches,
+      menuName: config.name
     })
   }
 
-  reloadData = (menuId, id, btn) => {
-    const { MenuID } = this.props
+  reloadData = (menuId, id) => {
+    const { config } = this.state
 
-    if (MenuID !== menuId) return
+    if (config.uuid !== menuId) return
     if (id === 'empty') return
 
-    if (id === 'formtab') { // 琛ㄥ崟鏍囩椤靛埛鏂�
-      this.reloadtable(btn)
-      return
-    }
-    
     if (!id) {
       this.reloadtable()
     } else {
@@ -419,22 +482,82 @@
     }
   }
 
+  resetParentParam = (MenuID, id, data) => {
+    const { setting } = this.state
+
+    if (!setting.supModule || setting.supModule !== MenuID) return
+    if (id !== this.state.BID || id !== '') {
+      this.setState({
+        pageIndex: 1,
+        BID: id,
+        BData: data
+      }, () => {
+        this.loadmaindata(true, 'true')
+        this.getStatFieldsValue()
+      })
+    }
+  }
+
+  /**
+   * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+   * @param {*} menuId     // 鑿滃崟Id
+   * @param {*} position   // 鍒锋柊浣嶇疆
+   * @param {*} btn        // 鎵ц鐨勬寜閽�
+   */
+  refreshByButtonResult = (menuId, position, btn, id, lines) => {
+    const { config, BID } = this.state
+
+    if (config.uuid !== menuId) return
+
+    if (position === 'line' && lines && lines.length === 1) {
+      this.loadmainLinedata(lines[0].$$uuid)
+    } else {
+      this.reloadtable(btn)                                                    // 鏁版嵁鍒锋柊
+    }
+
+    if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
+      MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
+    }
+
+    if (position === 'mainline' && config.setting.supModule) {                 // 涓昏〃琛屽埛鏂�
+      MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+    } else if (position === 'popclose') {                                      // 鏍囩鍏抽棴鍒锋柊
+      config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+      btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+    }
+  }
+
   UNSAFE_componentWillReceiveProps(nextProps) {
-    const { sync, config } = this.state
+    const { sync, config, setting, BID, BData } = this.state
 
     if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
       let _data = []
       if (nextProps.data && nextProps.data[config.dataName]) {
         _data = nextProps.data[config.dataName] || []
+        _data = _data.map((item, index) => {
+          item.key = index
+          item.$$uuid = item[config.setting.primaryKey] || ''
+          item.$$BID = BID || ''
+          item.$$BData = BData || ''
+          item.$Index = index + 1 + ''
+          return item
+        })
+
+        if (setting.selected !== 'false' && _data && _data.length > 0) {
+          setTimeout(() => {
+            MKEmitter.emit('mkCheckTopLine', config.uuid)
+          }, 200)
+          if (setting.selected === 'init') {
+            this.setState({setting: {...setting, selected: 'false'}})
+          }
+        }
       }
 
       this.setState({sync: false, data: _data})
-    } else if (!is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
-      if (config.setting.syncRefresh === 'true') {
-        this.setState({}, () => {
-          this.reloadtable()
-        })
-      }
+    } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+      this.setState({pageIndex: 1}, () => {
+        this.reloadtable()
+      })
     }
   }
 
@@ -444,6 +567,9 @@
 
   componentDidMount () {
     MKEmitter.addListener('reloadData', this.reloadData)
+    MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
   }
 
   /**
@@ -454,64 +580,74 @@
       return
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
   }
 
   render() {
-    const { MenuName } = this.props
-    const { BID, setting, searchlist, pageSize, actions, columns, pickup, config, selectedData } = this.state
+    const { BID, setting, searchlist, actions, config, columns, selectedData, BData } = this.state
 
     return (
-      <div className="commontable">
-        {searchlist && searchlist.length > 0 ?
-          <MainSearch
-            BID={BID}
-            dict={this.state.dict}
-            searchlist={searchlist}
-            menuType={this.props.menuType}
-            dataManager={this.props.dataManager}
-            refreshdata={this.refreshbysearch}
-          /> : null
-        }
-        <div className="commontable-main-action">
+      <div className="custom-normal-table" style={config.style}>
+        {config.wrap.collapse === 'true' ? <Collapse bordered={false} defaultActiveKey="1" expandIconPosition="right">
+          <Panel forceRender={true} header={<NormalHeader config={config}/>} key="1">
+            {searchlist && searchlist.length ?
+              <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+            }
+            <MainAction
+              BID={BID}
+              setting={setting}
+              actions={actions}
+              BData={BData}
+              columns={config.columns}
+              selectedData={selectedData}
+            />
+            <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+              <MainTable
+                setting={setting}
+                columns={columns}
+                MenuID={config.uuid}
+                data={this.state.data}
+                fields={config.columns}
+                total={this.state.total}
+                lineMarks={config.lineMarks}
+                loading={this.state.loading}
+                refreshdata={this.refreshbytable}
+                statFValue={this.state.statFValue}
+                chgSelectData={(selects) => this.setState({selectedData: selects})}
+              />
+            </div>
+          </Panel>
+        </Collapse> : <>
+          <NormalHeader config={config}/>
+          {searchlist && searchlist.length ?
+            <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+          }
           <MainAction
             BID={BID}
             setting={setting}
             actions={actions}
-            MenuName={MenuName}
-            dict={this.state.dict}
-            MenuID={this.props.MenuID}
+            BData={BData}
+            columns={config.columns}
             selectedData={selectedData}
-            logcolumns={this.state.logcolumns}
-            refreshdata={this.refreshbyaction}
-            getexceloutparam={this.getexceloutparam}
           />
-        </div>
-        <div className="main-table-box">
-          {(setting.tableType === 'radio' || setting.tableType === 'checkbox') && this.state.data && this.state.data.length > 0 ?
-            <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
-          }
-          <MainTable
-            tableId="mainTable"
-            BID={BID}
-            pickup={pickup}
-            config={config}
-            setting={setting}
-            columns={columns}
-            MenuName={MenuName}
-            pageSize={pageSize}
-            dict={this.state.dict}
-            data={this.state.data}
-            total={this.state.total}
-            MenuID={this.props.MenuID}
-            loading={this.state.loading}
-            refreshdata={this.refreshbytable}
-            logcolumns={this.state.logcolumns}
-            statFValue={this.state.statFValue}
-            handleTableId={this.handleTableId}
-            refreshbyaction={this.refreshbyaction}
-            chgSelectData={this.changeSelectedData}
-          />
-        </div>
+          <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+            <MainTable
+              setting={setting}
+              columns={columns}
+              MenuID={config.uuid}
+              data={this.state.data}
+              fields={config.columns}
+              total={this.state.total}
+              lineMarks={config.lineMarks}
+              loading={this.state.loading}
+              refreshdata={this.refreshbytable}
+              statFValue={this.state.statFValue}
+              chgSelectData={(selects) => this.setState({selectedData: selects})}
+            />
+          </div>
+        </>}
       </div>
     )
   }
@@ -519,12 +655,7 @@
 
 const mapStateToProps = (state) => {
   return {
-    menuType: state.editLevel,
-    tabviews: state.tabviews,
-    permAction: state.permAction,
-    permMenus: state.permMenus,
-    permRoles: state.permRoles,
-    dataManager: state.dataManager
+    menuType: state.editLevel
   }
 }
 

--
Gitblit v1.8.0