From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18

---
 src/tabviews/scriptmanage/index.jsx |   27 ++++++---------------------
 1 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/tabviews/scriptmanage/index.jsx b/src/tabviews/scriptmanage/index.jsx
index 64395fb..06d760a 100644
--- a/src/tabviews/scriptmanage/index.jsx
+++ b/src/tabviews/scriptmanage/index.jsx
@@ -120,6 +120,7 @@
    * @description 涓昏〃鏁版嵁鍔犺浇
    */ 
   async loadmaindata () {
+    const { setting } = this.state
     let param = this.getDefaultParam()
 
     this.setState({
@@ -134,8 +135,8 @@
     if (result.status) {
       this.setState({
         data: result.data.map((item, index) => {
-          item.LongParam = Utils.UnformatOptions(item.LongParam)
           item.key = index
+          item.$$uuid = item[setting.primaryKey] || ''
           return item
         }),
         total: result.total,
@@ -195,7 +196,7 @@
    * 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
    */
   refreshbysearch = (searches) => {
-    MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
+    MKEmitter.emit('resetTable', this.props.MenuID) // 鍒楄〃閲嶇疆
     this.setState({
       loading: true,
       pageIndex: 1,
@@ -233,7 +234,7 @@
    * @description 琛ㄦ牸鍒锋柊
    */
   reloadtable = () => {
-    MKEmitter.emit('resetTable', this.props.MenuID + 'mainTable') // 鍒楄〃閲嶇疆
+    MKEmitter.emit('resetTable', this.props.MenuID) // 鍒楄〃閲嶇疆
     this.setState({
       loading: true,
       pageIndex: 1,
@@ -252,21 +253,6 @@
     }, () => {
       this.loadconfig()
     })
-  }
-
-  /**
-   * @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
-   */
-  refreshbyaction = (btn, type) => {
-    if (btn.execSuccess === 'grid' && type === 'success') {
-      this.reloadtable()
-    } else if (btn.execError === 'grid' && type === 'error') {
-      this.reloadtable()
-    } else if (btn.execSuccess === 'view' && type === 'success') {
-      this.reloadview()
-    } else if (btn.execError === 'view' && type === 'error') {
-      this.reloadview()
-    }
   }
 
   /**
@@ -332,7 +318,7 @@
           MenuID={this.props.MenuID}
           selectedData={selectedData}
           ContainerId={this.state.ContainerId}
-          refreshdata={this.refreshbyaction}
+          refreshdata={this.reloadtable}
         />
         <div className="main-table-box">
           {this.state.data && this.state.data.length > 0 ?
@@ -341,7 +327,7 @@
             </div> : null
           }
           <MainTable
-            tableId="mainTable"
+            tableId={this.props.MenuID}
             pickup={pickup}
             setting={setting}
             columns={columns}
@@ -352,7 +338,6 @@
             loading={this.state.loading}
             refreshdata={this.refreshbytable}
             buttonTrigger={() => {}}
-            handleTableId={() => {}}
             chgSelectData={this.changeSelectedData}
           />
         </div>

--
Gitblit v1.8.0