From 8562f0ce55386b26c30a76c5d17eb30b396f2ef5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 01 六月 2023 11:35:48 +0800
Subject: [PATCH] 2023-06-01
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 57db645..5421c48 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -160,20 +160,20 @@
)
}
},
- {
- title: '鎵ц浣嶇疆',
- dataIndex: 'position',
- width: '10%',
- render: (text, record) => {
- if (record.position === 'init') {
- return <span style={{color: 'orange'}}>鍒濆鍖�</span>
- } else if (record.position === 'front') {
- return <span style={{color: '#26C281'}}>sql鍓�</span>
- } else {
- return <span style={{color: '#1890ff'}}>sql鍚�</span>
- }
- }
- },
+ // {
+ // title: '鎵ц浣嶇疆',
+ // dataIndex: 'position',
+ // width: '10%',
+ // render: (text, record) => {
+ // if (record.position === 'init') {
+ // return <span style={{color: 'orange'}}>鍒濆鍖�</span>
+ // } else if (record.position === 'front') {
+ // return <span style={{color: '#26C281'}}>sql鍓�</span>
+ // } else {
+ // return <span style={{color: '#1890ff'}}>sql鍚�</span>
+ // }
+ // }
+ // },
{
title: '鐘舵��',
dataIndex: 'status',
@@ -592,7 +592,6 @@
delete _verify.tableName
delete _verify.dataresource
delete _verify.queryType
- delete _verify.primaryKey
delete _verify.defaultSql
delete _verify.order
@@ -1017,7 +1016,7 @@
}
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils, timestamp)
+ let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils, '2023-04-20 15:29:37')
let _debugId = md5(sql)
@@ -1056,7 +1055,6 @@
verify.tableName = verify.tableName || config.setting.tableName || ''
verify.dataresource = verify.dataresource || config.setting.dataresource || ''
verify.queryType = verify.queryType || config.setting.queryType || ''
- verify.primaryKey = verify.primaryKey || config.setting.primaryKey || ''
verify.defaultSql = verify.defaultSql || config.setting.execute || ''
verify.order = verify.order || config.setting.order || ''
--
Gitblit v1.8.0