chore: sync push

.github/workflows/sync-to-atomgit-dev.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           fetch-depth: 0
           lfs: true
+          ref: v2-dev
       - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
         run: |
           git config --global user.name "xiaojunnuo"

.github/workflows/sync-to-atomgit.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           fetch-depth: 0
           lfs: true
+          ref: v2
       - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
         run: |
           git config --global user.name "xiaojunnuo"

.github/workflows/sync-to-cnb-dev.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           fetch-depth: 0
           lfs: true
+          ref: v2-dev
       - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
         run: |
           git config --global user.name "xiaojunnuo"
@@ -29,6 +30,6 @@ jobs:
 
       - name: push to cnb               # 4. 执行同步
         run: |
-          git remote add upstream https://cnb.cool/certd/certd
+          git remote add upstream https://cnb.cool/certd/certd.git
           git push --set-upstream upstream v2-dev
 

.github/workflows/sync-to-cnb.yml

@@ -29,6 +29,6 @@ jobs:
 
       - name: push to cnb               # 4. 执行同步
         run: |
-          git remote add upstream https://cnb.cool/certd/certd
+          git remote add upstream https://cnb.cool/certd/certd.git
           git push --set-upstream upstream v2
 

.github/workflows/sync-to-gitee-dev.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           fetch-depth: 0
           lfs: true
+          ref: v2-dev
       - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
         run: |
           git config --global user.name "xiaojunnuo"

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

@@ -104,7 +104,7 @@ const loading = ref(false);
 const pagerRef: Ref = ref({
   pageNo: 1,
   total: 0,
-  pageSize: props.pageSize || 100,
+  pageSize: props.pageSize || 50,
 });
 const getOptions = async () => {
   if (loading.value) {
@@ -182,7 +182,7 @@ const getOptions = async () => {
         pagerRef.value.pageNo = res.pageNo ?? 1;
       }
       if (res.pageSize != null) {
-        pagerRef.value.pageSize = res.pageSize ?? 100;
+        pagerRef.value.pageSize = res.pageSize ?? pageSize;
       }
       if (res.total != null) {
         pagerRef.value.total = res.total ?? list.length;

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -1074,6 +1074,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
+    //允许管理员修改，userId=null
     const query: any = {}
     if (userId && userId > 0) {
       query.userId = userId;
@@ -1126,6 +1127,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
+    //允许管理员修改，userId=null
     const query: any = {}
     if (userId && userId > 0) {
       query.userId = userId;
@@ -1164,9 +1166,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
     if (!isPlus()) {
       throw new NeedVIPException("此功能需要升级专业版");
     }
-
-    if (userId == null || ids.length === 0) {
-      return;
+    //允许userId为空，为空则为管理员触发
+    if (ids.length === 0) {
+      throw new Error("参数错误 ids 不能为空");
     }
     const where: any = {
       id: In(ids),