From c8447ae86a64dfa1790f78c6cb03670e0bdadd10 Mon Sep 17 00:00:00 2001
From: fannluo <fannluowork@gmail.com>
Date: Wed, 10 Apr 2019 21:27:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E6=A0=87=E5=87=86=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6Tag=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81changeHook?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/RenderForm/FormItem.vue   | 17 +++++++++++++----
 .../components/common/RenderForm/formMixins.js  |  4 ++++
 .../pages/template/TemplateEdit/NodeConfig.vue  |  4 ++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue b/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
index 049dbf211e..37c1d8fcd2 100644
--- a/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
+++ b/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
@@ -10,7 +10,16 @@
 * specific language governing permissions and limitations under the License.
 */
 <template>
-    <div :class="['rf-form-item', 'clearfix', {'rf-has-hook': showHook}]" v-show="showForm">
+    <div
+        :class="[
+            'rf-form-item',
+            'clearfix',
+            {
+                'rf-has-hook': showHook,
+                'show-label': option.showLabel
+            }
+        ]"
+        v-show="showForm">
         <div v-if="!hook && option.showGroup && scheme.attrs.name" class="rf-group-name">
             <h3 class="name">{{scheme.attrs.name}}</h3>
             <div v-if="scheme.attrs.desc" class="rf-group-desc">
@@ -22,11 +31,11 @@
             :class="['rf-tag-label', {'required': isRequired()}]">
             {{scheme.attrs.name}}
         </label>
-        <div v-if="hook" class="rf-tag-form">
+        <div v-show="hook" class="rf-tag-form">
             <el-input :disabled="true" :value="String(value)"></el-input>
         </div>
         <component
-            v-else
+            v-show="!hook"
             class="rf-tag-form"
             ref="tagComponent"
             :is="tagComponent"
@@ -324,7 +333,7 @@ export default {
             }
         }
     }
-    .rf-tag-label + .rf-tag-form {
+    &.show-label .rf-tag-form {
         margin-left: 120px;
     }
     .rf-tag-hook {
diff --git a/pipeline/blueflow/src/components/common/RenderForm/formMixins.js b/pipeline/blueflow/src/components/common/RenderForm/formMixins.js
index be44e4dc78..25a274bafa 100644
--- a/pipeline/blueflow/src/components/common/RenderForm/formMixins.js
+++ b/pipeline/blueflow/src/components/common/RenderForm/formMixins.js
@@ -223,8 +223,12 @@ export function getFormMixins (attrs = {}) {
                 this.$emit('onShow')
             },
             hide () {
+                this.changeHook(false)
                 this.$emit('onHide')
             },
+            changeHook (val) {
+                this.$parent.onHookForm(val)
+            },
             // 获取 form 项实例
             get_form_instance () {
                 return this.$parent
diff --git a/pipeline/blueflow/src/pages/template/TemplateEdit/NodeConfig.vue b/pipeline/blueflow/src/pages/template/TemplateEdit/NodeConfig.vue
index c87557b0b6..1def5d6441 100644
--- a/pipeline/blueflow/src/pages/template/TemplateEdit/NodeConfig.vue
+++ b/pipeline/blueflow/src/pages/template/TemplateEdit/NodeConfig.vue
@@ -957,6 +957,10 @@ export default {
             } else {  // cancel hook
                 variableKey = this.inputAtomData[key] // variable key
                 const variable = this.constants[variableKey]
+                if (!variable) {
+                    return
+                }
+
                 const formKey = this.isSingleAtom ? tagCode : key // input arguments form item key
                 this.inputAtomHook[formKey] = val
                 this.inputAtomData[formKey] = tools.deepClone(this.constants[variableKey].value)

From 11c8a43061a09fa6392ad31142f67a10aa49d67a Mon Sep 17 00:00:00 2001
From: fannluo <fannluowork@gmail.com>
Date: Thu, 11 Apr 2019 17:28:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?minor:Tag=E8=A1=A8=E5=8D=95=E9=A1=B9label?=
 =?UTF-8?q?=20margin=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pipeline/blueflow/src/components/common/RenderForm/FormItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue b/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
index 37c1d8fcd2..d30e004c5f 100644
--- a/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
+++ b/pipeline/blueflow/src/components/common/RenderForm/FormItem.vue
@@ -333,7 +333,7 @@ export default {
             }
         }
     }
-    &.show-label .rf-tag-form {
+    &.show-label > .rf-tag-form {
         margin-left: 120px;
     }
     .rf-tag-hook {