Merge remote-tracking branch 'origin/main'

orion-ops-launch/src/main/resources/templates/orion-vue-api.ts.vm

@@ -1,6 +1,7 @@
 import axios from 'axios';
 import qs from 'query-string';
 import { DataGrid, Pagination } from '@/types/global';
+import { TableData } from '@arco-design/web-vue/es/table/interface';
 
 /**
  * ${table.comment}创建请求
@@ -48,7 +49,7 @@ export interface ${vue.featureEntity}QueryRequest extends Pagination {
 /**
  * ${table.comment}查询响应
  */
-export interface ${vue.featureEntity}QueryResponse {
+export interface ${vue.featureEntity}QueryResponse extends TableData {
   #foreach($field in ${table.fields})
   #if("$field.propertyType" == "String")
   ${field.propertyName}?: string;

orion-ops-launch/src/main/resources/templates/orion-vue-views-components-table.vue.vm

@@ -70,7 +70,7 @@
              v-model:selectedKeys="selectedKeys"
              :row-selection="rowSelection"
              :data="tableRenderData"
-             :pagination="pagination"
+             :pagination="pagination as PaginationProps"
              @page-change="(page) => fetchTableData(page, pagination.pageSize)"
              @page-size-change="(size) => fetchTableData(pagination.current, size)"
              :bordered="false">
@@ -111,7 +111,7 @@
 <script lang="ts" setup>
   import { reactive, ref } from 'vue';
   import { batchDelete${vue.featureEntity}, delete${vue.featureEntity}, get${vue.featureEntity}Page, ${vue.featureEntity}QueryRequest, ${vue.featureEntity}QueryResponse } from '@/api/${vue.module}/${vue.feature}';
-  import { Message } from '@arco-design/web-vue';
+  import { Message, PaginationProps } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
   import { defaultPagination, defaultRowSelection } from '@/types/table';
@@ -119,7 +119,7 @@
   import {} from '../types/const';
   import { toOptions } from '@/utils/enum';
 
-  const tableRenderData = ref<${vue.featureEntity}QueryResponse[]>();
+  const tableRenderData = ref<${vue.featureEntity}QueryResponse[]>([]);
   const { loading, setLoading } = useLoading();
   const emits = defineEmits(['openAdd', 'openUpdate']);