From 9e716f3bd30820a08757845b592db73363faa48c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 25 四月 2022 14:53:37 +0800
Subject: [PATCH] 2022-04-25

---
 src/tabviews/subtable/index.jsx |  188 +++++++++++++++++++++++++++-------------------
 1 files changed, 111 insertions(+), 77 deletions(-)

diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index cc10afa..5f39261 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -2,7 +2,7 @@
 import PropTypes from 'prop-types'
 import {connect} from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { notification, Spin, Switch, Row, Col, Icon, Tabs} from 'antd'
+import { notification, Spin, Switch, Row, Col, Tabs} from 'antd'
 
 import Api from '@/api'
 import zhCN from '@/locales/zh-CN/main.js'
@@ -13,6 +13,7 @@
 import { updateSubTable } from '@/utils/utils-update.js'
 import asyncComponent from '@/utils/asyncComponent'
 import asyncSpinComponent from '@/utils/asyncSpinComponent'
+import MkIcon from '@/components/mk-icon'
 import NotFount from '@/components/404'
 import MKEmitter from '@/utils/events.js'
 
@@ -34,7 +35,6 @@
     SupMenuID: PropTypes.string,     // 涓婄骇鑿滃崟Id
     mainSearch: PropTypes.any,       // 涓昏〃鎼滅储鏉′欢
     ContainerId: PropTypes.any,      // 涓夌骇鑿滃崟Container(html) ID
-    handleTableId: PropTypes.func,   // 鎺у埗琛ㄦ牸鏁版嵁鍒囨崲鏃讹紝鏇存柊鍦ㄤ富琛ㄤ腑鐨刬d
   }
 
   state = {
@@ -62,23 +62,18 @@
     statFValue: [],       // 鍚堣鍊�
     absFields: [],        // 缁濆鍊煎瓧娈�
     loadCustomApi: true,  // 鍔犺浇澶栭儴璧勬簮
-    hasReqFields: false
+    hasReqFields: false,
+    BID: '',
+    BData: ''
   }
 
   /**
    * @description 涓婄骇鑿滃崟id鍙樺寲鏃讹紝鍒锋柊鏁版嵁
    */
   UNSAFE_componentWillReceiveProps(nextProps) {
-    const { config, setting } = this.state
+    const { setting } = this.state
 
-    if (config && setting && this.props.Tab.supMenu && !is(fromJS(this.props.BID), fromJS(nextProps.BID))) {
-      MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
-      this.setState({
-        pageIndex: 1
-      }, () => {
-        this.loadData()
-      })
-    } else if (setting && !this.props.Tab.supMenu && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+    if (setting && !this.props.Tab.supMenu && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
       this.setState({}, () => {
         this.loadData()
       })
@@ -89,7 +84,7 @@
    * @description 鑾峰彇椤甸潰閰嶇疆淇℃伅
    */
   async loadconfig () {
-    const { permAction, permMenus, Tab, BID } = this.props
+    const { permAction, permMenus, Tab } = this.props
 
     let param = {
       func: 'sPC_Get_LongParam',
@@ -320,11 +315,26 @@
         })
       }
 
-      if (config.setting.selected === 'init' && config.setting.onload === 'false') {
+      if (config.setting.selected !== 'init' && config.setting.selected !== 'always') {
         config.setting.selected = 'false'
+      } else if (config.setting.selected === 'init' && config.setting.onload === 'false') {
+        config.setting.selected = 'false'
+      } else {
+        config.setting.orisel = true
+      }
+
+      if (config.setting.controlField) {
+        if (config.setting.controlVal) {
+          config.setting.controlVal = config.setting.controlVal.split(',')
+        } else {
+          config.setting.controlVal = ['']
+        }
       }
 
       this.setState({
+        pageSize: config.setting.pageSize || 10,
+        BID: this.props.BID || '',
+        BData: this.props.BData || '',
         loadingview: false,
         chartId,
         config,
@@ -338,7 +348,7 @@
         search: Utils.initMainSearch(config.search),
         hasReqFields
       }, () => {
-        if (config.setting.onload !== 'false' && (!Tab.supMenu || BID || Tab.isTreeNode)) { // 鍒濆鍖栧彲鍔犺浇
+        if (config.setting.onload !== 'false' && (!Tab.supMenu || this.props.BID || Tab.isTreeNode)) { // 鍒濆鍖栧彲鍔犺浇
           this.loadData()
         }
       })
@@ -357,9 +367,9 @@
     }
   }
   
-  loadData = () => {
-    const { mainSearch, BID } = this.props
-    const { setting, search, loadCustomApi, hasReqFields } = this.state
+  loadData = (id) => {
+    const { mainSearch } = this.props
+    const { setting, BID, search, loadCustomApi, hasReqFields } = this.state
 
     let searches = fromJS(search).toJS()
     if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -375,7 +385,7 @@
         return
       }
     }
-    
+
     if (this.props.Tab.supMenu && !BID) { // 涓昏〃ID涓嶅瓨鍦ㄦ椂锛屼笉鏌ヨ瀛愯〃
       this.setState({
         data: [],
@@ -383,7 +393,7 @@
         statFValue: [],
         total: 0
       })
-      this.handleTableId()
+      MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
       return
     } else if (window.GLOB.systemType === 'production' && setting.interType === 'custom' && !setting.proInterface) {
       notification.warning({
@@ -397,7 +407,7 @@
     this.setState({
       selectedData: []
     })
-    this.handleTableId()
+    MKEmitter.emit('changeTableLine', this.props.ContainerId, this.props.Tab.uuid, '', '')
 
     if (setting.interType === 'custom' && loadCustomApi) {
       if (setting.execTime === 'once') {
@@ -406,16 +416,15 @@
 
       this.loadOutResource(searches)
       if (setting.execType === 'async') {
-        this.loadmaindata()
+        this.loadmaindata(id)
       }
     } else {
-      this.loadmaindata()
+      this.loadmaindata(id)
     }
   }
 
   loadOutResource = (searches) => {
-    const { BID } = this.props
-    const { setting } = this.state
+    const { setting, BID } = this.state
 
     let param = UtilsDM.getPrevQueryParams(setting, searches, BID, this.props.menuType)
 
@@ -509,7 +518,7 @@
   }
 
   customCallbackRequest = (result) => {
-    const { setting } = this.state
+    const { setting, BID } = this.state
     let errSql = ''
     if (result.$ErrCode === 'E') {
       errSql = `
@@ -533,8 +542,8 @@
       
       param = UtilsDM.getCallBackQueryParams(setting, sql, errSql)
 
-      if (this.props.BID) {
-        param.BID = this.props.BID
+      if (BID) {
+        param.BID = BID
       }
 
       if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
@@ -550,7 +559,7 @@
         Sort: index + 1
       }))
 
-      if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+      if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
         let sql = lines.map(item => (`
           ${item.insert}
           ${item.selects.join(` union all
@@ -584,9 +593,9 @@
   /**
    * @description 瀛愯〃鏁版嵁鍔犺浇
    */
-  async loadmaindata () {
-    const { mainSearch, BID } = this.props
-    const { setting, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
+  async loadmaindata (id) {
+    const { mainSearch } = this.props
+    const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
 
     let searches = fromJS(search).toJS()
     if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -610,9 +619,9 @@
         start = pageSize * (pageIndex - 1) + 1
       }
 
-      if (setting.selected !== 'false') {
+      if (setting.selected !== 'false' || (setting.orisel && id)) {
         setTimeout(() => {
-          MKEmitter.emit('mkTableCheckTopLine', this.props.MenuID)
+          MKEmitter.emit('mkTableCheckTopLine', this.props.MenuID, id)
         }, 200)
         if (setting.selected === 'init') {
           this.setState({setting: {...setting, selected: 'false'}})
@@ -631,8 +640,15 @@
           }
           item.key = index
           item.$$uuid = item[setting.primaryKey] || ''
+          item.$$key = '' + item.key + item.$$uuid
           item.$$BID = BID || ''
           item.$Index = start + index + ''
+
+          if (setting.controlField) {
+            if (setting.controlVal.includes(item[setting.controlField])) {
+              item.$disabled = true
+            }
+          }
 
           return item
         }),
@@ -658,8 +674,8 @@
    * @description 鑾峰彇鍗曡鏁版嵁
    */ 
   async loadmainLinedata (id) {
-    const { mainSearch, BID } = this.props
-    const { setting, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
+    const { mainSearch } = this.props
+    const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
 
     let searches = fromJS(search).toJS()
     if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -696,6 +712,7 @@
           data = data.map(item => {
             if (item.$$uuid === _data.$$uuid) {
               _data.key = item.key
+              _data.$$key = '' + item.key + item.$$uuid
               _data.$Index = item.$Index
               return _data
             } else {
@@ -734,8 +751,7 @@
    * @description 鑾峰彇鍚堣瀛楁鍊�
    */
   getStatFieldsValue = (searches) => {
-    const { BID } = this.props
-    const { setting, orderBy, statFields } = this.state
+    const { setting, BID, orderBy, statFields } = this.state
 
     if (statFields.length === 0 || !(setting.interType === 'system' || (setting.interType === 'custom' && setting.requestMode === 'system')) || !setting.dataresource) return
 
@@ -780,7 +796,7 @@
    * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
    */
   refreshbysearch = (searches) => {
-    MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+    MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
     this.setState({
       pageIndex: 1,
       search: searches,
@@ -813,17 +829,17 @@
   /**
    * @description 琛ㄦ牸鍒锋柊
    */
-  reloadtable = (btn) => {
+  reloadtable = (btn, id = '') => {
     if (!btn || btn.resetPageIndex !== 'false') {
-      MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+      MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
       this.setState({
         pageIndex: 1
       }, () => {
-        this.loadData()
+        this.loadData(id)
       })
     } else {
-      MKEmitter.emit('resetTable', this.props.MenuID + this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
-      this.loadData()
+      MKEmitter.emit('resetTable', this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
+      this.loadData(id)
     }
   }
 
@@ -857,13 +873,6 @@
   }
 
   /**
-   * @description 琛ㄦ牸Id鍙樺寲
-   */
-  handleTableId = (type = this.props.Tab.uuid, id = '', data = '') => {
-    this.props.handleTableId(type, id, data)
-  }
-
-  /**
    * @description 鏁版嵁灞曞紑鍚堝苟鍒囨崲
    */
   pickupChange = () => {
@@ -885,7 +894,6 @@
     const { MenuID } = this.props
 
     if (menuId.indexOf(MenuID) === -1) return
-    if (id === 'empty') return
 
     if (!id) {
       this.reloadtable()
@@ -900,29 +908,54 @@
    * @param {*} position   // 鍒锋柊浣嶇疆
    * @param {*} btn        // 鎵ц鐨勬寜閽�
    */
-  refreshByButtonResult = (menuId, position, btn) => {
+  refreshByButtonResult = (menuId, position, btn, id, lines) => {
     const { MenuID } = this.props
 
     if (MenuID !== menuId) return
 
-    const { Tab, SupMenuID, BID } = this.props
+    const { Tab, SupMenuID } = this.props
+    const { BID } = this.state
 
-    if (position === 'grid' || position === 'view') {
-      this.reloadtable(btn)
+    if (position === 'line') {
+      if (lines && lines.length === 1) {
+        this.loadmainLinedata(lines[0].$$uuid)
+      } else {
+        this.reloadtable(btn, id)
+      }
+    } else if (position === 'grid' || position === 'view') {
+      this.reloadtable(btn, id)
     } else if (position === 'maingrid' || position === 'mainline') {
-      this.reloadtable(btn)
-      if (Tab.supMenu === 'mainTable') {
-        MKEmitter.emit('reloadData', SupMenuID, (BID || 'empty'))   // 涓昏〃閲嶇疆
-      } else if (Tab.supMenu) {
-        MKEmitter.emit('reloadData', Tab.supMenu, (BID || 'empty')) // 涓昏〃閲嶇疆
-      } else if (!Tab.supMenu && Tab.level === 0) {
-        MKEmitter.emit('reloadData', SupMenuID, (BID || 'empty'))   // 鏍戝舰缁撴瀯锛�0绾ф爣绛�
+      this.reloadtable(btn, id)
+      if (Tab.supMenu && BID) {
+        MKEmitter.emit('reloadData', Tab.supMenu, BID) // 涓昏〃閲嶇疆
+      } else if (!Tab.supMenu && Tab.level === 0 && BID) {
+        MKEmitter.emit('reloadData', SupMenuID, BID)   // 鏍戝舰缁撴瀯锛�0绾ф爣绛�
       }
     } else if (position === 'equaltab') {
-      this.reloadtable(btn)
+      this.reloadtable(btn, id)
       if (Tab.equalTab && Tab.equalTab.length > 0) {
         MKEmitter.emit('reloadData', Tab.equalTab.join(',')) // 鍚岀骇鏍囩閲嶇疆
       }
+    }
+  }
+
+  changeTableLine = (ContainerId, tableId, id, data) => {
+    const { Tab } = this.props
+    const { setting } = this.state
+
+    if (!Tab.supMenu || tableId !== Tab.supMenu) return
+
+    this.setState({BData: data, BID: id})
+
+    if (!setting) return
+
+    if (id !== this.state.BID || id !== '') {
+      MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
+      this.setState({
+        pageIndex: 1
+      }, () => {
+        this.loadData()
+      })
     }
   }
 
@@ -931,12 +964,13 @@
     this.loadconfig()
   }
 
-  shouldComponentUpdate (nextProps, nextState) { // handleTableId 鍑芥暟鍒ゆ柇鏃朵笉鐩哥瓑
-    return !is(fromJS({...this.props, handleTableId: ''}), fromJS({...nextProps, handleTableId: ''})) || !is(fromJS(this.state), fromJS(nextState))
+  shouldComponentUpdate (nextProps, nextState) {
+    return !is(fromJS(this.state), fromJS(nextState))
   }
 
   componentDidMount () {
     MKEmitter.addListener('reloadData', this.reloadData)
+    MKEmitter.addListener('changeTableLine', this.changeTableLine)
     MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
   }
@@ -949,24 +983,25 @@
       return
     }
     MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('changeTableLine', this.changeTableLine)
     MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
     MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
   }
 
   render() {
-    const { config, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, chartId, selectedData } = this.state
+    const { config, BID, BData, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, chartId, selectedData } = this.state
 
     return (
       <div className="subtable" id={'subtable' + this.props.MenuID}>
         {loadingview && <Spin />}
         {searchlist && searchlist.length ?
-          <SubSearch BID={this.props.BID} setting={setting} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+          <SubSearch BID={BID} setting={setting} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
         }
         {config ? <Row className="chart-view" gutter={16}>
           {/* 瑙嗗浘缁� */}
           {!config.expand ? <Tabs activeKey={chartId} onChange={this.changeChart}>
             {config.charts.map(item => (
-              <TabPane tab={<Icon type={item.icon} />} key={item.uuid}></TabPane>
+              <TabPane tab={<MkIcon type={item.icon} />} key={item.uuid}></TabPane>
             ))}
           </Tabs> : null}
           {config.charts.map(item => {
@@ -977,12 +1012,12 @@
                   {config.charts.length > 1 ? <p className="chart-table chart-title">{item.title}</p> : null}
                   <div className="sub-action">
                     <SubAction
+                      BID={BID}
+                      BData={BData}
                       setting={setting}
                       actions={actions}
                       columns={columns}
                       Tab={this.props.Tab}
-                      BID={this.props.BID}
-                      BData={this.props.BData}
                       MenuID={this.props.MenuID}
                       selectedData={selectedData}
                       ContainerId={this.props.ContainerId}
@@ -993,6 +1028,7 @@
                       <Switch title="鏀惰捣" className="subtable-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
                     }
                     <SubTable
+                      BData={BData}
                       tableId={this.props.Tab.uuid}
                       pickup={pickup}
                       setting={setting}
@@ -1000,14 +1036,12 @@
                       pageSize={pageSize}
                       dict={this.state.dict}
                       data={this.state.data}
-                      BData={this.props.BData}
                       total={this.state.total}
                       MenuID={this.props.MenuID}
                       loading={this.state.loading}
                       statFValue={this.state.statFValue}
                       ContainerId={this.props.ContainerId}
                       refreshdata={this.refreshbytable}
-                      handleTableId={this.handleTableId}
                       chgSelectData={this.changeSelectedData}
                     />
                   </div>
@@ -1017,17 +1051,17 @@
               return (
                 <Col className="card-view" span={item.width} key={item.uuid}>
                   <CardComponent
+                    BID={BID}
                     plot={item}
+                    BData={BData}
                     config={config}
                     columns={columns}
                     Tab={this.props.Tab}
-                    BID={this.props.BID}
-                    BData={this.props.BData}
                     data={this.state.data}
                     MenuID={this.props.MenuID}
                     loading={this.state.loading}
                     tableId={this.props.Tab.uuid}
-                    handleTableId={this.handleTableId}
+                    ContainerId={this.props.ContainerId}
                   />
                 </Col>
               )
@@ -1035,9 +1069,9 @@
               return (
                 <Col span={item.width} key={item.uuid}>
                   <ChartComponent
+                    BID={BID}
                     plot={item}
                     config={config}
-                    BID={this.props.BID}
                     Tab={this.props.Tab}
                     data={this.state.data}
                     loading={this.state.loading}

--
Gitblit v1.8.0