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 |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 31c67cd..5f39261 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -319,6 +319,8 @@
         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) {
@@ -365,7 +367,7 @@
     }
   }
   
-  loadData = () => {
+  loadData = (id) => {
     const { mainSearch } = this.props
     const { setting, BID, search, loadCustomApi, hasReqFields } = this.state
 
@@ -414,10 +416,10 @@
 
       this.loadOutResource(searches)
       if (setting.execType === 'async') {
-        this.loadmaindata()
+        this.loadmaindata(id)
       }
     } else {
-      this.loadmaindata()
+      this.loadmaindata(id)
     }
   }
 
@@ -557,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
@@ -591,7 +593,7 @@
   /**
    * @description 瀛愯〃鏁版嵁鍔犺浇
    */
-  async loadmaindata () {
+  async loadmaindata (id) {
     const { mainSearch } = this.props
     const { setting, BID, arr_field, search, orderBy, pageIndex, pageSize, absFields } = this.state
 
@@ -617,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'}})
@@ -638,6 +640,7 @@
           }
           item.key = index
           item.$$uuid = item[setting.primaryKey] || ''
+          item.$$key = '' + item.key + item.$$uuid
           item.$$BID = BID || ''
           item.$Index = start + index + ''
 
@@ -709,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 {
@@ -825,17 +829,17 @@
   /**
    * @description 琛ㄦ牸鍒锋柊
    */
-  reloadtable = (btn) => {
+  reloadtable = (btn, id = '') => {
     if (!btn || btn.resetPageIndex !== 'false') {
       MKEmitter.emit('resetTable', this.props.Tab.uuid) // 鍒楄〃閲嶇疆
       this.setState({
         pageIndex: 1
       }, () => {
-        this.loadData()
+        this.loadData(id)
       })
     } else {
       MKEmitter.emit('resetTable', this.props.Tab.uuid, 'false') // 鍒楄〃閲嶇疆
-      this.loadData()
+      this.loadData(id)
     }
   }
 
@@ -890,7 +894,6 @@
     const { MenuID } = this.props
 
     if (menuId.indexOf(MenuID) === -1) return
-    if (id === 'empty') return
 
     if (!id) {
       this.reloadtable()
@@ -913,19 +916,23 @@
     const { Tab, SupMenuID } = this.props
     const { BID } = this.state
 
-    if (position === 'line' && lines && lines.length === 1) {
-      this.loadmainLinedata(lines[0].$$uuid)
+    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)
+      this.reloadtable(btn, id)
     } else if (position === 'maingrid' || position === 'mainline') {
-      this.reloadtable(btn)
-      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(',')) // 鍚岀骇鏍囩閲嶇疆
       }

--
Gitblit v1.8.0