Merge branch 'refs/heads/v2-dev' into v2-dev-buy

# Conflicts:
#	docs/.vitepress/config.ts
#	packages/ui/certd-client/src/views/certd/pipeline/sub-domain/index.vue

packages/ui/certd-client/src/views/sys/plugin/edit.vue

@@ -25,7 +25,7 @@
           <a-tab-pane key="editor" tab="元数据"> </a-tab-pane>
         </a-tabs>
         <div class="metadata-body">
-          <code-editor id="metadata" v-model:model-value="plugin.metadata" language="yaml" @save="doSave"></code-editor>
+          <code-editor :id="`metadata_${idRef}`" v-model:model-value="plugin.metadata" language="yaml" @save="doSave"></code-editor>
         </div>
       </div>
       <div class="script">
@@ -33,7 +33,7 @@
           <a-tab-pane key="script" tab="脚本"> </a-tab-pane>
         </a-tabs>
         <div class="script-body">
-          <code-editor id="content" v-model:model-value="plugin.content" language="javascript" @save="doSave"></code-editor>
+          <code-editor :id="`content_${idRef}`" v-model:model-value="plugin.content" language="javascript" @save="doSave"></code-editor>
         </div>
       </div>
     </div>
@@ -83,6 +83,7 @@ function initFormOptions() {
 }
 initFormOptions();
 
+const idRef = ref(route.query.id);
 async function getPlugin() {
   const id = route.query.id;
   const pluginObj = await api.GetObj(id);

packages/ui/certd-client/src/views/sys/plugin/use-import.ts

@@ -1,12 +1,14 @@
 import * as api from "/@/views/sys/plugin/api";
-import { useFormWrapper } from "@fast-crud/fast-crud";
+import { dict, useFormWrapper } from "@fast-crud/fast-crud";
 import { useI18n } from "/@/locales";
-import { Modal, notification } from "ant-design-vue";
+import { notification } from "ant-design-vue";
+
 export function usePluginImport() {
   const { openCrudFormDialog } = useFormWrapper();
   const { t } = useI18n();
 
-  async function openImportDialog({ crudExpose }) {
+  async function openImportDialog(opts: any) {
+    const { crudExpose } = opts;
     function createCrudOptions() {
       return {
         crudOptions: {

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

@@ -5,17 +5,17 @@
     <!--    </template>-->
     <div class="sys-settings-body md:p-5">
       <a-tabs :active-key="activeKey" type="card" class="sys-settings-tabs" @update:active-key="onChange">
-        <a-tab-pane key="base" tab="基本设置">
+        <a-tab-pane key="base" :tab="t('certd.sys.setting.baseSetting')">
           <SettingBase v-if="activeKey === 'base'" />
         </a-tab-pane>
-        <a-tab-pane key="register" tab="注册设置">
+        <a-tab-pane key="register" :tab="t('certd.sys.setting.registerSetting')">
           <SettingRegister v-if="activeKey === 'register'" />
         </a-tab-pane>
-        <a-tab-pane v-if="settingsStore.isComm" key="payment" tab="支付设置">
+        <a-tab-pane v-if="settingsStore.isComm" key="payment" :tab="t('certd.sys.setting.paymentSetting')">
           <SettingPayment v-if="activeKey === 'payment'" />
         </a-tab-pane>
-        <a-tab-pane key="save" tab="安全设置">
-          <SettingSafe v-if="activeKey === 'save'" />
+        <a-tab-pane key="safe" :tab="t('certd.sys.setting.safeSetting')">
+          <SettingSafe v-if="activeKey === 'safe'" />
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -30,9 +30,11 @@ import SettingSafe from "/@/views/sys/settings/tabs/safe.vue";
 import { useRoute, useRouter } from "vue-router";
 import { ref } from "vue";
 import { useSettingStore } from "/@/store/settings";
+import { useI18n } from "/@/locales";
 defineOptions({
   name: "SysSettings",
 });
+const { t } = useI18n();
 const settingsStore = useSettingStore();
 const activeKey = ref("base");
 const route = useRoute();

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

@@ -47,6 +47,18 @@
         <div class="helper" v-html="t('certd.commonCnameHelper')"></div>
       </a-form-item>
 
+      <a-form-item :label="t('certd.sys.setting.captchaEnabled')" :name="['public', 'captchaEnabled']">
+        <a-switch v-model:checked="formState.public.captchaEnabled" />
+        <div class="helper" v-html="t('certd.sys.setting.captchaHelper')"></div>
+      </a-form-item>
+      <a-form-item :label="t('certd.sys.setting.captchaType')" :name="['public', 'captchaAddonId']">
+        <addon-selector v-model:model-value="formState.public.captchaAddonId" addon-type="captcha" from="sys" @selected-change="onAddonChanged" />
+      </a-form-item>
+
+      <a-form-item :name="['public', 'captchaType']" class="hidden">
+        <a-input v-model:model-value="formState.public.captchaType"></a-input>
+      </a-form-item>
+
       <a-form-item label=" " :colon="false" :wrapper-col="{ span: 8 }">
         <a-button :loading="saveLoading" type="primary" html-type="submit">{{ t("certd.saveButton") }}</a-button>
       </a-form-item>
@@ -63,7 +75,7 @@ import { useSettingStore } from "/@/store/settings";
 import { notification } from "ant-design-vue";
 import { util } from "/@/utils";
 import { useI18n } from "/src/locales";
-
+import AddonSelector from "../../../certd/addon/addon-selector/index.vue";
 const { t } = useI18n();
 
 defineOptions({
@@ -115,6 +127,10 @@ async function stopOtherUserTimer() {
   });
 }
 
+function onAddonChanged(target: any) {
+  formState.public.captchaType = target.type;
+}
+
 const testProxyLoading = ref(false);
 async function testProxy() {
   testProxyLoading.value = true;