From eed4554f2475ac27eba3615ea8b46333332c0f90 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 7 Sep 2023 18:29:02 +0800
Subject: [PATCH] =?UTF-8?q?optimization:=20=E6=96=87=E6=9C=AC=E6=A1=86/?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4&&=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/RenderForm/tags/TagSelect.vue    | 2 +-
 .../src/components/common/RenderForm/tags/TagTextarea.vue  | 7 +++----
 .../desktop/src/pages/task/TaskExecute/ExecuteInfo.vue     | 1 +
 .../desktop/src/pages/task/TaskExecute/ModifyParams.vue    | 2 +-
 frontend/desktop/src/store/modules/task.js                 | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
index 30ce81f3e2..ce743986c0 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
@@ -72,7 +72,7 @@
             </p>
             <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
         </div>
-        <span v-else class="rf-view-value">{{viewValue}}</span>
+        <span v-else class="rf-view-value">{{ value || '--' }}</span>
     </div>
 </template>
 <script>
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 175f804dec..34164ec78f 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -11,7 +11,7 @@
 */
 <template>
     <div class="tag-textarea">
-        <div class="rf-form-wrapper" v-if="formMode">
+        <div class="rf-form-wrapper">
             <div class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled, 'text-view-mode': !formMode }">
                 <div
                     ref="input"
@@ -47,7 +47,6 @@
                 </div>
             </transition>
         </div>
-        <div v-else class="rf-view-value">{{ value || '--' }}</div>
         <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
     </div>
 </template>
@@ -119,7 +118,7 @@
                 }
             },
             isDisabled () {
-                return !this.editable || !this.formMode || this.disable
+                return !this.editable || !this.formMode || this.disable || this.scheme.attrs?.disabled
             }
         },
         watch: {
@@ -158,7 +157,7 @@
         mounted () {
             const divInputDom = this.$el.querySelector('.div-input')
             if (divInputDom) {
-                divInputDom.innerText = this.value
+                divInputDom.innerText = typeof this.value === 'string' ? this.value : JSON.stringify(this.value)
                 if (this.render) {
                     this.handleInputBlur()
                     // 把用户手动换行变成div标签
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index e35feaa7c0..2d454057ae 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -786,6 +786,7 @@
                         query = { task_id, node_id, subprocess_stack }
                         res = await this.taskflowNodeDetail(query)
                     } else {
+                        query.subprocess_simple_inputs = true // 标记独立子流程取{key: value}类型数据
                         res = await this.getNodeActDetail(query)
                     }
                     if (res.result) {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue
index dfb356c2b0..f990ad8553 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue
@@ -191,7 +191,7 @@
                     const { has_key = false, keys_in_constants_parameter = [] } = instanceData.constants_info || {}
                     Object.keys(pipelineData.constants).forEach(key => {
                         const cnt = pipelineData.constants[key]
-                        if (cnt.show_type === 'show' && !cnt.pre_render_mako) {
+                        if (cnt.show_type === 'show') {
                             if (!has_key || keys_in_constants_parameter.includes(key)) {
                                 // api调用时不做校验
                                 cnt.validation = ''
diff --git a/frontend/desktop/src/store/modules/task.js b/frontend/desktop/src/store/modules/task.js
index 6cf2d3fd5a..a554bf350b 100644
--- a/frontend/desktop/src/store/modules/task.js
+++ b/frontend/desktop/src/store/modules/task.js
@@ -363,13 +363,14 @@ const task = {
          */
         getNodeActDetail ({ commit }, data) {
             const { project_id } = store.state.project
-            const { instance_id, node_id, component_code, subprocess_stack, loop } = data
+            const { instance_id, node_id, component_code, subprocess_stack, subprocess_simple_inputs, loop } = data
             return axios.get(`taskflow/api/nodes/detail/${project_id}/`, {
                 params: {
                     instance_id,
                     node_id,
                     component_code,
                     subprocess_stack,
+                    subprocess_simple_inputs,
                     loop
                 }
             }).then(response => response.data)