chore: 优化插件的翻页查询

packages/core/pipeline/src/context/index.ts

@@ -4,39 +4,33 @@ export type UserContext = IContext;
 export type PipelineContext = IContext;
 
 export type PageSearch = {
-  offset?: number;
+  pageNo?: number;
-  limit?: number;
+  pageSize?: number;
   searchKey?: string;
   // sortBy?: string;
   // sortOrder?: "asc" | "desc";
 };
 
 export type PageRes = {
-  offset?: number;
+  pageNo?: number;
-  limit?: number;
+  pageSize?: number;
   total?: string;
   list: any[];
 };
 
 export class Pager {
-  offset: number;
+  pageNo: number;
-  limit: number;
+  pageSize: number;
   constructor(req: PageSearch) {
-    this.offset = req.offset ?? 0;
+    this.pageNo = req.pageNo ?? 1;
-    this.limit = req.limit || 50;
+    this.pageSize = req.pageSize || 50;
   }
 
-  getPageNo() {
+  getOffset() {
-    const size = this.limit;
+    return (this.pageNo - 1) * (this.pageSize ?? 50);
-    const offset = this.offset;
-    let page = Math.floor(offset / size);
-    if (offset % size === 0) {
-      page++;
-    }
-    return page;
   }
 
-  setPageNo(pageNo: number) {
+  setOffset(offset: number) {
-    this.offset = (pageNo - 1) * (this.limit ?? 50);
+    this.pageNo = Math.ceil(offset / (this.pageSize ?? 50)) + 1;
   }
 }

packages/ui/certd-client/src/components/plugins/common/remote-select.vue

@@ -21,7 +21,7 @@
           <v-nodes :vnodes="menu" />
 
           <div v-if="pager === true" class="pager text-center p-5">
-            <a-pagination v-model:current="pagerRef.current" simple :total="pagerRef.total" :page-size="pagerRef.limit" />
+            <a-pagination v-model:current="pagerRef.pageNo" simple :total="pagerRef.total" :page-size="pagerRef.pageSize" @change="onPageChange" />
           </div>
         </template>
       </a-select>
@@ -119,9 +119,8 @@ const getOptions = async () => {
   message.value = "";
   hasError.value = false;
   loading.value = true;
-  optionsRef.value = [];
+  const pageNo = pagerRef.value.pageNo;
-
+  const pageSize = pagerRef.value.pageSize;
-  const offset = (pagerRef.value.current - 1) * (pagerRef.value.limit ?? 100);
   try {
     const res = await doRequest(
       {
@@ -131,8 +130,8 @@ const getOptions = async () => {
         input,
         data: {
           searchKey: props.search ? searchKeyRef.value : "",
-          offset: offset,
+          pageNo,
-          limit: pagerRef.value.limit,
+          pageSize,
         },
       },
       {
@@ -150,17 +149,15 @@ const getOptions = async () => {
     optionsRef.value = list;
     pagerRef.value.total = list.length;
     if (props.pager) {
-      if (res.offset != null) {
+      if (res.pageNo != null) {
-        pagerRef.value.offset = res.offset ?? 0;
+        pagerRef.value.pageNo = res.pageNo ?? 1;
       }
-      if (res.limit != null) {
+      if (res.pageSize != null) {
-        pagerRef.value.limit = res.limit ?? 100;
+        pagerRef.value.pageSize = res.pageSize ?? 100;
       }
       if (res.total != null) {
         pagerRef.value.total = res.total ?? list.length;
       }
-      const { offset, limit } = pagerRef.value;
-      pagerRef.value.current = offset % limit === 0 ? offset / limit + 1 : offset / limit;
     }
 
     return res;
@@ -184,7 +181,7 @@ async function refreshOptions() {
 }
 
 async function doSearch() {
-  pagerRef.value.current = 1;
+  pagerRef.value.pageNo = 1;
   await refreshOptions();
 }
 
@@ -222,6 +219,10 @@ watch(
     immediate: true,
   }
 );
+
+async function onPageChange(current: any) {
+  await refreshOptions();
+}
 </script>
 
 <style lang="less"></style>

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-waf/index.ts

@@ -183,8 +183,8 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
     const params:any = {
       RegionId: this.regionId,
       InstanceId: instanceId,
-      PageSize: pager.limit,
+      PageSize: pager.pageSize,
-      PageNumber: pager.getPageNo(),
+      PageNumber: pager.pageNo,
     };
     if (data.searchKey){
       params.Domain = data.searchKey
@@ -206,11 +206,13 @@ export class AliyunDeployCertToWaf extends AbstractTaskPlugin {
     });
     const list= this.ctx.utils.options.buildGroupOptions(options, this.certDomains);
 
+    // const list = [{value:"1",label:"1"},{value:"2",label:"2"}]
+    // const total = 120
     return {
       list,
       total: total,
-      offset: pager.offset,
+      pageNo: pager.pageNo,
-      limit: pager.limit
+      pageSize: pager.pageSize
     };
   }
 }

packages/ui/certd-server/src/plugins/plugin-farcdn/plugins/plugin-refresh-cert.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IsTaskPlugin, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
+import { AbstractTaskPlugin, IsTaskPlugin, Pager, PageSearch, pluginGroups, RunStrategy, TaskInput } from "@certd/pipeline";
 import { CertApplyPluginNames, CertInfo } from "@certd/plugin-cert";
 import { createCertDomainGetterInputDefine, createRemoteSelectInputDefine } from "@certd/plugin-lib";
 import { FarcdnAccess } from "../access.js";
@@ -81,9 +81,10 @@ export class FarcdnRefreshCert extends AbstractTaskPlugin {
   async onGetCertList(data:PageSearch = {}) {
     const access = await this.getAccess<FarcdnAccess>(this.accessId);
 
+    const pager = new Pager(data);
     const res = await access.getSSLCertList({
-      offset: data.offset?? 0,
+      offset: pager.getOffset(),
-      size: data.limit?? 100,
+      size: pager.pageSize,
     });
     const list = res.list
     if (!list || list.length === 0) {
@@ -100,8 +101,8 @@ export class FarcdnRefreshCert extends AbstractTaskPlugin {
     return {
       list:this.ctx.utils.options.buildGroupOptions(options, this.certDomains),
       total:res.total,
-      offset: res.offset,
+      pageNo: pager.pageNo,
-      limit:res.size
+      pageSize: pager.pageSize
     }
   }
 }

packages/ui/certd-server/src/plugins/plugin-rainyun/access.ts

@@ -75,20 +75,16 @@ export class RainyunAccess extends BaseAccess {
   }
 
 
-  async getCertList(req:{offset?:number,limit?:number,query?:string}){
+  async getCertList(req:{pageNo?:number,pageSize?:number,query?:string}){
-    const size = req.limit ?? 20;
+    const pageNo = req.pageNo ?? 1;
-    const offset = req.offset ?? 0;
+    const pageSize = req.pageSize ?? 20;
-    let page = Math.floor(offset / size);
-    if(offset % size === 0 ){
-      page++
-    }
     const options ={
       columnFilters: {
         Domain: req.query??""
       },
       sort:[],
-      page: page,
+      page: pageNo,
-      perPage: size,
+      perPage: pageSize,
 
     }
     const res = await this.doRequest({
@@ -99,8 +95,8 @@ export class RainyunAccess extends BaseAccess {
     return {
       total: res.TotalRecords,
       list: res.Records || [],
-      limit: size,
+      pageNo: pageNo,
-      offset: offset
+      pageSize: pageSize
     }
   }
 

packages/ui/certd-server/src/plugins/plugin-rainyun/plugins/plugin-refresh-cert.ts

@@ -81,11 +81,11 @@ export class RainyunRefreshCert extends AbstractTaskPlugin {
   async onGetCertList(req: PageSearch = {}) {
     const access = await this.getAccess<RainyunAccess>(this.accessId);
 
-    const offset = req.offset ?? 0;
+    const pageNo = req.pageNo ?? 1;
-    const limit = req.limit ?? 100;
+    const pageSize = req.pageSize ?? 100;
     const res = await access.getCertList({
-      offset,
+      pageNo,
-      limit
+      pageSize
     });
     const total = res.total;
     const list = res.list;
@@ -103,8 +103,8 @@ export class RainyunRefreshCert extends AbstractTaskPlugin {
     return {
       list: this.ctx.utils.options.buildGroupOptions(options, this.certDomains),
       total: total,
-      offset: offset,
+      pageNo: pageNo,
-      limit: limit
+      pageSize: pageSize
     };
   }
 }