!261 [mod]适配分页返回数据放入data中返回

Merge pull request !261 from YueYe/future/new

src/api/demo/demo/index.ts

@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询测试单列表
  * @param query
  * @returns {*}
  */
-export const listDemo = (query?: DemoQuery): AxiosPromise<DemoVO[]> => {
+export const listDemo = (query?: DemoQuery): AxiosPromise<PageResult<DemoVO>> => {
   return request({
     url: '/demo/demo/list',
     method: 'get',

src/api/monitor/loginInfo/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { LoginInfoQuery, LoginInfoVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询登录日志列表
-export function list(query: LoginInfoQuery): AxiosPromise<LoginInfoVO[]> {
+export function list(query: LoginInfoQuery): AxiosPromise<PageResult<LoginInfoVO>> {
   return request({
     url: '/monitor/loginInfo/list',
     method: 'get',

src/api/monitor/online/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { OnlineQuery, OnlineVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询在线用户列表
-export function list(query: OnlineQuery): AxiosPromise<OnlineVO[]> {
+export function list(query: OnlineQuery): AxiosPromise<PageResult<OnlineVO>> {
   return request({
     url: '/monitor/online/list',
     method: 'get',

src/api/monitor/operlog/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { OperLogQuery, OperLogVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询操作日志列表
-export function list(query: OperLogQuery): AxiosPromise<OperLogVO[]> {
+export function list(query: OperLogQuery): AxiosPromise<PageResult<OperLogVO>> {
   return request({
     url: '/monitor/operlog/list',
     method: 'get',

src/api/system/client/index.ts

@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { ClientVO, ClientForm, ClientQuery } from '@/api/system/client/types';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询客户端管理列表
@@ -8,7 +9,7 @@ import { ClientVO, ClientForm, ClientQuery } from '@/api/system/client/types';
  * @returns {*}
  */
 
-export const listClient = (query?: ClientQuery): AxiosPromise<ClientVO[]> => {
+export const listClient = (query?: ClientQuery): AxiosPromise<PageResult<ClientVO>> => {
   return request({
     url: '/system/client/list',
     method: 'get',

src/api/system/config/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { ConfigForm, ConfigQuery, ConfigVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询参数列表
-export function listConfig(query: ConfigQuery): AxiosPromise<ConfigVO[]> {
+export function listConfig(query: ConfigQuery): AxiosPromise<PageResult<ConfigVO>> {
   return request({
     url: '/system/config/list',
     method: 'get',

src/api/system/dict/type/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { DictTypeForm, DictTypeVO, DictTypeQuery } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询字典类型列表
-export function listType(query: DictTypeQuery): AxiosPromise<DictTypeVO[]> {
+export function listType(query: DictTypeQuery): AxiosPromise<PageResult<DictTypeVO>> {
   return request({
     url: '/system/dict/type/list',
     method: 'get',

src/api/system/notice/index.ts

@@ -1,8 +1,9 @@
 import request from '@/utils/request';
 import { NoticeForm, NoticeQuery, NoticeVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 // 查询公告列表
-export function listNotice(query: NoticeQuery): AxiosPromise<NoticeVO[]> {
+export function listNotice(query: NoticeQuery): AxiosPromise<PageResult<NoticeVO>> {
   return request({
     url: '/system/notice/list',
     method: 'get',

src/api/system/oss/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { OssQuery, OssVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询OSS对象存储列表
-export function listOss(query: OssQuery): AxiosPromise<OssVO[]> {
+export function listOss(query: OssQuery): AxiosPromise<PageResult<OssVO>> {
   return request({
     url: '/resource/oss/list',
     method: 'get',

src/api/system/ossConfig/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { OssConfigForm, OssConfigQuery, OssConfigVO } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询对象存储配置列表
-export function listOssConfig(query: OssConfigQuery): AxiosPromise<OssConfigVO[]> {
+export function listOssConfig(query: OssConfigQuery): AxiosPromise<PageResult<OssConfigVO>> {
   return request({
     url: '/resource/oss/config/list',
     method: 'get',

src/api/system/post/index.ts

@@ -2,9 +2,10 @@ import request from '@/utils/request';
 import { PostForm, PostQuery, PostVO } from './types';
 import { AxiosPromise } from 'axios';
 import { DeptTreeVO } from '../dept/types';
+import { PageResult } from '@/api/types';
 
 // 查询岗位列表
-export function listPost(query: PostQuery): AxiosPromise<PostVO[]> {
+export function listPost(query: PostQuery): AxiosPromise<PageResult<PostVO>> {
   return request({
     url: '/system/post/list',
     method: 'get',

src/api/system/role/index.ts

@@ -3,8 +3,9 @@ import { UserQuery } from '@/api/system/user/types';
 import { AxiosPromise } from 'axios';
 import { RoleQuery, RoleVO, RoleDeptTree } from './types';
 import request from '@/utils/request';
+import { PageResult } from '@/api/types';
 
-export const listRole = (query: RoleQuery): AxiosPromise<RoleVO[]> => {
+export const listRole = (query: RoleQuery): AxiosPromise<PageResult<RoleVO>> => {
   return request({
     url: '/system/role/list',
     method: 'get',
@@ -95,7 +96,7 @@ export const delRole = (roleId: Array<string | number> | string | number) => {
 /**
  * 查询角色已授权用户列表
  */
-export const allocatedUserList = (query: UserQuery): AxiosPromise<UserVO[]> => {
+export const allocatedUserList = (query: UserQuery): AxiosPromise<PageResult<UserVO>> => {
   return request({
     url: '/system/role/authUser/allocatedList',
     method: 'get',
@@ -106,7 +107,7 @@ export const allocatedUserList = (query: UserQuery): AxiosPromise<UserVO[]> => {
 /**
  * 查询角色未授权用户列表
  */
-export const unallocatedUserList = (query: UserQuery): AxiosPromise<UserVO[]> => {
+export const unallocatedUserList = (query: UserQuery): AxiosPromise<PageResult<UserVO>> => {
   return request({
     url: '/system/role/authUser/unallocatedList',
     method: 'get',

src/api/system/user/index.ts

@@ -4,12 +4,13 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { UserForm, UserQuery, UserVO, UserInfoVO } from './types';
 import { parseStrEmpty } from '@/utils/ruoyi';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询用户列表
  * @param query
  */
-export const listUser = (query: UserQuery): AxiosPromise<UserVO[]> => {
+export const listUser = (query: UserQuery): AxiosPromise<PageResult<UserVO>> => {
   return request({
     url: '/system/user/list',
     method: 'get',

src/api/tool/gen/index.ts

@@ -1,9 +1,10 @@
 import request from '@/utils/request';
 import { DbTableQuery, DbTableVO, TableQuery, TableVO, GenTableVO, DbTableForm } from './types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 // 查询生成表数据
-export const listTable = (query: TableQuery): AxiosPromise<TableVO[]> => {
+export const listTable = (query: TableQuery): AxiosPromise<PageResult<TableVO>> => {
   return request({
     url: '/tool/gen/list',
     method: 'get',
@@ -11,7 +12,7 @@ export const listTable = (query: TableQuery): AxiosPromise<TableVO[]> => {
   });
 };
 // 查询db数据库列表
-export const listDbTable = (query: DbTableQuery): AxiosPromise<DbTableVO[]> => {
+export const listDbTable = (query: DbTableQuery): AxiosPromise<PageResult<DbTableVO>> => {
   return request({
     url: '/tool/gen/db/list',
     method: 'get',

src/api/types.ts

@@ -41,3 +41,11 @@ export interface VerifyCodeResult {
   uuid?: string;
   img?: string;
 }
+
+/**
+ * 分页返回结果
+ */
+export interface PageResult<T = any> {
+  total: number;
+  rows: T[];
+}

src/api/workflow/definition/index.ts

@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { FlowDefinitionQuery, definitionXmlVO, FlowDefinitionForm, FlowDefinitionVo } from '@/api/workflow/definition/types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 /**
  * 获取流程定义列表
  * @param query 流程实例id
  * @returns
  */
-export const listDefinition = (query: FlowDefinitionQuery): AxiosPromise<FlowDefinitionVo[]> => {
+export const listDefinition = (query: FlowDefinitionQuery): AxiosPromise<PageResult<FlowDefinitionVo>> => {
   return request({
     url: `/workflow/definition/list`,
     method: 'get',
@@ -20,7 +21,7 @@ export const listDefinition = (query: FlowDefinitionQuery): AxiosPromise<FlowDef
  * @param query 流程实例id
  * @returns
  */
-export const unPublishList = (query: FlowDefinitionQuery): AxiosPromise<FlowDefinitionVo[]> => {
+export const unPublishList = (query: FlowDefinitionQuery): AxiosPromise<PageResult<FlowDefinitionVo>> => {
   return request({
     url: `/workflow/definition/unPublishList`,
     method: 'get',

src/api/workflow/instance/index.ts

@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
 import { AxiosPromise } from 'axios';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询运行中实例列表
  * @param query
  * @returns {*}
  */
-export const pageByRunning = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+export const pageByRunning = (query: FlowInstanceQuery): AxiosPromise<PageResult<FlowInstanceVO>> => {
   return request({
     url: '/workflow/instance/pageByRunning',
     method: 'get',
@@ -20,7 +21,7 @@ export const pageByRunning = (query: FlowInstanceQuery): AxiosPromise<FlowInstan
  * @param query
  * @returns {*}
  */
-export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+export const pageByFinish = (query: FlowInstanceQuery): AxiosPromise<PageResult<FlowInstanceVO>> => {
   return request({
     url: '/workflow/instance/pageByFinish',
     method: 'get',
@@ -43,7 +44,7 @@ export const flowHisTaskList = (businessId: string | number) => {
  * @param query
  * @returns {*}
  */
-export const pageByCurrent = (query: FlowInstanceQuery): AxiosPromise<FlowInstanceVO[]> => {
+export const pageByCurrent = (query: FlowInstanceQuery): AxiosPromise<PageResult<FlowInstanceVO>> => {
   return request({
     url: '/workflow/instance/pageByCurrent',
     method: 'get',

src/api/workflow/leave/index.ts

@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/workflow/leave/types';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询请假列表
@@ -8,7 +9,7 @@ import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/workflow/leave/types';
  * @returns {*}
  */
 
-export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
+export const listLeave = (query?: LeaveQuery): AxiosPromise<PageResult<LeaveVO>> => {
   return request({
     url: '/workflow/leave/list',
     method: 'get',

src/api/workflow/spel/index.ts

@@ -1,6 +1,7 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { SpelVO, SpelForm, SpelQuery } from '@/api/workflow/spel/types';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询流程spel表达式定义列表
@@ -8,7 +9,7 @@ import { SpelVO, SpelForm, SpelQuery } from '@/api/workflow/spel/types';
  * @returns {*}
  */
 
-export const listSpel = (query?: SpelQuery): AxiosPromise<SpelVO[]> => {
+export const listSpel = (query?: SpelQuery): AxiosPromise<PageResult<SpelVO>> => {
   return request({
     url: '/workflow/spel/list',
     method: 'get',

src/api/workflow/task/index.ts

@@ -1,13 +1,14 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { TaskQuery, FlowTaskVO, TaskOperationBo } from '@/api/workflow/task/types';
+import { PageResult } from '@/api/types';
 
 /**
  * 查询待办列表
  * @param query
  * @returns {*}
  */
-export const pageByTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
+export const pageByTaskWait = (query: TaskQuery): AxiosPromise<PageResult<FlowTaskVO>> => {
   return request({
     url: '/workflow/task/pageByTaskWait',
     method: 'get',
@@ -20,7 +21,7 @@ export const pageByTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> =>
  * @param query
  * @returns {*}
  */
-export const pageByTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
+export const pageByTaskFinish = (query: TaskQuery): AxiosPromise<PageResult<FlowTaskVO>> => {
   return request({
     url: '/workflow/task/pageByTaskFinish',
     method: 'get',
@@ -33,7 +34,7 @@ export const pageByTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> =
  * @param query
  * @returns {*}
  */
-export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
+export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<PageResult<FlowTaskVO>> => {
   return request({
     url: '/workflow/task/pageByTaskCopy',
     method: 'get',
@@ -46,7 +47,7 @@ export const pageByTaskCopy = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> =>
  * @param query
  * @returns {*}
  */
-export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
+export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<PageResult<FlowTaskVO>> => {
   return request({
     url: '/workflow/task/pageByAllTaskWait',
     method: 'get',
@@ -59,7 +60,7 @@ export const pageByAllTaskWait = (query: TaskQuery): AxiosPromise<FlowTaskVO[]>
  * @param query
  * @returns {*}
  */
-export const pageByAllTaskFinish = (query: TaskQuery): AxiosPromise<FlowTaskVO[]> => {
+export const pageByAllTaskFinish = (query: TaskQuery): AxiosPromise<PageResult<FlowTaskVO>> => {
   return request({
     url: '/workflow/task/pageByAllTaskFinish',
     method: 'get',

src/components/RoleSelect/index.vue

@@ -153,8 +153,8 @@ const computedIds = (data) => {
 const getList = () => {
   loading.value = true;
   api.listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
-    roleList.value = res.rows;
+    roleList.value = res.data?.rows;
-    total.value = res.total;
+    total.value = res.data?.total;
     loading.value = false;
   });
 };

src/components/UserSelect/index.vue

@@ -218,8 +218,8 @@ const getList = async () => {
   queryParams.value.userIds = prop.userIds;
   const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
   loading.value = false;
-  userList.value = res.rows;
+  userList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
 };
 
 const pageList = async () => {

src/views/demo/demo/index.vue

@@ -147,8 +147,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listDemo(queryParams.value);
-  demoList.value = res.rows;
+  demoList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 

src/views/monitor/logininfo/index.vue

@@ -147,8 +147,8 @@ const queryParams = ref<LoginInfoQuery>({
 const getList = async () => {
   loading.value = true;
   const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
-  loginInfoList.value = res.rows;
+  loginInfoList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 搜索按钮操作 */

src/views/monitor/online/index.vue

@@ -105,8 +105,8 @@ const queryParams = ref<OnlineQuery>({
 const getList = async () => {
   loading.value = true;
   const res = await initData(queryParams.value);
-  onlineList.value = res.rows;
+  onlineList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 搜索按钮操作 */

src/views/monitor/operlog/index.vue

@@ -198,8 +198,8 @@ const { queryParams, form } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await list(proxy?.addDateRange(queryParams.value, dateRange.value));
-  operlogList.value = res.rows;
+  operlogList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 操作日志类型字典翻译 */

src/views/system/client/index.vue

@@ -210,8 +210,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listClient(queryParams.value);
-  clientList.value = res.rows;
+  clientList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 

src/views/system/config/index.vue

@@ -178,8 +178,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listConfig(proxy?.addDateRange(queryParams.value, dateRange.value));
-  configList.value = res.rows;
+  configList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 取消按钮 */

src/views/system/dict/index.vue

@@ -393,8 +393,8 @@ const { queryParams: dataQueryParams, form: dataForm, rules: dataRules } = toRef
 const getTypeList = () => {
   typeLoading.value = true;
   listType(typeQueryParams.value).then((res) => {
-    typeList.value = res.rows;
+    typeList.value = res.data?.rows;
-    typeTotal.value = res.total;
+    typeTotal.value = res.data?.total;
     typeLoading.value = false;
     ensureCurrentType();
   });
@@ -512,8 +512,8 @@ const getDataList = async () => {
   }
   dataLoading.value = true;
   const res = await listData(dataQueryParams.value);
-  dataList.value = res.rows;
+  dataList.value = res.data?.rows;
-  dataTotal.value = res.total;
+  dataTotal.value = res.data?.total;
   dataLoading.value = false;
 };
 

src/views/system/notice/index.vue

@@ -179,8 +179,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listNotice(queryParams.value);
-  noticeList.value = res.rows;
+  noticeList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 取消按钮 */

src/views/system/oss/config.vue

@@ -260,8 +260,8 @@ const protocol = computed(() => (form.value.isHttps === 'Y' ? 'https://' : 'http
 const getList = async () => {
   loading.value = true;
   const res = await listOssConfig(queryParams.value);
-  ossConfigList.value = res.rows;
+  ossConfigList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 取消按钮 */

src/views/system/oss/index.vue

@@ -198,8 +198,8 @@ const getList = async () => {
   const res = await proxy?.getConfigKey('sys.oss.previewListResource');
   previewListResource.value = res?.data === undefined ? true : res.data === 'true';
   const response = await listOss(proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime'));
-  ossList.value = response.rows;
+  ossList.value = response.data?.rows;
-  total.value = response.total;
+  total.value = response.data?.total;
   loading.value = false;
   showTable.value = true;
 };

src/views/system/post/index.vue

@@ -274,8 +274,8 @@ const handleNodeClick = (data: DeptVO) => {
 const getList = async () => {
   loading.value = true;
   const res = await listPost(queryParams.value);
-  postList.value = res.rows;
+  postList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 

src/views/system/role/authUser.vue

@@ -101,8 +101,8 @@ const queryParams = reactive<UserQuery>({
 const getList = async () => {
   loading.value = true;
   const res = await allocatedUserList(queryParams);
-  userList.value = res.rows;
+  userList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 // 返回按钮

src/views/system/role/index.vue

@@ -280,8 +280,8 @@ const dialog = reactive<DialogOption>({
 const getList = () => {
   loading.value = true;
   listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
-    roleList.value = res.rows;
+    roleList.value = res.data?.rows;
-    total.value = res.total;
+    total.value = res.data?.total;
     loading.value = false;
   });
 };

src/views/system/role/selectUser.vue

@@ -100,8 +100,8 @@ const handleSelectionChange = (selection: UserVO[]) => {
 /** 查询数据 */
 const getList = async () => {
   const res = await unallocatedUserList(queryParams);
-  userList.value = res.rows;
+  userList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {

src/views/system/user/index.vue

@@ -455,8 +455,8 @@ const getList = async () => {
   loading.value = true;
   const res = await api.listUser(proxy?.addDateRange(queryParams.value, dateRange.value));
   loading.value = false;
-  userList.value = res.rows;
+  userList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
 };
 
 /** 查询部门下拉树结构 */

src/views/system/user/profile/index.vue

@@ -133,7 +133,7 @@ const getAuths = async () => {
 };
 const getOnlines = async () => {
   const res = await getOnline();
-  state.value.devices = res.rows;
+  state.value.devices = res.data?.rows;
 };
 
 onMounted(() => {

src/views/tool/gen/importTable.vue

@@ -88,8 +88,8 @@ const handleSelectionChange = (selection: DbTableVO[]) => {
 /** 查询表数据 */
 const getList = async () => {
   const res = await listDbTable(queryParams);
-  dbTableList.value = res.rows;
+  dbTableList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {

src/views/tool/gen/index.vue

@@ -170,8 +170,8 @@ const getDataNameList = async () => {
 const getList = async () => {
   loading.value = true;
   const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
-  tableList.value = res.rows;
+  tableList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 /** 搜索按钮操作 */

src/views/workflow/leave/index.vue

@@ -145,8 +145,8 @@ const { queryParams } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listLeave(queryParams.value);
-  leaveList.value = res.rows;
+  leaveList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 };
 

src/views/workflow/processDefinition/index.vue

@@ -354,16 +354,16 @@ const getPageList = async () => {
 const getList = async () => {
   loading.value = true;
   const resp = await listDefinition(queryParams.value);
-  processDefinitionList.value = resp.rows;
+  processDefinitionList.value = resp.data?.rows;
-  total.value = resp.total;
+  total.value = resp.data?.total;
   loading.value = false;
 };
 //查询未发布的流程定义列表
 const getUnPublishList = async () => {
   loading.value = true;
   const resp = await unPublishList(queryParams.value);
-  processDefinitionList.value = resp.rows;
+  processDefinitionList.value = resp.data?.rows;
-  total.value = resp.total;
+  total.value = resp.data?.total;
   loading.value = false;
 };
 

src/views/workflow/processInstance/index.vue

@@ -343,8 +343,8 @@ const handleSelectionChange = (selection: FlowInstanceVO[]) => {
 const getProcessInstanceRunningList = () => {
   loading.value = true;
   pageByRunning(queryParams.value).then((resp) => {
-    processInstanceList.value = resp.rows;
+    processInstanceList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };
@@ -352,8 +352,8 @@ const getProcessInstanceRunningList = () => {
 const getProcessInstanceFinishList = () => {
   loading.value = true;
   pageByFinish(queryParams.value).then((resp) => {
-    processInstanceList.value = resp.rows;
+    processInstanceList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };

src/views/workflow/spel/index.vue

@@ -209,8 +209,8 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listSpel(queryParams.value);
-  spelList.value = res.rows;
+  spelList.value = res.data?.rows;
-  total.value = res.total;
+  total.value = res.data?.total;
   loading.value = false;
 }
 

src/views/workflow/task/allTaskWaiting.vue

@@ -212,16 +212,16 @@ const changeTab = async (data: TabsPaneContext) => {
 const getWaitingList = () => {
   loading.value = true;
   pageByAllTaskWait(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
+    taskList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };
 const getFinishList = () => {
   loading.value = true;
   pageByAllTaskFinish(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
+    taskList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };

src/views/workflow/task/myDocument.vue

@@ -212,8 +212,8 @@ const handleSelectionChange = (selection: FlowInstanceVO[]) => {
 const getList = () => {
   loading.value = true;
   pageByCurrent(queryParams.value).then((resp) => {
-    processInstanceList.value = resp.rows;
+    processInstanceList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };

src/views/workflow/task/taskCopyList.vue

@@ -122,8 +122,8 @@ const handleSelectionChange = (selection: any) => {
 const getTaskCopyList = () => {
   loading.value = true;
   pageByTaskCopy(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
+    taskList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };

src/views/workflow/task/taskFinish.vue

@@ -156,8 +156,8 @@ const handleSelectionChange = (selection: any) => {
 const getFinishList = () => {
   loading.value = true;
   pageByTaskFinish(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
+    taskList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };

src/views/workflow/task/taskWaiting.vue

@@ -158,8 +158,8 @@ const handleSelectionChange = (selection: any) => {
 const getWaitingList = () => {
   loading.value = true;
   pageByTaskWait(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
+    taskList.value = resp.data?.rows;
-    total.value = resp.total;
+    total.value = resp.data?.total;
     loading.value = false;
   });
 };