You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/05/19 11:29:06 UTC
[skywalking-booster-ui] branch main updated: feat: remove needTotal and total fields from query conditions (#94)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new b544dec feat: remove needTotal and total fields from query conditions (#94)
b544dec is described below
commit b544decbbbb5c656118f2d45564dbea59c96d7e7
Author: Fine0830 <fi...@outlook.com>
AuthorDate: Thu May 19 19:29:02 2022 +0800
feat: remove needTotal and total fields from query conditions (#94)
---
src/graphql/fragments/alarm.ts | 1 -
src/graphql/fragments/event.ts | 1 -
src/graphql/fragments/log.ts | 1 -
src/store/modules/event.ts | 5 +----
src/views/alarm/Header.vue | 12 ++++++++----
src/views/dashboard/related/log/Header.vue | 6 +++---
src/views/event/Header.vue | 12 ++++++++----
7 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/graphql/fragments/alarm.ts b/src/graphql/fragments/alarm.ts
index bf4421e..49d1bbb 100644
--- a/src/graphql/fragments/alarm.ts
+++ b/src/graphql/fragments/alarm.ts
@@ -45,6 +45,5 @@ export const Alarm = {
endTime
}
}
- total
}`,
};
diff --git a/src/graphql/fragments/event.ts b/src/graphql/fragments/event.ts
index 00d5bb0..49262e4 100644
--- a/src/graphql/fragments/event.ts
+++ b/src/graphql/fragments/event.ts
@@ -35,6 +35,5 @@ export const FetchEvents = {
startTime
endTime
}
- total
}`,
};
diff --git a/src/graphql/fragments/log.ts b/src/graphql/fragments/log.ts
index 18e814e..e348668 100644
--- a/src/graphql/fragments/log.ts
+++ b/src/graphql/fragments/log.ts
@@ -30,7 +30,6 @@ export const QueryBrowserErrorLogs = {
stack
grade
}
- total
}`,
};
diff --git a/src/store/modules/event.ts b/src/store/modules/event.ts
index 8adce8f..01b6788 100644
--- a/src/store/modules/event.ts
+++ b/src/store/modules/event.ts
@@ -25,7 +25,6 @@ import { useAppStoreWithOut } from "@/store/modules/app";
interface eventState {
loading: boolean;
events: Event[];
- total: number;
services: Service[];
instances: Instance[];
endpoints: Endpoint[];
@@ -37,12 +36,11 @@ export const eventStore = defineStore({
state: (): eventState => ({
loading: false,
events: [],
- total: 0,
services: [{ value: "", label: "All" }],
instances: [{ value: "", label: "All" }],
endpoints: [{ value: "", label: "All" }],
condition: {
- paging: { pageNum: 1, pageSize: 15, needTotal: true },
+ paging: { pageNum: 1, pageSize: 15 },
},
}),
actions: {
@@ -117,7 +115,6 @@ export const eventStore = defineStore({
return item;
}
);
- this.total = res.data.data.fetchEvents.total;
}
return res.data;
},
diff --git a/src/views/alarm/Header.vue b/src/views/alarm/Header.vue
index 3b9bb4c..15e9be6 100644
--- a/src/views/alarm/Header.vue
+++ b/src/views/alarm/Header.vue
@@ -39,8 +39,8 @@ limitations under the License. -->
<el-pagination
v-model:currentPage="pageNum"
v-model:page-size="pageSize"
- layout="prev, jumper, total, next"
- :total="alarmStore.total"
+ layout="prev, pager, next"
+ :total="total"
@current-change="changePage"
:pager-count="5"
small
@@ -55,7 +55,7 @@ limitations under the License. -->
</nav>
</template>
<script lang="ts" setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
import { useI18n } from "vue-i18n";
import ConditionTags from "@/views/components/ConditionTags.vue";
import { AlarmOptions } from "./data";
@@ -70,6 +70,11 @@ const pageSize = 20;
const entity = ref<string>("");
const keyword = ref<string>("");
const pageNum = ref<number>(1);
+const total = computed(() =>
+ alarmStore.alarms.length === pageSize
+ ? pageSize * pageNum.value + 1
+ : pageSize * pageNum.value
+);
refreshAlarms({ pageNum: 1 });
@@ -79,7 +84,6 @@ async function refreshAlarms(param: { pageNum: number; tagsMap?: any }) {
paging: {
pageNum: param.pageNum,
pageSize,
- needTotal: true,
},
tags: param.tagsMap,
};
diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue
index 023d964..a2cc9b7 100644
--- a/src/views/dashboard/related/log/Header.vue
+++ b/src/views/dashboard/related/log/Header.vue
@@ -37,9 +37,9 @@ limitations under the License. -->
/>
</div>
<div class="mr-5" v-if="dashboardStore.entity !== EntityType[2].value">
- <span class="grey mr-5"
- >{{ isBrowser ? t("page") : t("endpoint") }}:</span
- >
+ <span class="grey mr-5">
+ {{ isBrowser ? t("page") : t("endpoint") }}:
+ </span>
<Selector
size="small"
:value="state.endpoint.value"
diff --git a/src/views/event/Header.vue b/src/views/event/Header.vue
index 235da4b..3b2da10 100644
--- a/src/views/event/Header.vue
+++ b/src/views/event/Header.vue
@@ -75,8 +75,8 @@ limitations under the License. -->
<el-pagination
v-model:currentPage="pageNum"
v-model:page-size="pageSize"
- layout="prev, jumper, total, next"
- :total="eventStore.total"
+ layout="prev, pager, next"
+ :total="total"
@current-change="updatePage"
:pager-count="5"
small
@@ -92,7 +92,7 @@ limitations under the License. -->
</nav>
</template>
<script lang="ts" setup>
-import { ref, reactive } from "vue";
+import { ref, reactive, computed } from "vue";
import { useI18n } from "vue-i18n";
import { EventTypes } from "./data";
import { useEventStore } from "@/store/modules/event";
@@ -119,6 +119,11 @@ const state = reactive<{
instance: "",
endpoint: "",
});
+const total = computed(() =>
+ eventStore.events.length === pageSize
+ ? pageSize * pageNum.value + 1
+ : pageSize * pageNum.value
+);
getSelectors();
@@ -180,7 +185,6 @@ async function queryEvents() {
paging: {
pageNum: pageNum.value,
pageSize: pageSize,
- needTotal: true,
},
source: {
service: state.service || "",