diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue index 5ec2d2737f..bc2ef4a6fc 100644 --- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue +++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue @@ -204,7 +204,7 @@ const divInputDom = this.$el.querySelector('.div-input') if (divInputDom) { divInputDom.innerHTML = this.value - if (this.render) { + if (this.render && this.value) { this.handleInputBlur() } } diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue index c5e3e305a0..f3588658aa 100644 --- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue +++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue @@ -159,8 +159,9 @@ mounted () { const divInputDom = this.$el.querySelector('.div-input') if (divInputDom) { - divInputDom.innerText = typeof this.value === 'string' ? this.value : JSON.stringify(this.value) - if (this.render) { + const value = typeof this.value === 'string' ? this.value : JSON.stringify(this.value) + divInputDom.innerText = value + if (this.render && value) { this.handleInputBlur() // 把用户手动换行变成div标签 divInputDom.innerHTML = divInputDom.innerHTML.replace(/
/g, '

') diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/BranchGateway.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/BranchGateway.vue index a2c72bc32a..bb03dc798f 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/BranchGateway.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/BranchGateway.vue @@ -16,6 +16,7 @@ 'branch-gateway', { 'fail-skip': node.status === 'FINISHED' && node.skip }, { 'ready': node.ready }, + { 'actived': node.isActived }, node.status ? node.status.toLowerCase() : '' ]">
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConditionalParallelGateway.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConditionalParallelGateway.vue index 4d47575b00..c469c30d25 100644 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConditionalParallelGateway.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConditionalParallelGateway.vue @@ -16,6 +16,7 @@ 'branch-gateway', { 'fail-skip': node.status === 'FINISHED' && node.skip }, { 'ready': node.ready }, + { 'actived': node.isActived }, node.status ? node.status.toLowerCase() : '' ]">
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConvergeGateway.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConvergeGateway.vue index b20c763104..73e18f04b9 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConvergeGateway.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ConvergeGateway.vue @@ -10,7 +10,15 @@ * specific language governing permissions and limitations under the License. */ diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ParallelGateway.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ParallelGateway.vue index d10b0ec0ec..05dd1de997 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ParallelGateway.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/ParallelGateway.vue @@ -10,7 +10,15 @@ * specific language governing permissions and limitations under the License. */ diff --git a/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue b/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue index 7a2a164109..75cd4e75ed 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/PalettePanel/index.vue @@ -33,13 +33,13 @@
@@ -57,29 +57,14 @@
- - - -