Merge branch 'v2-dev' into v2_admin_mode

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">