diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 792a5ba3..eba15632 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -413,5 +413,6 @@ const msg = { spanName: "Span name", parentId: "Parent ID", shareTrace: "Share This Trace", + eventDefaultCollapse: "Default Collapse", }; export default msg; diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index 156bdd43..de5505eb 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -413,5 +413,6 @@ const msg = { spanName: "Nombre de Lapso", parentId: "ID Padre", shareTrace: "Compartir Traza", + eventDefaultCollapse: "Default Collapse", }; export default msg; diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index c68a406d..22ffccd4 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -411,5 +411,6 @@ const msg = { spanName: "跨度名称", parentId: "父ID", shareTrace: "分享Trace", + eventDefaultCollapse: "默认折叠", }; export default msg; diff --git a/src/store/modules/dashboard.ts b/src/store/modules/dashboard.ts index 76ae8009..d2944104 100644 --- a/src/store/modules/dashboard.ts +++ b/src/store/modules/dashboard.ts @@ -253,9 +253,13 @@ export const dashboardStore = defineStore({ setTopology(show: boolean) { this.showTopology = show; }, - setConfigs(param: LayoutConfig) { - const actived = this.activedGridItem.split("-"); + setLayouts(param: LayoutConfig[]) { + this.layout = param; + }, + setConfigs(param: LayoutConfig, gridIndex?: string) { + const actived = gridIndex || this.activedGridItem.split("-"); const index = this.layout.findIndex((d: LayoutConfig) => actived[0] === d.i); + if (actived.length === 3) { const tabIndex = Number(actived[1]); const itemIndex = (this.layout[index].children || [])[tabIndex].children.findIndex( @@ -270,11 +274,13 @@ export const dashboardStore = defineStore({ this.setCurrentTabItems((this.layout[index].children || [])[tabIndex].children); return; } - this.layout[index] = { - ...this.layout[index], + const layout = JSON.parse(JSON.stringify(this.layout)); + layout[index] = { + ...layout[index], ...param, }; - this.selectedGrid = this.layout[index]; + this.setLayouts(layout); + this.selectedGrid = layout[index]; }, setWidget(param: LayoutConfig) { for (let i = 0; i < this.layout.length; i++) { diff --git a/src/store/modules/event.ts b/src/store/modules/event.ts index b2a59c6c..9ced69ac 100644 --- a/src/store/modules/event.ts +++ b/src/store/modules/event.ts @@ -36,8 +36,8 @@ export const eventStore = defineStore({ state: (): eventState => ({ loading: false, events: [], - instances: [{ value: "", label: "All" }], - endpoints: [{ value: "", label: "All" }], + instances: [{ value: "0", label: "All" }], + endpoints: [{ value: "0", label: "All" }], condition: null, }), actions: { @@ -58,7 +58,7 @@ export const eventStore = defineStore({ if (response.errors) { return response; } - this.instances = [{ value: "", label: "All" }, ...response.data.pods]; + this.instances = [{ value: "0", label: "All" }, ...response.data.pods]; return response; }, async getEndpoints(keyword?: string) { @@ -75,7 +75,7 @@ export const eventStore = defineStore({ if (response.errors) { return response; } - this.endpoints = [{ value: "", label: "All" }, ...response.data.pods]; + this.endpoints = [{ value: "0", label: "All" }, ...response.data.pods]; return response; }, async getEvents() { diff --git a/src/types/dashboard.ts b/src/types/dashboard.ts index 0c966c76..ad8e68e0 100644 --- a/src/types/dashboard.ts +++ b/src/types/dashboard.ts @@ -48,6 +48,7 @@ export interface LayoutConfig { id?: string; associate?: { widgetId: string }[]; eventAssociate?: boolean; + eventDefaultCollapse?: boolean; filters?: Filters; relatedTrace?: RelatedTrace; subExpressions?: string[]; diff --git a/src/views/dashboard/configuration/Event.vue b/src/views/dashboard/configuration/Event.vue index a4489476..d521f0bb 100644 --- a/src/views/dashboard/configuration/Event.vue +++ b/src/views/dashboard/configuration/Event.vue @@ -15,6 +15,10 @@ limitations under the License. -->