fix: 修复阿里云证书订单翻页问题

packages/plugins/plugin-lib/src/common/util.ts

@@ -43,6 +43,7 @@ export function createRemoteSelectInputDefine(opts?: {
   pager?: boolean;
   component?: any;
   value?: any;
+  pageSize?: number;
 }) {
   const title = opts?.title || "请选择";
   const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
@@ -71,6 +72,7 @@ export function createRemoteSelectInputDefine(opts?: {
       search,
       pager,
       multi,
+      pageSize: opts?.pageSize,
       watches: [certDomainsInputKey, accessIdInputKey, ...watches],
       ...opts.component,
     },

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

@@ -64,6 +64,7 @@ const props = defineProps<
     search?: boolean;
     pager?: boolean;
     multi?: boolean;
+    pageSize?: number;
   } & ComponentPropsType
 >();
 
@@ -103,7 +104,7 @@ const loading = ref(false);
 const pagerRef: Ref = ref({
   pageNo: 1,
   total: 0,
-  pageSize: 100,
+  pageSize: props.pageSize || 100,
 });
 const getOptions = async () => {
   if (loading.value) {

packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts

@@ -6,6 +6,7 @@ import { SiteInfoService } from '../../../modules/monitor/index.js';
 import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
 import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
 import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { PipelineEntity } from '../../../modules/pipeline/entity/pipeline.js';
 
 
 const pipelineExample = `
@@ -183,21 +184,15 @@ export class PipelineController extends CrudController<PipelineService> {
   }
 
 
-  // @Post('/add', { description: Constants.per.authOnly })
+  @Post('/add', { description: Constants.per.authOnly })
-  // async add(@Body(ALL) bean: PipelineEntity) {
+  async add(@Body(ALL) bean: PipelineEntity) {
-  //   const { projectId, userId } = await this.getProjectUserIdWrite()
+    return await this.save(bean as any);
-  //   bean.userId = userId
+  }
-  //   bean.projectId = projectId
-  //   return super.add(bean);
-  // }
 
-  // @Post('/update', { description: Constants.per.authOnly })
+  @Post('/update', { description: Constants.per.authOnly })
-  // async update(@Body(ALL) bean) {
+  async update(@Body(ALL) bean) {
-  //   await this.checkOwner(this.getService(), bean.id,"write",true);
+    return await this.save(bean);
-  //   delete bean.userId;
+  }
-  //   delete bean.projectId;
-  //   return super.update(bean);
-  // }
 
   @Post('/save', { description: Constants.per.authOnly, summary: '新增/更新流水线' })
   async save(@Body() bean: PipelineSaveDTO) {

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

@@ -20,6 +20,7 @@ export abstract class CertApplyBasePlugin extends CertApplyBaseConvertPlugin {
 
   @TaskInput({
     title: "更新天数",
+    value:20,
     component: {
       name: "a-input-number",
       vModel: "value",

packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/getter/aliyun.ts

@@ -28,11 +28,36 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin {
   })
   accessId!: string;
 
+
+   @TaskInput(
+    {
+      title:"订单类型",
+      value:"CPACK",
+      component:{
+        name:"a-select",
+        vModel:"value",
+        options:[
+          {
+            label:"资源虚拟订单（一般选这个）",
+            value:"CPACK",
+          },
+          {
+            label:"售卖订单",
+            value:"BUY",
+          }
+        ]
+      }
+    }
+  )
+  orderType!: string;
+
+
   @TaskInput(
     createRemoteSelectInputDefine({
       title: "证书订单ID",
       helper: "订阅模式的证书订单Id",
       typeName: "CertApplyGetFormAliyun",
+      pageSize: 50,
       component: {
         name: "RemoteSelect",
         vModel: "value",
@@ -140,6 +165,7 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin {
       pathname: `/`,
       data: {
         query: {
+          OrderType: this.orderType,
           Status: "ISSUED",
           CurrentPage: pager.pageNo,
           ShowSize : pager.pageSize,
@@ -151,14 +177,27 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin {
       return []
     }
 
-    return list.map((item: any) => {
+    const total = res.TotalCount || 0;
-      const label = `${item.Domain}<${item.OrderId}>`;
+
+    const records = list.map((item: any) => {
+      let value = item.OrderId;
+      let domain = item.Domain;
+      let label = `${item.Domain}<${item.OrderId}>`;
+      if (!item.OrderId) {
+        label = `${item.CommonName}<${item.Name}>`;
+        value = item.Name;
+        domain = item.CommonName;
+      }
       return {
         label: label,
-        value: item.OrderId,
+        value: value,
-        Domain: item.Domain,
+        Domain: domain,
       };
     });
+    return {
+      list:records,
+      total,
+    }
   }
 }