Merge branch 'v2-dev' into v2_admin_mode

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.6](https://github.com/certd/certd/compare/v1.38.5...v1.38.6) (2026-02-04)
+
+### Performance Improvements
+
+* 当域名管理中没有域名时，创建流水线时不展开域名选择框 ([9166a57](https://github.com/certd/certd/commit/9166a579301a60750f0b72b6a42b0c8d730695fd))
+* count tip ([e19743f](https://github.com/certd/certd/commit/e19743f70553700f1f91bff76f87370f749dd247))
+* oauth支持github 和google， 修复头像显示问题 ([693a4a6](https://github.com/certd/certd/commit/693a4a663385ced3176286bf4b5f3566da83d90e))
+
 ## [1.38.5](https://github.com/certd/certd/compare/v1.38.4...v1.38.5) (2026-02-02)
 
 ### Bug Fixes

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.38.5",
+  "version": "1.38.6",
   "private": true,
   "scripts": {
     "dev": "vite --open",
@@ -106,8 +106,8 @@
     "zod-defaults": "^0.1.3"
   },
   "devDependencies": {
-    "@certd/lib-iframe": "^1.38.5",
-    "@certd/pipeline": "^1.38.5",
+    "@certd/lib-iframe": "^1.38.6",
+    "@certd/pipeline": "^1.38.6",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/chai": "^4.3.12",

packages/ui/certd-client/src/components/plugins/common/domain-selector.vue

@@ -3,6 +3,7 @@
     <div class="flex flex-row">
       <a-select
         class="domain-select-input"
+        :popup-class-name="popupClassName"
         :dropdown-style="dropdownStyle"
         show-search
         :filter-option="filterOption"
@@ -56,7 +57,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, defineComponent, ref, Ref, useAttrs } from "vue";
+import { computed, defineComponent, onMounted, ref, Ref, useAttrs } from "vue";
 import { useRouter } from "vue-router";
 import { Dicts } from "../lib/dicts";
 import { request } from "/@/api/service";
@@ -94,11 +95,11 @@ const attrs = useAttrs();
 
 const hasOptions: Ref = ref(null);
 
-const openProp = computed(() => {
-  if (hasOptions.value == null) {
-    return false;
+const popupClassName = computed(() => {
+  if (!hasOptions.value) {
+    return "hidden-important";
   }
-  return hasOptions.value;
+  return "";
 });
 
 const searchKeyRef = ref("");
@@ -155,6 +156,7 @@ const getOptions = async () => {
 
     optionsRef.value = options;
     if (hasOptions.value == null) {
+      //初始设置一次
       if (options.length > 0) {
         hasOptions.value = true;
       } else {
@@ -223,6 +225,10 @@ function openDomainImportDialog() {
 const dropdownStyle = ref({
   zIndex: 2000,
 });
+
+onMounted(() => {
+  refreshOptions();
+});
 </script>
 
 <style lang="less"></style>

packages/ui/certd-client/src/components/plugins/common/params-show.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="params-show">
-    <a-tag type="primary" color="green" v-for="item of params" :key="item.value" class="item">
+    <a-tag v-for="item of params" :key="item.value" type="primary" color="green" class="item">
       <span class="label">{{ item.label }}=</span>
-      <fs-copyable :modelValue="`\$\{${item.value}\}`" :button="{show:false}" :inline="true"></fs-copyable>
+      <fs-copyable :model-value="`\$\{${item.value}\}`" :button="{ show: false }" :inline="true"></fs-copyable>
     </a-tag>
   </div>
 </template>

packages/ui/certd-client/src/components/vip-button/vip-modal-content.vue

@@ -8,9 +8,20 @@
         <div class="flex flex-col order-count-text weight-bold">
           <div class="count-text ml-4 flex items-center">
             <fs-icon icon="noto:fire" class="fs-20 mr-2"></fs-icon>
-            <span> 今日赞助 </span>
-            <span class="count-number color-red font-bold text-2xl ml-1 mr-1"> {{ stage.orderCount }} </span>人，
-            <span> {{ stage.title }} </span>
+            <template v-if="stage.vipTotal > 0">
+              <span> 已有 </span>
+              <span class="count-number color-red font-bold text-2xl ml-1 mr-1"> {{ stage.vipTotal }} </span> 位小伙伴赞助，
+              <span>
+                {{ stage.title }}
+              </span>
+            </template>
+            <template v-else>
+              <span> 今日赞助 </span>
+              <span class="count-number color-red font-bold text-2xl ml-1 mr-1"> {{ stage.orderCount }} </span> 人，
+              <span>
+                {{ stage.title }}
+              </span>
+            </template>
           </div>
         </div>
       </div>
@@ -109,14 +120,13 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, onMounted, reactive, Ref, ref } from "vue";
 import { message, Modal } from "ant-design-vue";
 import dayjs from "dayjs";
+import { computed, nextTick, onMounted, onUnmounted, reactive, Ref, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
-import { useSettingStore } from "/@/store/settings";
 import * as api from "./api";
-import { utils } from "/@/utils";
+import { useSettingStore } from "/@/store/settings";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -230,12 +240,13 @@ const vipTypeDefine: any = {
   },
 };
 
-const TodayVipOrderCountRef: Ref = ref({});
+const TodayVipOrderCountRef: Ref = ref({ enabled: false, current: 0, stages: [] });
 
 async function getTodayVipOrderCount() {
   const res = await api.getTodayVipOrderCount();
   if (res) {
     TodayVipOrderCountRef.value = res;
+    TodayVipOrderCountRef.value.current = 0;
   }
 }
 
@@ -248,31 +259,50 @@ const todayOrderCount = computed(() => {
   }
   const lastStage = countInfo?.stages?.[countInfo?.stages?.length - 1] || {};
   lastStage.orderCount = orderCount;
+
+  const stages: any = [];
+  stages.push({
+    title: countInfo.title,
+    vipTotal: countInfo?.vipTotal || 0,
+    orderCount: orderCount,
+    bg: lastStage.bg,
+  });
+  if (lastStage.orderCount > 0) {
+    stages.push(lastStage);
+  }
   return {
     enabled: enabled,
-    orderCount: orderCount,
-    title: lastStage.title || "",
-    stages: countInfo?.stages,
+    stages: stages,
   };
 });
 
 async function scrollOrderCount() {
   const stages = todayOrderCount.value.stages;
-  if (!stages.length) {
+  if (stages.length === 0) {
     return;
   }
   let index = 0;
-  for (const stage of stages) {
+  const doScroll = () => {
     TodayVipOrderCountRef.value.current = index;
-    await utils.sleep(500);
     index++;
-  }
+    if (index >= stages.length) {
+      index = 0;
+    }
+  };
+  doScroll();
+  scrollOrderCountIntervalRef.value = setInterval(doScroll, 7000);
 }
 
+const scrollOrderCountIntervalRef: Ref = ref(null);
 onMounted(async () => {
   await getTodayVipOrderCount();
+  await nextTick();
   await scrollOrderCount();
 });
+
+onUnmounted(() => {
+  clearInterval(scrollOrderCountIntervalRef.value);
+});
 </script>
 
 <style lang="less">

packages/ui/certd-client/src/layout/layout-basic.vue

@@ -35,7 +35,13 @@ const menus = computed(() => [
 
 const avatar = computed(() => {
   const avt = userStore.getUserInfo?.avatar;
-  return avt ? `/api/basic/file/download?key=${avt}` : "";
+  if (!avt) {
+    return "";
+  }
+  if (avt.startsWith("http")) {
+    return avt;
+  }
+  return `/api/basic/file/download?key=${avt}`;
 });
 
 async function handleLogout() {

packages/ui/certd-client/src/style/common.less

@@ -476,4 +476,10 @@ h6 {
   .fs-icon{
     margin-right: 5px;
   }
+}
+
+
+.hidden-important {
+  display: none !important;
+  visibility: hidden !important;
 }

packages/ui/certd-client/src/views/certd/mine/user-profile.vue

@@ -8,7 +8,7 @@
         <a-descriptions-item :label="t('authentication.username')">{{ userInfo.username }}</a-descriptions-item>
         <a-descriptions-item :label="t('authentication.nickName')">{{ userInfo.nickName }}</a-descriptions-item>
         <a-descriptions-item :label="t('authentication.avatar')">
-          <a-avatar v-if="userInfo.avatar" size="large" :src="'api/basic/file/download?&key=' + userInfo.avatar" style="background-color: #eee"> </a-avatar>
+          <a-avatar v-if="userInfo.avatar" size="large" :src="userAvatar" style="background-color: #eee"> </a-avatar>
           <a-avatar v-else size="large" style="background-color: #00b4f5">
             {{ userInfo.username }}
           </a-avatar>
@@ -108,6 +108,17 @@ async function bind(type: string) {
   window.location.href = loginUrl;
 }
 
+const userAvatar = computed(() => {
+  if (isEmpty(userInfo.value.avatar)) {
+    return "";
+  }
+  if (userInfo.value.avatar.startsWith("http")) {
+    return userInfo.value.avatar;
+  }
+
+  return "api/basic/file/download?&key=" + userInfo.value.avatar;
+});
+
 onMounted(async () => {
   await getUserInfo();
   await loadOauthBounds();