From bd9433478a43d5d64ce6370386d0fe0aaff07d2e Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sat, 5 Sep 2026 00:27:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(plugin):=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98=E4=B8=8E=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=9A=84=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  修复插件配置保存时使用fullName或name作为标识的问题
2.  为证书申请插件配置补充pluginType字段
3.  新增插件配置全局加载逻辑，启动时同步数据库插件配置到内存注册表
4.  优化配置编辑器默认值与选项添加交互
5.  补充vue依赖导入与上下文注入
---
 .../src/views/sys/plugin/config-common.vue    |  3 +-
 .../src/views/sys/plugin/config-editor.vue    | 30 ++++++++++---
 .../src/views/sys/plugin/use-config.tsx       |  2 +-
 .../src/modules/auto/auto-load-plugins.ts     |  8 +++-
 .../plugin/service/plugin-config-service.ts   | 43 +++++++++++++++++++
 5 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/packages/ui/certd-client/src/views/sys/plugin/config-common.vue b/packages/ui/certd-client/src/views/sys/plugin/config-common.vue
index be5f5faa9..06b551c80 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/config-common.vue
+++ b/packages/ui/certd-client/src/views/sys/plugin/config-common.vue
@@ -113,7 +113,8 @@ const onFinishFailed = (errorInfo: any) => {
 const { openConfigDialog } = usePluginConfig();
 
 async function doPluginConfig() {
-  const certApplyInfo = await getPluginSetting("CertApply");
+  const certApplyInfo: any = await getPluginSetting("CertApply");
+  certApplyInfo.pluginType = "plugin";
   await openConfigDialog({
     row: certApplyInfo,
     onSuccess: async () => {
diff --git a/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue b/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue
index 10bc1a358..a593a94b3 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue
+++ b/packages/ui/certd-client/src/views/sys/plugin/config-editor.vue
@@ -45,7 +45,7 @@
 <script setup lang="tsx">
 import { dict, FsRender } from "@fast-crud/fast-crud";
 import { cloneDeep, merge, unset } from "lodash-es";
-import { computed, onMounted, reactive, ref } from "vue";
+import { computed, onMounted, provide, reactive, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import Rollbackable from "./rollbackable.vue";
 import { fillPluginDefine, usePluginStore } from "/@/store/plugin";
@@ -68,7 +68,7 @@ const labelCol = ref({
   },
 });
 const wrapperCol = ref({ span: 16 });
-const configForm: any = reactive({});
+const configForm: any = reactive({ type: props.plugin.fullName || props.plugin.name });
 
 const showDict = dict({
   data: [
@@ -185,9 +185,11 @@ const optionsMappingKey = {
   },
   editRender(item: any) {
     return () => {
-      const options = item.component?.options || [];
-      if (options.length === 0) {
-        return <span class="text-gray-400">该组件没有预设选项</span>;
+      const options = reactive(cloneDeep(item.component?.options || []));
+
+      const showAdd = options.length === 0;
+      function addOption(opt: any) {
+        options.push(opt);
       }
 
       const onLabelChange = (optValue: string, newLabel: string) => {
@@ -233,6 +235,13 @@ const optionsMappingKey = {
               ))}
             </tbody>
           </table>
+          {showAdd && (
+            <div class="mt-2">
+              <a-button type="primary" size={() => addOption({ value: "", label: "" })}>
+                添加选项
+              </a-button>
+            </div>
+          )}
           <div class="helper mt-1">只需填写需要自定义的选项，留空则使用原始显示内容</div>
         </div>
       );
@@ -289,6 +298,17 @@ onMounted(async () => {
 defineExpose({
   getForm,
 });
+
+provide("getCurrentPluginDefine", () => {
+  return { value: props.plugin };
+});
+provide("get:scope", () => {
+  return getScope();
+});
+provide("get:plugin:type", () => {
+  debugger;
+  return props.plugin.pluginType;
+});
 </script>
 
 <style lang="less">
diff --git a/packages/ui/certd-client/src/views/sys/plugin/use-config.tsx b/packages/ui/certd-client/src/views/sys/plugin/use-config.tsx
index abff374a4..8e495a488 100644
--- a/packages/ui/certd-client/src/views/sys/plugin/use-config.tsx
+++ b/packages/ui/certd-client/src/views/sys/plugin/use-config.tsx
@@ -49,7 +49,7 @@ export function usePluginConfig() {
                 }
               }
               const res = await api.savePluginSetting({
-                name: row.fullName,
+                name: row.fullName || row.name,
                 sysSetting: {
                   metadata: {
                     input: newForm,
diff --git a/packages/ui/certd-server/src/modules/auto/auto-load-plugins.ts b/packages/ui/certd-server/src/modules/auto/auto-load-plugins.ts
index de99e848f..09b9d1ffa 100644
--- a/packages/ui/certd-server/src/modules/auto/auto-load-plugins.ts
+++ b/packages/ui/certd-server/src/modules/auto/auto-load-plugins.ts
@@ -6,6 +6,7 @@ import { getRuntimeDepsService, initRuntimeDepsService } from "@certd/pipeline";
 import { pluginRegistry, accessRegistry, notificationRegistry } from "@certd/pipeline";
 import { dnsProviderRegistry } from "@certd/plugin-lib";
 import { addonRegistry } from "@certd/lib-server";
+import { PluginConfigService } from "../plugin/service/plugin-config-service.js";
 
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -13,6 +14,9 @@ export class AutoLoadPlugins {
   @Inject()
   pluginService: PluginService;
 
+  @Inject()
+  pluginConfigService: PluginConfigService;
+
   @Config("runtimeDeps")
   runtimeDepsConfig: any;
 
@@ -34,8 +38,8 @@ export class AutoLoadPlugins {
     }
     // await import("../../plugins/index.js")
     await this.pluginService.registerFromDb();
-
-    await registerPaymentProviders();
+    await this.pluginConfigService.loadAllPluginSetting();
+    registerPaymentProviders();
     logger.info(`加载插件完成，加载模式:${process.env.certd_plugin_loadmode}`);
 
     //初始化第三方依赖服务
diff --git a/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts b/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
index 327d17a64..93153c946 100644
--- a/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
+++ b/packages/ui/certd-server/src/modules/plugin/service/plugin-config-service.ts
@@ -1,5 +1,8 @@
 import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
 import { PluginService } from "./plugin-service.js";
+import { accessRegistry, notificationRegistry, pluginRegistry } from "@certd/pipeline";
+import { dnsProviderRegistry } from "@certd/plugin-lib";
+import { addonRegistry } from "@certd/lib-server";
 
 export type PluginConfig = {
   name: string;
@@ -66,15 +69,55 @@ export class PluginConfigService {
       };
       const { id } = await this.pluginService.add(pluginEntity);
       pluginEntity.id = id;
+      this.loadPluginSetting(name, sysSetting);
     } else {
       const setting = JSON.parse(pluginEntity.sysSetting || "{}");
       if (sysSetting.metadata) {
         setting.metadata = sysSetting.metadata;
       }
       if (sysSetting.input) {
+        //如果没有新提交，不覆盖旧的input
         setting.input = sysSetting.input;
       }
       await this.pluginService.getRepository().update({ fullName: name }, { sysSetting: JSON.stringify(setting) });
+      this.loadPluginSetting(name, setting);
+    }
+  }
+
+  async loadPluginSetting(name: string, sysSetting: any) {
+    
+    let  pluginDefine = null;
+    if (!pluginDefine){
+      pluginDefine = accessRegistry.getDefine(name);
+    }
+    if (!pluginDefine){
+      pluginDefine = pluginRegistry.getDefine(name);
+    }
+    if (!pluginDefine){
+      pluginDefine = dnsProviderRegistry.getDefine(name);
+    }
+    if (!pluginDefine){
+      pluginDefine = addonRegistry.getDefine(name);
+    }
+    if (!pluginDefine){
+      pluginDefine = notificationRegistry.getDefine(name);
+    }
+    if (!pluginDefine){
+      return
+    }
+    pluginDefine.sysSetting = sysSetting;
+  }
+
+  async loadAllPluginSetting() {
+    const pluginSettings = await this.pluginService.getRepository().find({
+      select:{
+        fullName: true,
+        type: true,
+        sysSetting: true,
+      }
+    });
+    for (const plugin of pluginSettings) {
+      this.loadPluginSetting(plugin.fullName, JSON.parse(plugin.sysSetting || "{}"));
     }
   }