Browse Source

fix: page loading

xingyu4j 2 years ago
parent
commit
1a45526a9d

+ 2 - 0
yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts

@@ -61,9 +61,11 @@ export const useVxeGrid = (allSchemas, getPageApi) => {
       props: { result: 'list', total: 'total' },
       ajax: {
         query: ({ page, form }) => {
+          gridOptions.loading = true
           const queryParams = Object.assign({}, form)
           queryParams.pageSize = page.pageSize
           queryParams.pageNo = page.currentPage
+          gridOptions.loading = false
           return new Promise(async (resolve) => {
             resolve(await getPageApi(queryParams))
           })

+ 1 - 1
yudao-ui-admin-vue3/src/views/system/menu/index.vue

@@ -318,8 +318,8 @@ const queryParams = reactive({
   status: null
 })
 const getList = async () => {
-  statusOption.value = getIntDictOptions(DICT_TYPE.COMMON_STATUS)
   tableLoading.value = true
+  statusOption.value = getIntDictOptions(DICT_TYPE.COMMON_STATUS)
   const res = await MenuApi.getMenuListApi(queryParams)
   tableData.value = res
   tableLoading.value = false