From c593048fd2b71df0bed46c97110e19e0b9bb3cd4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 十月 2022 15:50:53 +0800
Subject: [PATCH] 2022-10-07

---
 src/tabviews/debugtable/index.jsx |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/tabviews/debugtable/index.jsx b/src/tabviews/debugtable/index.jsx
index 8e6d5c1..7b76927 100644
--- a/src/tabviews/debugtable/index.jsx
+++ b/src/tabviews/debugtable/index.jsx
@@ -1,23 +1,34 @@
 import React, {Component} from 'react'
 import { is, fromJS } from 'immutable'
 import { notification, Table} from 'antd'
+import { RedoOutlined } from '@ant-design/icons'
 
 import Api from '@/api'
+import MKEmitter from '@/utils/events.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
 
 import './index.scss'
 
 class DebugTable extends Component {
   state = {
-    columns: null,        // 鏄剧ず鍒�
-    data: [],             // 鍒楄〃鏁版嵁闆�
-    loading: false,       // 鍒楄〃鏁版嵁鍔犺浇涓�
+    columns: [
+      {align: 'left', dataIndex: 'Sort', sorter: false, title: 'Sort', width: 120},
+      {align: 'left', dataIndex: 'CDefine1', sorter: false, title: '鏂囨湰1', width: 120},
+      {align: 'left', dataIndex: 'CDefine2', sorter: false, title: '鏂囨湰2', width: 120},
+      {align: 'left', dataIndex: 'CDefine3', sorter: false, title: '鏂囨湰3', width: 120},
+      {align: 'left', dataIndex: 'CDefine4', sorter: false, title: '鏂囨湰4', width: 120},
+      {align: 'left', dataIndex: 'CDefine5', sorter: false, title: '鏂囨湰5', width: 120},
+      {align: 'left', dataIndex: 'CDefine6', sorter: false, title: '鏂囨湰6', width: 120},
+      {align: 'left', dataIndex: 'CDefine7', sorter: false, title: '鏂囨湰7', width: 120},
+    ],
+    data: [],
+    loading: false,
     setting: {
       interType: 'system',
       execute: true,
-      dataresource: 'select * from s_debug_value_log where createuserid=@userid@'
+      dataresource: '(select * from s_debug_value_log where createuserid=@userid@) tb'
     },
-    arr_field: 'ID,Sort,CDefine1,CDefine2,CDefine3,CDefine4,CDefine5,CDefine6,CDefine7,'
+    arr_field: 'ID,Sort,CDefine1,CDefine2,CDefine3,CDefine4,CDefine5,CDefine6,CDefine7'
   }
 
   /**
@@ -30,8 +41,7 @@
       loading: true
     })
 
-    let _orderBy = 'sort'
-    let param = UtilsDM.getQueryDataParams(setting, arr_field, [], _orderBy, 1, 9999, '')
+    let param = UtilsDM.getQueryDataParams(setting, arr_field, [], 'sort', 1, 9999, '')
 
     let result = await Api.genericInterface(param)
 
@@ -42,7 +52,6 @@
         data: result.data.map((item, index) => {
           item.key = index
           item.$$uuid = item.ID || ''
-          item.$$key = '' + item.key + item.$$uuid
           item.$Index = start + index + ''
 
           return item
@@ -62,9 +71,21 @@
     }
   }
 
+  refreshByButtonResult = () => {
+    const { loading } = this.state
+
+    if (!loading) {
+      this.loadmaindata()
+    }
+  }
+
   UNSAFE_componentWillMount() {
     // 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
     this.loadmaindata()
+  }
+
+  componentDidMount() {
+    MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
   }
 
   shouldComponentUpdate (nextProps, nextState) {
@@ -78,6 +99,7 @@
     this.setState = () => {
       return
     }
+    MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
   }
 
   render() {
@@ -85,6 +107,7 @@
 
     return (
       <div className="debugtable">
+        <RedoOutlined className="mk-debug-reload" onClick={() => this.loadmaindata()}/>
         <Table size="middle" columns={columns} dataSource={data} loading={loading} scroll={{ x: '100%', y: false }}/>
       </div>
     )

--
Gitblit v1.8.0