From d6c7326467d3afcacb78b297ff2c230e7c36748a Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 26 Nov 2024 01:14:16 +0800
Subject: [PATCH] chore:

---
 .../src/components/plugins/common/api-test.vue     |  2 +-
 .../components/plugins/common/remote-select.vue    |  2 +-
 .../plugins/synology/device-id-getter.vue          | 13 +++++++++----
 .../src/views/certd/notification/common.tsx        |  9 +--------
 .../pipeline/component/step-form/index.vue         | 14 ++++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/ui/certd-client/src/components/plugins/common/api-test.vue b/packages/ui/certd-client/src/components/plugins/common/api-test.vue
index 8bda37d0..8145abe9 100644
--- a/packages/ui/certd-client/src/components/plugins/common/api-test.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/api-test.vue
@@ -49,7 +49,7 @@ const doTest = async () => {
         type: pluginType,
         typeName: form.type,
         action: props.action,
-        input: form
+        input: pluginType === "plugin" ? form.input : form
       },
       {
         onError(err: any) {
diff --git a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
index 63ed81f7..410a2e08 100644
--- a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
@@ -87,7 +87,7 @@ const getOptions = async () => {
         type: pluginType,
         typeName: form.type,
         action: props.action,
-        input: form
+        input: pluginType === "plugin" ? form.input : form
       },
       {
         onError(err: any) {
diff --git a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
index 37b523b2..b60416f4 100644
--- a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
+++ b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="tsx" setup>
-import { defineProps, ref, useAttrs } from "vue";
+import { defineProps, inject, ref, useAttrs } from "vue";
 import { Modal } from "ant-design-vue";
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 
@@ -26,16 +26,21 @@ const emit = defineEmits<{
 const attrs = useAttrs();
 
 const otpCodeRef = ref("");
+const getScope: any = inject("get:scope");
+const getPluginType: any = inject("get:plugin:type");
 
 async function loginWithOTPCode(otpCode: string) {
+  const { form } = getScope();
+  const pluginType = getPluginType();
+
   return await doRequest({
-    type: props.type,
-    typeName: props.typeName,
+    type: pluginType,
+    typeName: form.type,
     action: "LoginWithOPTCode",
     data: {
       otpCode
     },
-    input: props.form
+    input: form
   });
 }
 
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index c1cb349c..95d47196 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -149,14 +149,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         }),
         component: {
           name: "api-test",
-          type: "notification",
-          typeName: compute(({ form }) => {
-            return form.type;
-          }),
-          action: "TestRequest",
-          form: compute(({ form }) => {
-            return form;
-          })
+          action: "TestRequest"
         },
         order: 999
       },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
index 284d7a71..0ab14bb1 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
@@ -86,13 +86,13 @@
                 },
                 rules: [{ required: true, message: '此项必填' }]
               }"
-              :get-context-fn="blankFn"
+              :get-context-fn="getScopeFunc"
             />
             <template v-for="(item, key) in currentPlugin.input" :key="key">
-              <fs-form-item v-if="item.show !== false" v-model="currentStep.input[key]" :item="item" :get-context-fn="blankFn" />
+              <fs-form-item v-if="item.show !== false" v-model="currentStep.input[key]" :item="item" :get-context-fn="getScopeFunc" />
             </template>
 
-            <fs-form-item v-model="currentStep.strategy.runStrategy" :item="runStrategyProps" :get-context-fn="blankFn" />
+            <fs-form-item v-model="currentStep.strategy.runStrategy" :item="runStrategyProps" :get-context-fn="getScopeFunc" />
           </a-form>
         </div>
         <template #footer>
@@ -305,8 +305,10 @@ export default {
         stepDrawerClose();
       };
 
-      const blankFn = () => {
-        return {};
+      const getScopeFunc = () => {
+        return {
+          form: currentStep.value
+        };
       };
 
       const pluginSearch = ref({
@@ -362,7 +364,7 @@ export default {
         stepSave,
         stepDelete,
         rules,
-        blankFn,
+        getScopeFunc,
         stepCopy,
         fullscreen
       };