From da12657a74b2333bcd38549d8df6318e5385450a Mon Sep 17 00:00:00 2001 From: sage Date: Thu, 13 Oct 2022 10:50:55 +0800 Subject: [PATCH] support gid search --- admin/src/api/api_dtm.ts | 5 +- admin/src/components.d.ts | 3 + .../GlobalTransactions/AllTransactions.vue | 213 +++++++++++------- dtmsvr/api_http.go | 12 +- 4 files changed, 143 insertions(+), 90 deletions(-) diff --git a/admin/src/api/api_dtm.ts b/admin/src/api/api_dtm.ts index 20f368a..69c0a9a 100644 --- a/admin/src/api/api_dtm.ts +++ b/admin/src/api/api_dtm.ts @@ -1,7 +1,8 @@ -import { AxiosResponse } from 'axios' +import {AxiosResponse} from 'axios' import request from '/@/utils/request' export interface IListAllTransactionsReq { + gid?: string, limit: number position?: string } @@ -18,7 +19,7 @@ export function forceStopTransaction(gid: string): Promise { return request({ url: '/api/dtmsvr/forceStop', method: 'post', - data: { gid }, + data: {gid}, }) } diff --git a/admin/src/components.d.ts b/admin/src/components.d.ts index eb0b33b..b190d54 100644 --- a/admin/src/components.d.ts +++ b/admin/src/components.d.ts @@ -9,6 +9,9 @@ declare module '@vue/runtime-core' { ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] ABreadcrumbItem: typeof import('ant-design-vue/es')['BreadcrumbItem'] AButton: typeof import('ant-design-vue/es')['Button'] + AForm: typeof import('ant-design-vue/es')['Form'] + AFormItem: typeof import('ant-design-vue/es')['FormItem'] + AInput: typeof import('ant-design-vue/es')['Input'] ALayout: typeof import('ant-design-vue/es')['Layout'] ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent'] ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader'] diff --git a/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue b/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue index e57924d..63b4a44 100644 --- a/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue +++ b/admin/src/views/Dashboard/GlobalTransactions/AllTransactions.vue @@ -1,142 +1,181 @@ diff --git a/dtmsvr/api_http.go b/dtmsvr/api_http.go index 3e9763b..63e642a 100644 --- a/dtmsvr/api_http.go +++ b/dtmsvr/api_http.go @@ -95,9 +95,19 @@ func prepareWorkflow(c *gin.Context) interface{} { } func all(c *gin.Context) interface{} { + gid := c.Query("gid") position := c.Query("position") sLimit := dtmimp.OrString(c.Query("limit"), "100") - globals := GetStore().ScanTransGlobalStores(&position, int64(dtmimp.MustAtoi(sLimit))) + + var globals interface{} + if len(gid) > 0 { + find := GetStore().FindTransGlobalStore(gid) + if find != nil { + globals = []interface{}{*find} + } + } else { + globals = GetStore().ScanTransGlobalStores(&position, int64(dtmimp.MustAtoi(sLimit))) + } return map[string]interface{}{"transactions": globals, "next_position": position} }