fix: 插件支持系统级别配置到特定空间使用 #104

# Reviewed, transaction id: 32232
TencentBlueKing · Mar 3, 2025 · cffbd6c · cffbd6c
1 parent 2d9c6f8
commit cffbd6c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/frontend/src/store/modules/atomForm.js b/frontend/src/store/modules/atomForm.js
@@ -133,11 +133,11 @@ const atomForm = {
      * @param {String} payload.setName 自定义请求类型
      */
     async loadAtomConfig({ commit }, payload) {
-      const { name, atom, classify = 'component', version = 'legacy', project_id } = payload;
+      const { name, atom, classify = 'component', version = 'legacy', space_id } = payload;
       const atomClassify = classify;
       const atomFile = name || atom;
       const atomVersion = atomClassify === 'component' ? version : 'legacy';
-      const params = { project_id }; // 业务下需要带 project_id，公共流程、插件开发等不需要传
+      const params = { space_id };
       const url = atomClassify === 'component' ? `api/plugin/${atomFile}/` : `api/template/variable/${atomFile}/`;
 
       // 变量暂时没有版本系统

diff --git a/frontend/src/views/task/TaskExecute/ExecuteInfo.vue b/frontend/src/views/task/TaskExecute/ExecuteInfo.vue
@@ -820,7 +820,7 @@
           if (pluginGroup && pluginGroup[version]) {
             return pluginGroup[version];
           }
-          await this.loadAtomConfig({ atom: plugin, version, classify, name, project_id: this.project_id });
+          await this.loadAtomConfig({ atom: plugin, version, classify, name, space_id: this.spaceId });
           const config = $.atoms[plugin];
           return config;
         } catch (e) {

diff --git a/frontend/src/views/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/src/views/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -564,7 +564,6 @@
        */
       async getAtomConfig(config) {
         const { plugin, version, classify, name, isThird } = config;
-        const projectId = this.componentValue.template_source === 'common' ? undefined : this.project_id;
         try {
           // 先取标准节点缓存的数据
           const pluginGroup = this.pluginConfigs[plugin];
@@ -594,7 +593,7 @@
           if (isThird) {
             await this.getThirdConfig(plugin, version);
           } else {
-            await this.loadAtomConfig({ atom: plugin, version, classify, name, project_id: projectId });
+            await this.loadAtomConfig({ atom: plugin, version, classify, name, space_id: this.spaceId });
             this.outputs = this.pluginOutput[plugin][version];
           }
           const config = $.atoms[plugin];

diff --git a/frontend/src/views/task/TaskExecute/ModifyTime.vue b/frontend/src/views/task/TaskExecute/ModifyTime.vue
@@ -79,6 +79,7 @@
     },
     computed: {
       ...mapState({
+        spaceId: state => state.template.spaceId,
         atomFormConfig: state => state.atomForm.config,
       }),
       ...mapState('project', {
@@ -123,7 +124,7 @@
           return this.atomFormConfig[type][version];
         }
         try {
-          await this.loadAtomConfig({ atom: type, version, project_id: this.project_id });
+          await this.loadAtomConfig({ atom: type, version, space_id: this.spaceId });
           return this.atomFormConfig[type][version];
         } catch (e) {
           console.log(e);

diff --git a/frontend/src/views/task/TaskExecute/RetryNode.vue b/frontend/src/views/task/TaskExecute/RetryNode.vue
@@ -84,6 +84,7 @@
     },
     computed: {
       ...mapState({
+        spaceId: state => state.template.spaceId,
         atomFormConfig: state => state.atomForm.config,
       }),
       ...mapState('project', {
@@ -156,7 +157,7 @@
               const { constants } = this.componentValue.pipeline;
               this.renderConfig = await this.getSubflowInputsConfig(constants);
             } else {
-              await this.loadAtomConfig({ atom: type, version, project_id: this.project_id });
+              await this.loadAtomConfig({ atom: type, version, space_id: this.spaceId });
               this.renderConfig = this.atomFormConfig[type][version];
             }
           } catch (e) {
@@ -234,7 +235,7 @@
           if (pluginGroup && pluginGroup[version]) {
             return pluginGroup[version];
           }
-          await this.loadAtomConfig({ atom: plugin, version, classify, name, project_id: this.project_id });
+          await this.loadAtomConfig({ atom: plugin, version, classify, name, space_id: this.spaceId });
           const config = $.atoms[plugin];
           return config;
         } catch (e) {

diff --git a/frontend/src/views/task/TaskParamEdit.vue b/frontend/src/views/task/TaskParamEdit.vue
@@ -87,6 +87,7 @@
     },
     computed: {
       ...mapState({
+        spaceId: state => state.template.spaceId,
         atomFormConfig: state => state.atomForm.config,
       }),
       ...mapState('project', {
@@ -170,7 +171,7 @@
             if (pluginCode) {
               atomConfig = await this.getThirdPartyAtomConfig(pluginCode, version);
             } else {
-              await this.loadAtomConfig({ name, atom, classify, version, project_id: this.project_id });
+              await this.loadAtomConfig({ name, atom, classify, version, space_id: this.spaceId });
               atomConfig = tools.deepClone(this.atomFormConfig[atom][version]);
             }
           }
@@ -354,7 +355,7 @@
                 if (pluginCode) {
                   atomConfig = await this.getThirdPartyAtomConfig(pluginCode, version);
                 } else {
-                  await this.loadAtomConfig({ name, atom, classify, version, project_id: this.project_id });
+                  await this.loadAtomConfig({ name, atom, classify, version, space_id: this.spaceId });
                   atomConfig = this.atomFormConfig[atom][version];
                 }
               }

diff --git a/frontend/src/views/template/TemplateEdit/BatchUpdateDialog.vue b/frontend/src/views/template/TemplateEdit/BatchUpdateDialog.vue
@@ -225,6 +225,7 @@
     },
     computed: {
       ...mapState({
+        spaceId: state => state.template.spaceId,
         activities: state => state.template.activities,
         constants: state => state.template.constants,
         gateways: state => state.template.gateways,
@@ -405,7 +406,6 @@
       },
       async getAtomConfig(config) {
         const { plugin, version, classify, name, isThird } = config;
-        const projectId = this.common ? undefined : this.project_id;
         try {
           // 先取标准节点缓存的数据
           const pluginGroup = this.pluginConfigs[plugin];
@@ -432,7 +432,7 @@
             /* eslint-disable-next-line */
                         eval(renderFrom)
           } else {
-            await this.loadAtomConfig({ atom: plugin, version, classify, name, project_id: projectId });
+            await this.loadAtomConfig({ atom: plugin, version, classify, name, space_id: this.spaceId });
           }
           const config = $.atoms[plugin];
           return config;

diff --git a/frontend/src/views/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/src/views/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -574,7 +574,6 @@
        */
       async getAtomConfig(config) {
         const { plugin, version, classify, name, isThird } = config;
-        const projectId = this.isCommonTpl ? undefined : this.projectId;
         try {
           // 先取标准节点缓存的数据
           const pluginGroup = this.pluginConfigs[plugin];
@@ -584,7 +583,7 @@
           // api插件输入输出
           if (this.isApiPlugin && this.basicInfo.metaUrl) {
             // 统一api基础配置
-            await this.loadAtomConfig({ atom: plugin, version, project_id: projectId });
+            await this.loadAtomConfig({ atom: plugin, version, space_id: this.spaceId });
             // api插件配置
             const resp = await this.loadUniformApiMeta({
               spaceId: this.spaceId,
@@ -614,7 +613,7 @@
           if (isThird) {
             await this.getThirdConfig(plugin, version);
           } else {
-            await this.loadAtomConfig({ atom: plugin, version, classify, name, project_id: projectId });
+            await this.loadAtomConfig({ atom: plugin, version, classify, name, space_id: this.spaceId });
           }
           const config = $.atoms[plugin];
           return config;

diff --git a/frontend/src/views/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue b/frontend/src/views/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
@@ -615,7 +615,7 @@
           await this.loadAtomConfig({
             classify,
             name: this.atomType,
-            project_id: this.common ? undefined : this.project_id,
+            space_id: this.spaceId,
             version,
             atom,
           });

diff --git a/frontend/src/views/template/TemplateMock/MockExecute/components/TaskParamEdit.vue b/frontend/src/views/template/TemplateMock/MockExecute/components/TaskParamEdit.vue
@@ -135,7 +135,7 @@
             } else if (pluginCode) {
               atomConfig = await this.getThirdPartyAtomConfig(pluginCode, version);
             } else {
-              await this.loadAtomConfig({ name, atom, classify, version, project_id: this.project_id });
+              await this.loadAtomConfig({ name, atom, classify, version, space_id: this.spaceId });
               atomConfig = tools.deepClone(this.atomFormConfig[atom][version]);
             }
           }

diff --git a/frontend/src/views/template/TemplateMock/MockSetting/index.vue b/frontend/src/views/template/TemplateMock/MockSetting/index.vue
@@ -448,7 +448,6 @@
        */
       async getAtomConfig(config) {
         const { plugin, version, classify, name, isThird } = config;
-        const projectId = this.componentValue.template_source === 'common' ? undefined : this.project_id;
         try {
           // 先取标准节点缓存的数据
           const pluginGroup = this.pluginConfigs[plugin];
@@ -461,7 +460,7 @@
             const { api_meta: apiMeta } = this.nodeConfig.component || {};
             if (!apiMeta) return;
             // 统一api基础配置
-            await this.loadAtomConfig({ atom: plugin, version, project_id: projectId });
+            await this.loadAtomConfig({ atom: plugin, version, space_id: this.spaceId });
             // api插件配置
             const resp = await this.loadUniformApiMeta({
               spaceId: this.spaceId,
@@ -488,7 +487,7 @@
               version,
               classify,
               name,
-              project_id: projectId,
+              space_id: this.spaceId,
             });
             this.outputs = this.pluginOutput[plugin][version];
           }