Merge branch 'v2-dev' into codex_i18n

packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue

@@ -935,7 +935,7 @@ export default defineComponent({
       };
 
       const historyCancel = () => {
-        changeCurrentHistory();
+        // changeCurrentHistory();
         console.log("currentPipeline", pipeline);
       };
 

packages/ui/certd-client/src/views/framework/landing/index.vue

@@ -22,7 +22,7 @@
       </div>
     </nav>
 
-    <section class="hero-section">
+    <section class="hero-section bg-[#f7f7fc] dark:bg-[#000000]">
       <div class="hero-container">
         <div class="hero-content">
           <h1 class="hero-title flex flex-col md:flex-row">
@@ -45,7 +45,6 @@
         </div>
       </div>
     </section>
-
     <section id="features" class="features-section">
       <div class="container">
         <div class="section-header">

packages/ui/certd-client/src/views/sys/settings/tabs/base.vue

@@ -21,10 +21,16 @@
       </a-form-item>
 
       <a-form-item :label="t('certd.sys.setting.notice')" :name="['public', 'notice']">
-        <a-textarea v-model:value="formState.public.notice" :placeholder="t('certd.sys.setting.noticePlaceholder')" :rows="5" />
+        <a-textarea v-model:value="formState.public.notice" :placeholder="t('certd.sys.setting.noticePlaceholder')" :rows="3" />
         <div class="helper" v-html="t('certd.sys.setting.noticeHelper')"></div>
       </a-form-item>
 
+      <a-form-item :label="t('certd.sys.setting.customFooter')" :name="['public', 'customFooter']">
+        <a-textarea v-model:value="formState.public.customFooter" :disabled="!settingsStore.isPlus" :placeholder="t('certd.sys.setting.customFooterPlaceholder')" :rows="3" />
+        <div class="helper" v-html="t('certd.sys.setting.customFooterHelper')"></div>
+        <vip-button class="ml-5 justify-start" mode="button"></vip-button>
+      </a-form-item>
+
       <a-form-item :label="t('certd.sys.setting.bindUrl')">
         <a-button class="ml-2" type="primary" @click="settingsStore.openBindUrlModal({ closable: true })">{{ t("certd.sys.setting.bindUrl") }}</a-button>
         <div class="helper" v-html="t('certd.sys.setting.bindUrlHelper')"></div>