From 4aca7a521f8fd5fc22bb9139b5536244f0480b41 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 26 Jul 2023 11:22:17 +0800
Subject: [PATCH 001/112] =?UTF-8?q?bugfix:=20=E8=8A=82=E7=82=B9=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=A4=84=E7=90=86-=E8=87=AA=E5=8A=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87/=E6=89=8B=E5=8A=A8=E8=B7=B3=E8=BF=87=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
index b3f3e9e67f..05ec54aae5 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
@@ -752,7 +752,7 @@
                         this.formData.autoRetry.times = 1
                     }
                     if (type === 'ignorable' && val) {
-                        this.formData.skippable = true
+                        this.formData.skippable = false
                         this.formData.retryable = false
                         this.formData.autoRetry.enable = false
                     }

From 519c94d7528d5a81fce016904e53d8540db1f147 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 26 Jul 2023 11:18:26 +0800
Subject: [PATCH 002/112] =?UTF-8?q?optimization:=20=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E4=BB=BB=E5=8A=A1=E5=90=8Dhover=E7=83=AD?=
 =?UTF-8?q?=E5=8C=BA=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/pages/task/PeriodicList/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/desktop/src/pages/task/PeriodicList/index.vue b/frontend/desktop/src/pages/task/PeriodicList/index.vue
index 07b1d61dde..5455b34667 100644
--- a/frontend/desktop/src/pages/task/PeriodicList/index.vue
+++ b/frontend/desktop/src/pages/task/PeriodicList/index.vue
@@ -49,7 +49,7 @@
                                 :prop="item.id"
                                 :width="item.width"
                                 :render-header="renderTableHeader"
-                                show-overflow-tooltip
+                                :show-overflow-tooltip="item.id !== 'name'"
                                 :min-width="item.min_width">
                                 <template slot-scope="{ row }">
                                     <!--任务-->
@@ -67,7 +67,7 @@
                                             }"
                                             @click="onCollectTask(row)">
                                         </a>
-                                        <span class="name" :title="row.name">{{row.name || '--'}}</span>
+                                        <span class="name" v-bk-overflow-tips>{{row.name || '--'}}</span>
                                         <span
                                             class="label"
                                             v-if="row.is_latest === null"

From c14b5f0fbf0e8ed01dfbf3d3a7539cc79875235c Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Tue, 11 Jul 2023 14:32:29 +0800
Subject: [PATCH 003/112] =?UTF-8?q?optimization:=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=BB=BB=E5=8A=A1=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/task/TaskCreate/TaskSelectNode.vue  | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
index 68947f0844..2a9474b538 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
@@ -201,7 +201,8 @@
             ]),
             ...mapActions('task/', [
                 'getSchemeDetail',
-                'loadPreviewNodeData'
+                'loadPreviewNodeData',
+                'getTaskInstanceData'
             ]),
             ...mapActions('appmaker/', [
                 'loadAppmakerDetail'
@@ -483,17 +484,40 @@
             /**
              * 设置默认勾选值
              */
-            setCanvasSelected (selectNodes = []) {
+            async setCanvasSelected (selectNodes = []) {
                 if (this.isPreviewMode) return
                 if (selectNodes.length) {
                     // 使用传进来的选中节点，取消画布默认全选
                     this.selectedNodes = selectNodes
                     this.isAllSelected = !this.isEditProcessPage
                 } else {
-                    this.selectedNodes = Object.keys(this.activities)
+                    const defaultSelected = await this.getDefaultSelected()
+                    this.selectedNodes = defaultSelected
                 }
                 this.updateDataAndCanvas()
             },
+            async getDefaultSelected () {
+                try {
+                    let selectedNodes = []
+                    const { task_id: reuseTaskId } = this.$route.query
+                    if (this.excludeNode.length) { // 优先使用勾选记录
+                        Object.keys(this.activities).forEach(key => {
+                            if (!this.excludeNode.includes(key)) {
+                                selectedNodes.push(key)
+                            }
+                        })
+                    } else if (reuseTaskId) { // 其次复用变量的勾选
+                        const instanceData = await this.getTaskInstanceData(reuseTaskId)
+                        const pipelineTree = JSON.parse(instanceData.pipeline_tree)
+                        selectedNodes = Object.values(pipelineTree.activities).map(item => item.template_node_id)
+                    } else {
+                        selectedNodes = Object.keys(this.activities) // 默认全选
+                    }
+                    return selectedNodes
+                } catch (error) {
+                    console.warn(error)
+                }
+            },
             /**
              * 批量选择执行方案
              */

From 091ef506b263c9cca3c03fb5f8a8cb864be9a4cd Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:01:49 +0800
Subject: [PATCH 004/112] =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=85=8D=E7=BD=AEcom?=
 =?UTF-8?q?bine=E8=A1=A8=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=82=E6=95=B0=E5=90=8D=20(#6945)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/FormGroup.vue           |  7 +--
 .../components/common/RenderForm/FormItem.vue | 26 ++++------
 .../ExecuteInfo/ExecuteInfoForm.vue           | 50 ++++++++++++++++++-
 .../TemplateEdit/NodeConfig/InputParams.vue   | 50 ++++++++++++++++++-
 4 files changed, 113 insertions(+), 20 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index 0b6d1018b1..558729ad37 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -14,7 +14,7 @@
         <!-- 分组名称和提示 -->
         <div v-if="showFormTitle" :class="['rf-group-name', { 'not-reuse': showNotReuseTitle }]">
             <span class="scheme-name">{{scheme.name || scheme.attrs.name}}</span>
-            <span class="scheme-code">{{ scheme.tag_code }}</span>
+            <span class="scheme-code" v-if="!option.showHook">{{ scheme.tag_code }}</span>
             <i
                 v-if="showNotReuseTitle || showPreMakoTip"
                 v-bk-tooltips="{
@@ -195,7 +195,7 @@
         },
         computed: {
             showFormTitle () {
-                return !this.hook && this.option.showGroup && !!(this.scheme.name || this.scheme.attrs.name)
+                return this.option.showGroup && !!(this.scheme.name || this.scheme.attrs.name)
             },
             showNotReuseTitle () {
                 return this.option.formEdit && this.scheme.attrs.notReuse
@@ -369,6 +369,7 @@
 <style lang="scss">
 .rf-form-group {
     position: relative;
+    margin-top: 15px;
     &.added {
         background: rgba(220,255,226,0.30);
     }
@@ -392,7 +393,7 @@
     }
     .rf-tag-hook {
         position: absolute;
-        top: 0;
+        top: 30px;
         right: 0;
         display: flex;
         align-items: center;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index da957c04b7..4c2c90088f 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -39,8 +39,8 @@
             <!-- 表单作为全局变量时的名称 -->
             <div v-if="showFormTitle" :class="['rf-group-name', { 'not-reuse': showNotReuseTitle, 'scheme-select-name': scheme.type === 'select' && !scheme.attrs.remote }]">
                 <span class="scheme-name">{{scheme.name || scheme.attrs.name}}</span>
-                <span class="required" v-if="isRequired()" style="display: none">*</span>
-                <span class="scheme-code">{{ scheme.tag_code }}</span>
+                <span class="required" v-if="isRequired()">*</span>
+                <span class="scheme-code" v-if="!option.showHook">{{ scheme.tag_code }}</span>
                 <i
                     v-if="showNotReuseTitle || showPreMakoTip"
                     v-bk-tooltips="{
@@ -265,7 +265,7 @@
         },
         computed: {
             showFormTitle () {
-                return !this.hook && this.option.showGroup && !!(this.scheme.name || this.scheme.attrs.name)
+                return this.option.showGroup && !!(this.scheme.name || this.scheme.attrs.name)
             },
             showNotReuseTitle () {
                 return this.option.formEdit && this.scheme.attrs.notReuse
@@ -524,7 +524,7 @@
 <style lang="scss">
 .rf-form-item {
     position: relative;
-    margin: 15px 0;
+    margin-top: 15px;
     min-height: 32px;
     font-size: 12px;
     color: #63656e;
@@ -541,9 +541,8 @@
     }
     &.rf-col-layout {
         display: inline-block;
-        margin: 0;
         padding-right: 10px;
-        vertical-align: top;
+        vertical-align: text-bottom;
     }
     &.rf-view-mode {
         margin: 8px 0;
@@ -557,6 +556,11 @@
     &.deleted {
         background: #ffeeec;
     }
+    .required {
+        color: #F00;
+        margin-left: 5px;
+        font-family: "SimSun";
+    }
     .rf-tag-label {
         float: left;
         position: relative;
@@ -567,14 +571,6 @@
         text-align: right;
         word-wrap: break-word;
         word-break: break-all;
-        .required {
-            position: absolute;
-            top: 2px;
-            right: -10px;
-            color: #F00;
-            margin-left: 5px;
-            font-family: "SimSun";
-        }
         .tag-label-tips {
             position: relative;
             &::after {
@@ -601,7 +597,7 @@
     }
     .rf-tag-hook {
         position: absolute;
-        top: 0;
+        top: 30px;
         right: 0;
         display: flex;
         align-items: center;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 9d065c6f5a..16735eee92 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -187,7 +187,7 @@
                 outputs: [],
                 hooked: {},
                 option: {
-                    showGroup: false,
+                    showGroup: true,
                     showHook: true,
                     showLabel: true,
                     showVarList: true,
@@ -674,5 +674,53 @@
     .no-data-wrapper {
         padding-top: 20px;
     }
+    /deep/.render-form {
+        .rf-tag-label {
+            display: none;
+        }
+        .rf-form-group {
+            >.rf-form-item {
+                margin-top: 0;
+            }
+        }
+        .form-item-group {
+            padding: 16px;
+            margin-right: 64px;
+            background: #f5f7fa;
+            .rf-tag-form {
+                margin-right: 0;
+            }
+            .rf-form-item {
+                .rf-tag-label {
+                    display: block;
+                    float: initial;
+                    text-align: left;
+                    margin: 0 0 6px;
+                    color: #63656e;
+                    line-height: 20px;
+                    .required {
+                        position: relative;
+                        top: 0;
+                        right: 0;
+                    }
+                }
+                &:last-child {
+                    margin-bottom: 0;
+                }
+            }
+            .form-item-group {
+                padding: 0;
+                margin-right: 0;
+            }
+            .tag-ip-selector-wrap,
+            .resource-allocation {
+                border: none;
+                padding: 0;
+            }
+        }
+        .rf-tag-form {
+            margin-left: 0;
+        }
+    }
     
 </style>
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
index 0eb19c5558..b4a305f586 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
@@ -98,7 +98,7 @@
                 reuseableVarList: [],
                 notReferredExpand: false, // 未引用变量是否展开
                 option: {
-                    showGroup: false,
+                    showGroup: true,
                     showHook: this.showHook,
                     showLabel: true,
                     showVarList: true,
@@ -372,4 +372,52 @@
         }
     }
 }
+/deep/.render-form {
+    .rf-tag-label {
+        display: none;
+    }
+    .rf-form-group {
+        >.rf-form-item {
+            margin-top: 0;
+        }
+    }
+    .form-item-group {
+        padding: 16px;
+        margin-right: 64px;
+        background: #f5f7fa;
+        .rf-tag-form {
+            margin-right: 0;
+        }
+        .rf-form-item {
+            .rf-tag-label {
+                display: block;
+                float: initial;
+                text-align: left;
+                margin: 0 0 6px;
+                color: #63656e;
+                line-height: 20px;
+                .required {
+                    position: relative;
+                    top: 0;
+                    right: 0;
+                }
+            }
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+        .form-item-group {
+            padding: 0;
+            margin-right: 0;
+        }
+        .tag-ip-selector-wrap,
+        .resource-allocation {
+            border: none;
+            padding: 0;
+        }
+    }
+    .rf-tag-form {
+        margin-left: 0;
+    }
+}
 </style>

From 0dff0e4a544c80eec13881d1775db7da5f6a3353 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 26 Jul 2023 11:59:28 +0800
Subject: [PATCH 005/112] =?UTF-8?q?optimization:=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F&=E9=A1=B9=E7=9B=AE=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8F=98=E9=87=8F=E8=BE=93=E5=87=BA=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateSetting/TabGlobalVariables/VariableItem.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index 164331ac4e..7262fc4003 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -80,7 +80,7 @@
                         size="small"
                         theme="primary"
                         :value="outputed"
-                        :disabled="isViewMode"
+                        :disabled="isViewMode || variableData.isSysVar"
                         @change="onChangeVariableOutput(variableData.key, $event)">
                     </bk-switcher>
                 </div>

From 6c3ae1c1e5b21b2e72ad18e4d99c8eaae93f9dbd Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 10 Mar 2023 11:48:30 +0800
Subject: [PATCH 006/112] =?UTF-8?q?optimization:=20=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=E5=88=87=E6=8D=A2=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?/=E5=AF=BC=E8=88=AA=E8=A7=A6=E5=8F=91=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86=EF=BC=8C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E3=80=90=E7=95=99=E5=9C=A8=E6=AD=A4=E9=A1=B5=E3=80=91=E9=9C=80?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=9E=E5=8E=9F=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/layout/Navigation.vue      | 14 ++++++++++-
 .../src/components/layout/ProjectSelector.vue | 25 ++++++++++++++++++-
 .../src/pages/template/TemplateEdit/index.vue |  4 +++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/frontend/desktop/src/components/layout/Navigation.vue b/frontend/desktop/src/components/layout/Navigation.vue
index 4723d5ecba..07f8dedb07 100644
--- a/frontend/desktop/src/components/layout/Navigation.vue
+++ b/frontend/desktop/src/components/layout/Navigation.vue
@@ -19,6 +19,7 @@
         </template>
         <template slot="menu">
             <bk-navigation-menu
+                :key="randomKey"
                 :default-active="currentNav"
                 :toggle-active="true"
                 item-default-icon-color="#949ba5"
@@ -76,6 +77,7 @@
     import { COMMON_ROUTE_LIST, ADMIN_ROUTE_LIST, APPMAKER_ROUTE_LIST } from '@/constants/routes.js'
     import tools from '@/utils/tools.js'
     import NavigatorHeadRight from '@/components/layout/NavigatorHeadRight.vue'
+    import bus from '@/utils/bus.js'
 
     export default {
         inject: ['reload'],
@@ -90,7 +92,8 @@
                 sideNavOpen,
                 title: '',
                 currentNav: '',
-                logo: require('../../assets/images/logo/logo_icon.svg')
+                logo: require('../../assets/images/logo/logo_icon.svg'),
+                randomKey: null
             }
         },
         computed: {
@@ -149,6 +152,15 @@
                 this.setNavigationTitle(this.$route)
             }
         },
+        created () {
+            bus.$on('cancelRoute', (val) => {
+                const { name } = this.$route
+                if (name !== this.currentNav) {
+                    this.setNavigationTitle(this.$route)
+                    this.randomKey = new Date().getTime()
+                }
+            })
+        },
         methods: {
             ...mapActions('project', [
                 'loadUserProjectList'
diff --git a/frontend/desktop/src/components/layout/ProjectSelector.vue b/frontend/desktop/src/components/layout/ProjectSelector.vue
index fd237e5ef2..f86b6fa0af 100644
--- a/frontend/desktop/src/components/layout/ProjectSelector.vue
+++ b/frontend/desktop/src/components/layout/ProjectSelector.vue
@@ -21,6 +21,8 @@
         </div>
         <bk-select
             v-else
+            ref="projectSelect"
+            :key="randomKey"
             class="project-select"
             ext-popover-cls="project-select-comp-list"
             :value="crtProject"
@@ -51,6 +53,7 @@
     import i18n from '@/config/i18n/index.js'
     import { mapState } from 'vuex'
     import openOtherApp from '@/utils/openOtherApp.js'
+    import bus from '@/utils/bus.js'
 
     export default {
         name: 'ProjectSelector',
@@ -69,7 +72,8 @@
             return {
                 crtProject: isNaN(id) ? '' : id,
                 showList: false,
-                searchStr: ''
+                searchStr: '',
+                randomKey: null
             }
         },
         computed: {
@@ -109,7 +113,26 @@
                 return projects
             }
         },
+        watch: {
+            '$route' (val) {
+                this.updateSelected()
+            }
+        },
+        created () {
+            bus.$on('cancelRoute', (val) => {
+                this.updateSelected()
+            })
+        },
         methods: {
+            updateSelected () {
+                let { project_id: projectId } = this.$route.params
+                projectId = Number(projectId)
+                const { selected } = this.$refs.projectSelect
+                if (Number(projectId) !== selected) {
+                    this.crtProject = projectId
+                    this.randomKey = new Date().getTime()
+                }
+            },
             async onProjectChange (id) {
                 if (this.project_id === id) {
                     return false
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/index.vue
index 035e87266e..50988be9ca 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/index.vue
@@ -211,6 +211,7 @@
     import TaskSelectNode from '../../task/TaskCreate/TaskSelectNode.vue'
     import BatchUpdateDialog from './BatchUpdateDialog.vue'
     import DealVarDirtyData from '@/utils/dealVarDirtyData.js'
+    import bus from '@/utils/bus.js'
 
     export default {
         name: 'TemplateEdit',
@@ -1938,6 +1939,9 @@
                 this.leaveToPath = to.fullPath
                 this.$bkInfo({
                     ...this.infoBasicConfig,
+                    cancelFn: () => {
+                        bus.$emit('cancelRoute')
+                    },
                     confirmFn: () => {
                         this.allowLeave = true
                         this.$router.push({ path: this.leaveToPath })

From e35ed46a76b450c1a99c89086761dec5d0f80467 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 26 Jul 2023 14:49:29 +0800
Subject: [PATCH 007/112] =?UTF-8?q?optimization:=20input=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E6=94=AF=E6=8C=81=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=81=94=E6=83=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       | 333 +++++++++++++++++-
 1 file changed, 316 insertions(+), 17 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index f517a3cc28..ea9d1aa3d0 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -14,20 +14,43 @@
         <div class="rf-form-wrapper">
             <template v-if="formMode">
                 <el-input
+                    v-if="showPassword"
                     type="text"
                     v-model="inputValue"
-                    :disabled="!editable || disabled"
+                    :disabled="isDisabled"
                     :show-password="showPassword"
                     :placeholder="placeholder"
-                    @input="onInput">
+                    @blur="$emit('blur')"
+                    @input="handleInputChange">
                 </el-input>
+                <div v-else class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled }">
+                    <div
+                        ref="input"
+                        class="div-input"
+                        :class="{
+                            'input-before': !input.value
+                        }"
+                        :contenteditable="!isDisabled"
+                        :data-placeholder="placeholder"
+                        v-bk-clickoutside="handleClickOutSide"
+                        @mouseup="handleInputMouseUp"
+                        @focus="handleInputFocus"
+                        @keydown="handleInputKeyDown"
+                        @input="handleInputChange">
+                    </div>
+                </div>
                 <transition>
-                    <div class="rf-select-list" v-show="showVarList && isListOpen">
+                    <div
+                        class="rf-select-list"
+                        :style="`right: ${varListPositionRight}px`"
+                        v-show="showVarList && isListOpen">
                         <ul class="rf-select-content">
                             <li
                                 class="rf-select-item"
                                 v-for="item in varList"
+                                v-bk-overflow-tips
                                 :key="item"
+                                :class="{ 'is-hover': hoverKey === item }"
                                 @click.stop="onSelectVal(item)">
                                 {{ item }}
                             </li>
@@ -47,8 +70,6 @@
     import dom from '@/utils/dom.js'
     import { getFormMixins } from '../formMixins.js'
 
-    const VAR_REG = /\$.*$/
-
     export const attrs = {
         placeholder: {
             type: String,
@@ -85,7 +106,14 @@
         data () {
             return {
                 isListOpen: false,
-                varList: []
+                input: {
+                    value: this.value,
+                    focus: false
+                },
+                varList: [],
+                varListPositionRight: 0,
+                hoverKey: '',
+                selection: {}
             }
         },
         computed: {
@@ -122,11 +150,29 @@
                 } else {
                     return this.showPassword ? '******' : this.value
                 }
+            },
+            isDisabled () {
+                return !this.editable || this.disable
+            }
+        },
+        watch: {
+            isListOpen (val) {
+                if (!val) {
+                    this.hoverKey = ''
+                    const selectDom = this.$el.querySelector('.rf-select-content')
+                    selectDom.scrollTo({ top: 0 })
+                }
             }
         },
         created () {
             window.addEventListener('click', this.handleListShow, false)
         },
+        mounted () {
+            const divInputDom = this.$el.querySelector('.div-input')
+            if (divInputDom) {
+                divInputDom.innerHTML = this.value
+            }
+        },
         beforeDestroy () {
             window.removeEventListener('click', this.handleListShow, false)
         },
@@ -135,28 +181,240 @@
                 if (!this.isListOpen) {
                     return
                 }
-                const listPanel = document.querySelector('.rf-select-list')
-                if (listPanel && !dom.nodeContains(listPanel, e.target)) {
+                const parent = e.target.offsetParent
+                let classList = parent ? parent.classList : null
+                classList = classList && Array.from(classList.values())
+                const listPanel = this.$el.querySelector('.rf-select-list')
+                if (listPanel && !dom.nodeContains(listPanel, e.target) && classList[0] !== 'rf-form-wrapper') {
                     this.isListOpen = false
                 }
             },
-            onInput (val) {
-                const matchResult = val.match(VAR_REG)
+            onSelectVal (val) {
+                // 替换内容
+                const { focusNode, anchorOffset, previousElementSibling } = this.selection
+                const divInputDom = this.$el.querySelector('.div-input')
+                const { outerHTML, id } = previousElementSibling || {}
+                const previousDomContent = outerHTML || ''
+                // 光标左边文本内容
+                let matchText = focusNode.data.slice(0, anchorOffset)
+                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
+                matchText = matchText.split(varRegexp).pop()
+                // 拿到字段最后以$开头的部分
+                matchText = matchText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
+                const focusNodeContent = focusNode.data.slice(0, anchorOffset - matchText.length) + val + focusNode.data.slice(anchorOffset)
+                const replaceContent = previousDomContent + focusNodeContent
+                divInputDom.innerHTML = divInputDom.innerHTML.replace(previousDomContent + focusNode.data, replaceContent)
+                // 更新表单
+                const replacedValue = divInputDom.innerText
+                this.input.value = replacedValue
+                this.updateForm(replacedValue)
+                // 清空/关闭
+                this.isListOpen = false
+                this.hoverKey = ''
+                this.selection = {}
+                this.input.focus = true
+                // 设置光标在变量后面
+                this.$nextTick(() => {
+                    const selection = window.getSelection()
+                    let previousDom = null
+                    const textNode = Array.from(divInputDom.childNodes).find(item => {
+                        const previousDomMatch = id ? id === previousDom?.id : true
+                        if (previousDomMatch && item.nodeName === '#text' && item.textContent.indexOf(val) > -1) {
+                            return true
+                        }
+                        previousDom = item
+                        return false
+                    })
+                    selection.collapse(textNode, anchorOffset - matchText.length + val.length)
+                })
+            },
+            // 文本框点击
+            handleInputMouseUp (e) {
+                // 判断是否点到变量节点上
+                let isVarTagDom = false
+                const varTagDoms = this.$el.querySelectorAll('.var-tag')
+                if (varTagDoms && varTagDoms.length) {
+                    isVarTagDom = Array.from(varTagDoms).some(item => dom.nodeContains(item, e.target))
+                }
+                if (isVarTagDom) {
+                    const varText = e.target.innerText
+                    const divInputDom = this.$el.querySelector('.div-input')
+                    // 记录光标的位置
+                    const selection = window.getSelection()
+                    const varTextOffset = selection.anchorOffset
+                    // 上一个相邻的tag
+                    const tagNodes = Array.from(divInputDom.childNodes).filter(item => item.nodeName !== '#text')
+                    const index = tagNodes.findIndex(item => item.id === e.target.id)
+                    const previousTagDom = tagNodes[index - 1]
+                    // 替换内容
+                    divInputDom.innerHTML = divInputDom.innerHTML.replace(e.target.outerHTML, varText)
+                    // 变量左侧文本的长度
+                    let startToVarTextLength = 0
+                    let previousDom = null
+                    // 选取符合条件的文本节点
+                    const textNode = Array.from(divInputDom.childNodes).find(item => {
+                        const previousDomMatch = previousTagDom ? previousTagDom.id === previousDom?.id : true
+                        if (previousDomMatch && item.nodeName === '#text' && item.textContent.indexOf(varText) > -1) {
+                            startToVarTextLength = item.textContent.split(varText)[0].length
+                            return true
+                        }
+                        previousDom = item
+                        return false
+                    })
+                    selection.collapse(textNode, startToVarTextLength + varTextOffset)
+                }
+            },
+            // 文本框获取焦点
+            handleInputFocus (e) {
+                this.input.focus = true
+                const input = this.$refs.input
+                // 设置光标到最后
+                const selection = window.getSelection()
+                selection.selectAllChildren(input)
+                selection.collapseToEnd()
+                if (!this.input.value) return
+                setTimeout(() => {
+                    let focusSelection = null
+                    const { nodeName, lastChild } = selection.focusNode
+                    if (nodeName === 'DIV') {
+                        focusSelection = {
+                            anchorOffset: lastChild.data.length,
+                            focusNode: lastChild
+                        }
+                    } else if (nodeName === '#text') {
+                        focusSelection = selection
+                    }
+                    this.handleInputChange(e, focusSelection)
+                }, 0)
+            },
+            // 文本框输入
+            handleInputChange (e, selection) {
+                if (!selection) {
+                    const { innerText } = e.target
+                    this.input.value = innerText
+                    this.updateForm(innerText)
+                }
+                let matchResult = []
+                const { focusNode, anchorOffset } = selection || window.getSelection()
+                if (!focusNode.data) {
+                    this.isListOpen = false
+                    return
+                }
+                const offsetText = focusNode.data.substring(0, anchorOffset)
+                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
+                let matchText = offsetText.split(varRegexp).pop()
+                // 拿到字段最后以$开头的部分
+                matchText = matchText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
+                // 判断是否为变量格式
+                if (matchText === '$') {
+                    matchResult = ['$']
+                } else if (/^\${[a-zA-Z_]*[\w|.]*/.test(matchText)) {
+                    matchResult = [matchText]
+                }
                 if (matchResult && matchResult[0]) {
                     const regStr = matchResult[0].replace(/[\$\{\}]/g, '\\$&')
                     const inputReg = new RegExp(regStr)
                     this.varList = this.constantArr.filter(item => {
                         return inputReg.test(item)
                     })
+                    // 计算变量下拉列表的left
+                    this.isListOpen = false
+                    if (this.varList.length) {
+                        const { width: inputWidth } = this.$el.querySelector('.rf-form-wrap').getBoundingClientRect()
+                        let previousDomWidth = 0
+                        let previousDomLeft = 0
+                        const { previousElementSibling } = focusNode
+                        this.selection = {
+                            previousElementSibling,
+                            focusNode,
+                            anchorOffset
+                        }
+                        if (previousElementSibling) {
+                            previousDomWidth = previousElementSibling.offsetWidth || 0
+                            previousDomLeft = previousElementSibling.offsetLeft || 0
+                        }
+                        const newDom = document.createElement('span')
+                        newDom.innerHTML = offsetText
+                        this.$el.appendChild(newDom)
+                        const focusValueWidth = newDom.offsetWidth || 0
+                        this.$el.removeChild(newDom)
+                        let right = inputWidth - 238 - previousDomLeft - previousDomWidth - focusValueWidth
+                        right = right > 0 ? right : 0
+                        this.varListPositionRight = right
+                    }
                 } else {
                     this.varList = []
                 }
                 this.isListOpen = !!this.varList.length
             },
-            onSelectVal (val) {
-                const replacedValue = this.value.replace(VAR_REG, val)
-                this.updateForm(replacedValue)
-                this.isListOpen = false
+            // 点击到input外面
+            handleClickOutSide (e) {
+                if (!this.input.focus) return
+                const parent = e.target.offsetParent
+                const classList = parent ? parent.classList : null
+                const unFocus = !parent || (classList && !Array.from(classList.values()).some(key => {
+                    return ['tag-input', 'tippy-tooltip', 'tippy-content', 'rf-select-list'].includes(key)
+                }))
+                if (unFocus && e.target.className !== 'var-tag') {
+                    this.handleInputBlur()
+                }
+            },
+            // 文本框失焦
+            handleInputBlur  (e) {
+                this.$emit('blur')
+                this.input.focus = false
+                // 支持所有变量（系统变量，内置变量，自定义变量）
+                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
+                const innerHtml = this.input.value.replace(varRegexp, (match) => {
+                    if (this.constantArr.includes(match)) {
+                        return `<span contenteditable="false" class="var-tag" id="${Math.random()}">${match}</span>` // 两边留空格保持间距
+                    }
+                    return match
+                })
+                const divInputDom = this.$el.querySelector('.div-input')
+                divInputDom.innerHTML = innerHtml
+            },
+            // 文本框按键事件
+            handleInputKeyDown (e) {
+                switch (e.code) {
+                    case 'Enter':
+                    case 'NumpadEnter':
+                        e.preventDefault()
+                        this.handleKeyEnter()
+                        break
+                    case 'ArrowDown':
+                    case 'ArrowUp':
+                        e.preventDefault()
+                        this.handleDocumentKeydown(event)
+                        break
+                    default:
+                        return false
+                }
+            },
+            handleKeyEnter () {
+                if (!this.hoverKey) return
+                this.onSelectVal(this.hoverKey)
+            },
+            handleDocumentKeydown (event) {
+                const len = this.varList.length
+                if (len) {
+                    event.preventDefault()
+                    event.stopPropagation()
+                    let curIndex = this.varList.findIndex(item => item === this.hoverKey)
+                    curIndex = event.code === 'ArrowDown' ? curIndex + 1 : curIndex - 1
+                    curIndex = curIndex > len - 1 ? 0 : (curIndex < 0 ? len - 1 : curIndex)
+                    const option = this.varList[curIndex]
+                    if (option) {
+                        this.hoverKey = option
+                        const selectDom = this.$el.querySelector('.rf-select-content')
+                        const hoverItemDom = selectDom.querySelector('.is-hover')
+                        if (hoverItemDom) {
+                            selectDom.scrollTo({
+                                top: 32 * (curIndex < 3 ? 0 : curIndex - 2)
+                            })
+                        }
+                    }
+                }
             }
         }
     }
@@ -174,7 +432,7 @@
             position: absolute;
             top: 40px;
             right: 0;
-            width: 100%;
+            width: 238px;
             background: #ffffff;
             border-radius: 2px;
             box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
@@ -183,6 +441,7 @@
         }
         .rf-select-content {
             max-height: 100px;
+            padding: 2px 0;
             overflow: auto;
             @include scrollbar;
         }
@@ -191,11 +450,51 @@
             line-height: 32px;
             font-size: 12px;
             cursor: pointer;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            &.is-hover,
+            &:hover {
+                background: #f5f7fa;
+            }
+        }
+    }
+    .rf-form-wrap {
+        line-height: 32px;
+        padding: 0 10px;
+        border: 1px solid #c4c6cc;
+        border-radius: 2px;
+        margin-top: 20px;
+        &.input-focus {
+            border-color: #3a84ff;
+        }
+        &.input-disable {
+            cursor: not-allowed;
+            background-color: #fafbfd;
+            border-color: #dcdee5;
+            .div-input {
+                height: 32px;
+            }
+        }
+    }
+    .div-input {
+        height: 32px;
+        line-height: 18px;
+        padding: 7px 0;
+        color: #63656e;
+        white-space: nowrap;
+        overflow: hidden;
+        /deep/.var-tag {
+            padding: 0px 4px;
+            background: #f0f1f5;
+            cursor: pointer;
             &:hover {
-                background: #eef6fe;
-                color: #3a84ff;
+                background: #eaebf0;
             }
         }
+        &.input-before::before {
+            content: attr(data-placeholder);
+            color: #c4c6cc;
+        }
     }
 }
 </style>

From eec3ef0d52986db23784eda8e5a25f382233c8f1 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 26 Jul 2023 15:06:06 +0800
Subject: [PATCH 008/112] =?UTF-8?q?optimization:=20=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=85=8D=E6=B8=B2=E6=9F=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/develop/tag_usage_dev.md                 |   1 +
 en_docs/develop/tag_usage_dev.md              |   1 +
 .../src/components/common/FullCodeEditor.vue  |   1 +
 .../common/RenderForm/FormGroup.vue           |  28 ++--
 .../components/common/RenderForm/FormItem.vue |  48 ++++++-
 .../common/RenderForm/formMixins.js           |   4 +
 .../common/RenderForm/tags/TagCodeEditor.vue  | 130 +++++++++++++++++-
 frontend/desktop/src/config/i18n/cn.js        |   4 +-
 frontend/desktop/src/config/i18n/en.js        |   5 +-
 9 files changed, 197 insertions(+), 25 deletions(-)

diff --git a/docs/develop/tag_usage_dev.md b/docs/develop/tag_usage_dev.md
index 2c43424dab..42e6bca4a0 100644
--- a/docs/develop/tag_usage_dev.md
+++ b/docs/develop/tag_usage_dev.md
@@ -524,6 +524,7 @@ ip 选择器，支持静态 ip 或动态 ip 的单选和多选。
  - `showMiniMap`: 显示小地图，默认 false
  - `showLanguageSwitch`: 显示语言切换，默认 true
  - `readOnly`: 只读模式，默认 false
+ - `variable_render`: 是否开启变量渲染，默认 false
 
 **方法**
 
diff --git a/en_docs/develop/tag_usage_dev.md b/en_docs/develop/tag_usage_dev.md
index c79e80508f..556f81a44b 100644
--- a/en_docs/develop/tag_usage_dev.md
+++ b/en_docs/develop/tag_usage_dev.md
@@ -524,6 +524,7 @@ Code editor
  - `showMiniMap`: show minimap. Default: false
  - `showLanguageSwitch`: show language switch. Default: true
  - `readOnly`: read only mode. Default: false
+  - `variable_render`: enable variable render. Default: false
 
 **Methods**
 
diff --git a/frontend/desktop/src/components/common/FullCodeEditor.vue b/frontend/desktop/src/components/common/FullCodeEditor.vue
index 9838bd1481..d32fe7d74b 100644
--- a/frontend/desktop/src/components/common/FullCodeEditor.vue
+++ b/frontend/desktop/src/components/common/FullCodeEditor.vue
@@ -31,6 +31,7 @@
             </i>
         </div>
         <code-editor
+            ref="codeEditor"
             :key="isFullScreen"
             :value="value"
             :options="options"
diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index 558729ad37..5f8a9b1c29 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -92,7 +92,7 @@
         <!-- 变量勾选checkbox -->
         <div class="rf-tag-hook" v-if="showHook">
             <i
-                :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                :class="['common-icon-var hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                 v-bk-tooltips="{
                     content: hook ? $t('取消变量引用') : $t('设置为变量'),
                     placement: 'bottom',
@@ -100,15 +100,7 @@
                 }"
                 @click="onHookForm(!hook)">
             </i>
-            <i
-                :class="['common-icon-render-skip render-skip-icon', { actived: !render, disabled: !option.formEdit || hook }]"
-                v-bk-tooltips="{
-                    content: !render ? $t('取消变量免渲染') : $t('变量免渲染'),
-                    placement: 'bottom',
-                    zIndex: 3000
-                }"
-                @click="onRenderChange">
-            </i>
+            <i class="bk-icon icon-angle-up-fill"></i>
         </div>
         <!-- 分组描述 -->
         <div class="scheme-desc-wrap" v-if="scheme.attrs.desc">
@@ -268,12 +260,6 @@
                 }
                 this.$emit('onHook', this.scheme.tag_code, val)
             },
-            onRenderChange () {
-                if (!this.option.formEdit || this.hook) {
-                    return
-                }
-                this.$emit('onRenderChange', this.scheme.tag_code, !this.render)
-            },
             get_parent () {
                 return this.$parent
             },
@@ -397,15 +383,14 @@
         right: 0;
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content: center;
         padding: 0 8px;
         width: 56px;
         height: 32px;
         background: #f0f1f5;
         border-radius: 2px;
         z-index: 1;
-        .hook-icon,
-        .render-skip-icon {
+        .hook-icon {
             font-size: 16px;
             color: #979ba5;
             cursor: pointer;
@@ -420,6 +405,11 @@
         .hook-icon {
             font-size: 19px;
         }
+        .icon-angle-up-fill {
+            font-size: 12px;
+            color: #c4c6cc;
+            margin: 3px 0 0 6px;
+        }
     }
     .tag-label-tips {
         position: relative;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 4c2c90088f..ee2d8e4a42 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -114,6 +114,7 @@
                 v-bind="getDefaultAttrs()"
                 :tag-code="scheme.tag_code"
                 :hook="hook"
+                :render="render"
                 :constants="constants"
                 :atom-events="scheme.events"
                 :atom-methods="scheme.methods"
@@ -125,9 +126,9 @@
                 @onHide="onHideForm">
             </component>
             <!-- 变量勾选checkbox -->
-            <div class="rf-tag-hook" v-if="showHook">
+            <div class="rf-tag-hook" v-if="showHook" :class="{ 'hide-render-icon': !isShowRenderIcon }">
                 <i
-                    :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                    :class="['common-icon-var hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                     v-bk-tooltips="{
                         content: hook ? $t('取消变量引用') : $t('设置为变量'),
                         placement: 'bottom',
@@ -136,6 +137,7 @@
                     @click="onHookForm(!hook)">
                 </i>
                 <i
+                    v-if="isShowRenderIcon"
                     :class="['common-icon-render-skip render-skip-icon', { actived: !render, disabled: !option.formEdit || hook }]"
                     v-bk-tooltips="{
                         content: !render ? $t('取消变量免渲染') : $t('变量免渲染'),
@@ -144,6 +146,7 @@
                     }"
                     @click="onRenderChange">
                 </i>
+                <i v-else class="bk-icon icon-angle-up-fill"></i>
             </div>
             <div class="scheme-desc-wrap" v-if="scheme.attrs.desc">
                 <div class="hide-html-text">{{ scheme.attrs.desc }}</div>
@@ -260,7 +263,8 @@
                 showHook,
                 formValue,
                 isDescTipsShow: false,
-                isExpand: false
+                isExpand: false,
+                isShowRenderIcon: false // 是否展示免渲染icon
             }
         },
         computed: {
@@ -305,6 +309,36 @@
                 this.$options.components[item] = tagComponent[item]
             })
         },
+        created () {
+            // 针对job的代码编辑框，移除「变量免渲染」的功能开关
+            const { type, attrs } = this.scheme
+            if (type === 'code_editor') {
+                if (attrs.variable_render) { // variable_render 是否开启变量渲染
+                    this.isShowRenderIcon = true
+                    return
+                }
+                /**
+                 * need_render:
+                    1. false
+                        之前已勾选，现在去掉免渲染icon
+                    2.true，判断value
+                        a. 不包含${}，需要把need_render置为false，去掉免渲染icon
+                        b. 包含${}，保留免渲染icon
+                 */
+                if (this.render) {
+                    const regex = /\${[a-zA-Z_]\w*}/g
+                    const matchList = this.value.match(regex)
+                    const isMatch = matchList && matchList.some(item => {
+                        return !!this.constants[item]
+                    })
+                    if (isMatch) {
+                        this.isShowRenderIcon = true
+                    } else {
+                        this.onRenderChange()
+                    }
+                }
+            }
+        },
         mounted () {
             const showDom = this.$el.querySelector('.rf-group-desc')
             const hideDom = this.$el.querySelector('.hide-html-text')
@@ -624,6 +658,14 @@
         .hook-icon {
             font-size: 19px;
         }
+        .icon-angle-up-fill {
+            font-size: 12px;
+            color: #c4c6cc;
+            margin: 3px 0 0 6px;
+        }
+        &.hide-render-icon {
+            justify-content: center;
+        }
     }
     .rf-view-value {
         display: inline-block;
diff --git a/frontend/desktop/src/components/common/RenderForm/formMixins.js b/frontend/desktop/src/components/common/RenderForm/formMixins.js
index f19c207f50..447713197c 100644
--- a/frontend/desktop/src/components/common/RenderForm/formMixins.js
+++ b/frontend/desktop/src/components/common/RenderForm/formMixins.js
@@ -110,6 +110,10 @@ export const getFormMixins = (attrs = {}) => {
                 type: Boolean,
                 default: false
             },
+            render: {
+                type: Boolean,
+                default: true
+            },
             constants: {
                 type: Object,
                 default () {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
index 257e1fb3c6..eac702a8e3 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
@@ -11,6 +11,14 @@
 */
 <template>
     <div class="tag-code-editor">
+        <bk-alert type="warning" closable :close-text="$t('我知道了')" v-if="globalVarLength">
+            <template slot="title">
+                <i18n tag="div" path="tagCodeEditorTips">
+                    <span class="strong">{{ $t('不再支持') }}</span>
+                    <span class="strong num">{{ globalVarLength }}</span>
+                </i18n>
+            </template>
+        </bk-alert>
         <div class="control-header" v-if="showLanguageSwitch">
             <div class="language-select">
                 <bk-select
@@ -52,6 +60,8 @@
     import '@/utils/i18n.js'
     import { getFormMixins } from '../formMixins.js'
     import FullCodeEditor from '@/components/common/FullCodeEditor.vue'
+    import * as monaco from 'monaco-editor'
+    import { mapState } from 'vuex'
     export const attrs = {
         language: {
             type: String,
@@ -78,6 +88,11 @@
             default: false,
             desc: 'The editor code is read-only'
         },
+        variable_render: {
+            type: Boolean,
+            default: false,
+            desc: 'Variable render'
+        },
         value: {
             type: String,
             default: ''
@@ -92,10 +107,30 @@
         data () {
             return {
                 editorReload: false,
-                languages: ['javascript', 'typescript', 'json', 'python', 'shell']
+                languages: ['javascript', 'typescript', 'json', 'python', 'shell'],
+                decorationsMap: {},
+                globalVarLength: 0
             }
         },
         computed: {
+            ...mapState({
+                'internalVariable': state => state.template.internalVariable
+            }),
+            constantArr: {
+                get () {
+                    let KeyList = []
+                    if (this.constants) {
+                        KeyList = [...Object.keys(this.constants)]
+                    }
+                    if (this.internalVariable) {
+                        KeyList = [...KeyList, ...Object.keys(this.internalVariable)]
+                    }
+                    return KeyList
+                },
+                set (val) {
+                    this.varList = val
+                }
+            },
             disabled () {
                 return !this.editable || this.readOnly
             }
@@ -108,9 +143,84 @@
                 this.onLanguageChange()
             }
         },
+        mounted () {
+            this.setVariableTag(this.value)
+        },
         methods: {
             contentUpdate (val) {
+                if (this.hook) return
                 this.updateForm(val)
+                this.setVariableTag(val, true)
+            },
+            // 变量tag设置
+            setVariableTag (value, valueUpdate) {
+                // 不是变量免渲染则首先判断脚本内容是否包含全局变量
+                if (this.render) {
+                    const regex = /\${[a-zA-Z_]\w*}/
+                    const rows = value.split('\n')
+                    // 获取光标所在行
+                    const { monacoInstance } = this.$refs.tagCodeEditor?.$refs.codeEditor || {}
+                    const { lineNumber } = monacoInstance?.getPosition() || {}
+                    if (regex.test(value)) {
+                        const matchMap = rows.reduce((acc, cur, idx) => {
+                            const variables = cur.match(/\${[a-zA-Z_]\w*}/g) || []
+                            const matchList = variables.filter(item => this.constantArr.includes(item))
+                            if (matchList.length) {
+                                acc[idx + 1] = matchList
+                            }
+                            return acc
+                        }, {})
+                        // 脚本内容存在全局变量
+                        this.globalVarLength = Object.values(matchMap).flat().length
+                        // 数据更新处理逻辑
+                        if (valueUpdate) {
+                            // 清空本行所有变量色块
+                            if (this.decorationsMap[lineNumber]) {
+                                this.decorationsMap[lineNumber].forEach(decorations => {
+                                    monacoInstance.deltaDecorations(
+                                        [...decorations],
+                                        []
+                                    )
+                                })
+                                delete this.decorationsMap[lineNumber]
+                            }
+                            // 检查光标位置，如果光标没有定位在全局变量所在行，则不进行后续处理
+                            if (!matchMap[lineNumber]) return
+                        }
+                        Object.keys(matchMap).forEach(idx => {
+                            let start = 0 // 兼容一行中有多个相同的变量
+                            matchMap[idx].forEach(variable => {
+                                const startNumber = rows[idx - 1].indexOf(variable, start) + 1
+                                const endNumber = startNumber + variable.length
+                                start = endNumber
+                                const decorations = monacoInstance.deltaDecorations(
+                                    [],
+                                    [
+                                        {
+                                            range: new monaco.Range(idx, startNumber, idx, endNumber),
+                                            options: {
+                                                inlineClassName: 'variable-tag'
+                                            }
+                                        }
+                                    ]
+                                )
+                                if (idx in this.decorationsMap) {
+                                    this.decorationsMap[idx].push(decorations)
+                                } else {
+                                    this.decorationsMap[idx] = [decorations]
+                                }
+                            })
+                        })
+                    } else if (this.decorationsMap[lineNumber]) {
+                        this.decorationsMap[lineNumber].forEach(decorations => {
+                            monacoInstance.deltaDecorations(
+                                [...decorations],
+                                []
+                            )
+                        })
+                        this.decorationsMap = {}
+                    }
+                }
             },
             onLanguageChange () {
                 this.refreshEditor()
@@ -126,6 +236,19 @@
 </script>
 <style lang="scss" scoped>
     .tag-code-editor {
+        .bk-alert {
+            .bk-alert-title {
+                .strong {
+                    color: #ff9c01;
+                }
+                .num {
+                    font-weight: 700;
+                }
+            }
+            /deep/.close-text {
+                color: #3a84ff;
+            }
+        }
         .control-header {
             width: 100%;
             height: 34px;
@@ -136,6 +259,11 @@
         }
         .code-editor-wrap {
             position: relative;
+            /deep/.view-lines .variable-tag {
+                display: inline-block;
+                color: #ffe8c3;
+                background: #76654b;
+            }
         }
     }
 </style>
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index a25f04a413..44cffd3dd4 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1749,7 +1749,9 @@ const cn = {
     '添加默认方案成功': '添加默认方案成功',
     '取消默认方案成功': '取消默认方案成功',
     '确认删除执行方案【n】?': '确认删除执行方案【{n}】？',
-    '取消设为默认方案': '取消设为默认方案'
+    '取消设为默认方案': '取消设为默认方案',
+    'tagCodeEditorTips': '脚本内容{0}全局变量。检测到疑似 {1} 处引用，建议使用脚本参数传入。',
+    '不再支持': '不再支持'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index bade580faf..e8102a661c 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1782,7 +1782,10 @@ const en = {
     '添加默认方案成功': 'Default Node-Group Added',
     '取消默认方案成功': 'Default Node-Group Cancelled',
     '确认删除执行方案【n】?': 'Confirm to delete node-group [ {n} ] ?',
-    '取消设为默认方案': 'Unset as Default'
+    '取消设为默认方案': 'Unset as Default',
+    'tagCodeEditorTips': 'Script content {0} global variable. A suspected reference to {1} was detected, and it is recommended to use script parameters to pass in.',
+    '不再支持': 'no supported',
+    '添加收藏': 'Collection'
 }
 
 export default en

From 9303dabc703b3cf465d19d2518cff46bc01718b7 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 31 Jul 2023 16:18:04 +0800
Subject: [PATCH 009/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=91=A8=E6=9C=9F=E4=BB=BB=E5=8A=A1=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E4=BC=9A=E5=8F=98=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/apis/drf/viewsets/periodic_task.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gcloud/core/apis/drf/viewsets/periodic_task.py b/gcloud/core/apis/drf/viewsets/periodic_task.py
index 6901732490..f13f189457 100644
--- a/gcloud/core/apis/drf/viewsets/periodic_task.py
+++ b/gcloud/core/apis/drf/viewsets/periodic_task.py
@@ -44,10 +44,7 @@
 from gcloud.core.apis.drf.viewsets.base import GcloudModelViewSet
 from gcloud.core.models import Project
 from gcloud.iam_auth import IAMMeta, res_factory
-from gcloud.iam_auth.utils import (
-    get_common_flow_allowed_actions_for_user,
-    get_flow_allowed_actions_for_user,
-)
+from gcloud.iam_auth.utils import get_common_flow_allowed_actions_for_user, get_flow_allowed_actions_for_user
 from gcloud.periodictask.models import PeriodicTask
 from gcloud.tasktmpl3.models import TaskTemplate
 from gcloud.template_base.utils import replace_template_id
@@ -270,6 +267,6 @@ def partial_update(self, request, *args, **kwargs):
                 instance.task.name = serializer.validated_data["name"]
                 instance.task.save(update_fields=["name"])
             instance.editor = request.user.username
-            instance.save(update_fields=["editor"])
+            instance.save(update_fields=["editor", "edit_time"])
 
         return Response(PeriodicTaskReadOnlySerializer(instance=instance).data)

From 8185ce675e23ad19ab278712e558071da3b79980 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 31 Jul 2023 21:32:35 +0800
Subject: [PATCH 010/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E7=BB=88=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E7=88=B6=E6=B5=81=E7=A8=8B=E5=AF=B9=E5=BA=94=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/signals/handlers.py | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/gcloud/taskflow3/signals/handlers.py b/gcloud/taskflow3/signals/handlers.py
index 1cac70504d..1290a4cd1b 100644
--- a/gcloud/taskflow3/signals/handlers.py
+++ b/gcloud/taskflow3/signals/handlers.py
@@ -11,38 +11,36 @@
 specific language governing permissions and limitations under the License.
 """
 
-import logging
 import datetime
+import logging
 
+from bamboo_engine import states as bamboo_engine_states
+from bk_monitor_report.reporter import MonitorReporter
 from django.conf import settings
 from django.dispatch import receiver
-
-from bamboo_engine import states as bamboo_engine_states
-from pipeline.engine.signals import activity_failed
 from pipeline.core.pipeline import Pipeline
-from pipeline.models import PipelineInstance
-from pipeline.signals import post_pipeline_finish, post_pipeline_revoke
+from pipeline.engine.signals import activity_failed, pipeline_end, pipeline_revoke
 from pipeline.eri.signals import (
-    post_set_state,
     execute_interrupt,
-    schedule_interrupt,
+    post_set_state,
     pre_service_execute,
     pre_service_schedule,
+    schedule_interrupt,
 )
-from pipeline.engine.signals import pipeline_end, pipeline_revoke
-from bk_monitor_report.reporter import MonitorReporter
+from pipeline.models import PipelineInstance
+from pipeline.signals import post_pipeline_finish, post_pipeline_revoke
 
 import env
+from gcloud.shortcuts.message import ATOM_FAILED, TASK_FINISHED
+from gcloud.taskflow3.celery.tasks import auto_retry_node, send_taskflow_message, task_callback
 from gcloud.taskflow3.models import (
-    TaskFlowInstance,
     AutoRetryNodeStrategy,
     EngineConfig,
-    TimeoutNodeConfig,
     TaskCallBackRecord,
+    TaskFlowInstance,
+    TimeoutNodeConfig,
 )
 from gcloud.taskflow3.signals import taskflow_finished, taskflow_revoked
-from gcloud.taskflow3.celery.tasks import send_taskflow_message, auto_retry_node, task_callback
-from gcloud.shortcuts.message import ATOM_FAILED, TASK_FINISHED
 
 logger = logging.getLogger("celery")
 
@@ -65,6 +63,9 @@ def _finish_taskflow_and_send_signal(instance_id, sig, task_success=False):
         except Exception as e:
             logger.exception("send_taskflow_message[taskflow_id=%s] task delay error: %s" % (task_id, e))
 
+    if sig is taskflow_revoked:
+        _check_and_callback(task_id, task_success=False)
+
 
 def _send_node_fail_message(node_id, pipeline_id):
     try:

From 2706049d16347e71e292576e021dd062c88f5e3f Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 2 Aug 2023 09:31:20 +0800
Subject: [PATCH 011/112] =?UTF-8?q?optimization:=20=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AD=9B=E9=80=89=E9=9D=9E=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/package.json b/frontend/desktop/package.json
index 235e329565..c89d1b8536 100644
--- a/frontend/desktop/package.json
+++ b/frontend/desktop/package.json
@@ -18,7 +18,7 @@
     "ajv": "^6.10.2",
     "art-template": "^4.13.0",
     "axios": "^0.18.0",
-    "bk-magic-vue": "2.5.2",
+    "bk-magic-vue": "2.5.7",
     "cron-parser-custom": "^2.13.0",
     "dom-to-image": "^2.6.0",
     "element-ui": "^2.4.1",

From 3411b152a4dcf2bccd024bd418a29ee124aa066f Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 2 Aug 2023 10:19:10 +0800
Subject: [PATCH 012/112] =?UTF-8?q?optimization:=20=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       |  1 -
 .../src/pages/appmaker/AppEditDialog.vue      |  9 +++--
 frontend/desktop/src/pages/project/index.vue  |  9 +++--
 .../task/ClockedList/EditClockedTask.vue      | 10 ++++--
 .../PeriodicList/ModifyPeriodicDialog.vue     | 10 ++++--
 .../pages/task/TaskCreate/EditTaskScheme.vue  |  5 +++
 .../pages/task/TaskCreate/TaskParamFill.vue   |  5 ++-
 .../task/TaskExecute/InjectVariableDialog.vue |  8 ++++-
 .../TaskExecute/TaskFunctionalization.vue     |  5 ++-
 .../task/TaskExecute/TaskOperationHeader.vue  |  2 +-
 .../pages/task/TaskList/TaskCloneDialog.vue   |  5 ++-
 .../TemplateEdit/NodeConfig/BasicInfo.vue     | 33 ++++++++++++++++---
 .../TemplateEdit/NodeConfig/OutputParams.vue  | 15 +++++++--
 .../NodeConfig/ReuseVarDialog.vue             | 17 ++++++++--
 .../template/TemplateEdit/TemplateHeader.vue  |  7 ++--
 .../TabGlobalVariables/VariableEdit.vue       |  5 ++-
 .../TemplateSetting/TabTemplateConfig.vue     | 10 +++++-
 .../TemplateSetting/TabTemplateSnapshoot.vue  |  3 ++
 18 files changed, 133 insertions(+), 26 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index ea9d1aa3d0..1f9e17380d 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -463,7 +463,6 @@
         padding: 0 10px;
         border: 1px solid #c4c6cc;
         border-radius: 2px;
-        margin-top: 20px;
         &.input-focus {
             border-color: #3a84ff;
         }
diff --git a/frontend/desktop/src/pages/appmaker/AppEditDialog.vue b/frontend/desktop/src/pages/appmaker/AppEditDialog.vue
index 2c9d52ad7c..b622612038 100644
--- a/frontend/desktop/src/pages/appmaker/AppEditDialog.vue
+++ b/frontend/desktop/src/pages/appmaker/AppEditDialog.vue
@@ -65,7 +65,9 @@
                         v-validate.disable="appNameRule"
                         name="appName"
                         class="ui-form-item"
-                        :clearable="true">
+                        :clearable="true"
+                        :maxlength="stringLength.APP_NAME_MAX_LENGTH"
+                        :show-word-limit="true">
                     </bk-input>
                     <span v-show="veeErrors.has('appName')" class="common-error-tip error-msg">{{ veeErrors.first('appName') }}</span>
                 </div>
@@ -186,7 +188,9 @@
                         name="appDesc"
                         type="textarea"
                         v-model="appData.appDesc"
-                        v-validate="appDescRule">
+                        v-validate="appDescRule"
+                        :maxlength="stringLength.APP_DESCRIPTION_MAX_LENGTH"
+                        :show-word-limit="true">
                     </bk-input>
                     <span v-show="veeErrors.has('appDesc')" class="common-error-tip error-msg">{{ veeErrors.first('appDesc') }}</span>
                 </div>
@@ -261,6 +265,7 @@
                 logoUrl: '',
                 isLogoLoadingError: false,
                 isLogoEmpty: !!this.isCreateNewApp,
+                stringLength: STRING_LENGTH,
                 appNameRule: {
                     required: true,
                     max: STRING_LENGTH.APP_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/project/index.vue b/frontend/desktop/src/pages/project/index.vue
index cf5e30521b..caae379eef 100644
--- a/frontend/desktop/src/pages/project/index.vue
+++ b/frontend/desktop/src/pages/project/index.vue
@@ -108,7 +108,9 @@
                             :disabled="dialogType === 'edit'"
                             v-model="projectDetail.name"
                             data-vv-validate-on=" "
-                            v-validate="nameRule">
+                            v-validate="nameRule"
+                            :maxlength="stringLength.PROJECT_NAME_MAX_LENGTH"
+                            :show-word-limit="true">
                         </bk-input>
                         <span v-show="veeErrors.has('projectName')" class="common-error-tip error-msg">{{ veeErrors.first('projectName') }}</span>
                     </div>
@@ -139,7 +141,9 @@
                             rows="5"
                             name="projectDesc"
                             data-vv-validate-on=" "
-                            v-validate="descRule">
+                            v-validate="descRule"
+                            :maxlength="stringLength.PROJECT_DESC_LENGTH"
+                            :show-word-limit="true">
                         </textarea>
                         <span v-show="veeErrors.has('projectDesc')" class="common-error-tip error-msg">{{ veeErrors.first('projectDesc') }}</span>
                     </div>
@@ -274,6 +278,7 @@
                     desc: ''
                 },
                 timeZoneList: getTimeZoneList(),
+                stringLength: STRING_LENGTH,
                 nameRule: {
                     required: true,
                     max: STRING_LENGTH.PROJECT_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/task/ClockedList/EditClockedTask.vue b/frontend/desktop/src/pages/task/ClockedList/EditClockedTask.vue
index d34aa424b7..51c8d0d08f 100644
--- a/frontend/desktop/src/pages/task/ClockedList/EditClockedTask.vue
+++ b/frontend/desktop/src/pages/task/ClockedList/EditClockedTask.vue
@@ -128,7 +128,12 @@
                         </bk-form-item>
                         <p class="title">{{$t('任务信息')}}</p>
                         <bk-form-item :label="$t('计划名称')" :required="true" property="taskName" data-test-id="clockedEdit_form_taskName">
-                            <bk-input :clearable="true" v-model="formData.task_name"></bk-input>
+                            <bk-input
+                                :clearable="true"
+                                v-model="formData.task_name"
+                                :maxlength="stringLength.TASK_NAME_MAX_LENGTH"
+                                :show-word-limit="true">
+                            </bk-input>
                         </bk-form-item>
                         <bk-form-item :label="$t('启动时间')" :required="true" property="startTime" data-test-id="clockedEdit_form_startTime">
                             <bk-date-picker
@@ -264,6 +269,7 @@
                         return date.getTime() + 86400000 < Date.now()
                     }
                 },
+                stringLength: STRING_LENGTH,
                 taskNameRule: {
                     required: true,
                     max: STRING_LENGTH.TASK_NAME_MAX_LENGTH,
@@ -288,7 +294,7 @@
                         },
                         {
                             validator: (val) => {
-                                return STRING_LENGTH.TASK_NAME_MAX_LENGTH > this.formData.task_name.length
+                                return STRING_LENGTH.TASK_NAME_MAX_LENGTH >= this.formData.task_name.length
                             },
                             message: i18n.t('任务名称不能超过') + STRING_LENGTH.TASK_NAME_MAX_LENGTH + i18n.t('个字符'),
                             trigger: 'change'
diff --git a/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue b/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue
index af535d50b8..9dfbe92f4e 100644
--- a/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue
+++ b/frontend/desktop/src/pages/task/PeriodicList/ModifyPeriodicDialog.vue
@@ -149,7 +149,12 @@
                         </bk-form-item>
                         <p class="title">{{$t('任务信息')}}</p>
                         <bk-form-item :label="$t('任务名称')" :required="true" property="taskName" data-test-id="periodicEdit_form_taskName">
-                            <bk-input :clearable="true" v-model="formData.name"></bk-input>
+                            <bk-input
+                                :clearable="true"
+                                v-model="formData.name"
+                                :maxlength="stringLength.TASK_NAME_MAX_LENGTH"
+                                :show-word-limit="true">
+                            </bk-input>
                         </bk-form-item>
                         <bk-form-item :label="$t('周期表达式')" :required="true" property="loop" data-test-id="periodicEdit_form_loop">
                             <CronRuleSelect
@@ -296,6 +301,7 @@
                     required: true,
                     regex: PERIODIC_REG
                 },
+                stringLength: STRING_LENGTH,
                 rules: {
                     taskName: [
                         {
@@ -315,7 +321,7 @@
                         },
                         {
                             validator: (val) => {
-                                return STRING_LENGTH.TASK_NAME_MAX_LENGTH > this.formData.name.length
+                                return STRING_LENGTH.TASK_NAME_MAX_LENGTH >= this.formData.name.length
                             },
                             message: i18n.t('任务名称不能超过') + STRING_LENGTH.TASK_NAME_MAX_LENGTH + i18n.t('个字符'),
                             trigger: 'change'
diff --git a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
index e034004758..b18ad2a8b4 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
@@ -58,6 +58,8 @@
                             class="bk-input-inline"
                             :clearable="true"
                             :placeholder="$t('方案名称')"
+                            :maxlength="stringLength.SCHEME_NAME_MAX_LENGTH"
+                            :show-word-limit="true"
                             @keyup.enter.native="onAddScheme">
                         </bk-input>
                         <div class="icon-btn-wrapper">
@@ -89,6 +91,8 @@
                                 class="bk-input-inline"
                                 :clearable="true"
                                 :placeholder="$t('方案名称')"
+                                :maxlength="stringLength.SCHEME_NAME_MAX_LENGTH"
+                                :show-word-limit="true"
                                 @keyup.enter.native="onUpdateScheme(item)">
                             </bk-input>
                             <div class="icon-btn-wrapper">
@@ -211,6 +215,7 @@
                 showPanel: true,
                 nameEditing: false,
                 schemeName: '',
+                stringLength: STRING_LENGTH,
                 schemeNameRule: {
                     required: true,
                     max: STRING_LENGTH.SCHEME_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskParamFill.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskParamFill.vue
index 39d6b4772e..2dcc41d00b 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskParamFill.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskParamFill.vue
@@ -25,7 +25,9 @@
                                 v-validate="taskNameRule"
                                 class="step-form-content-size"
                                 data-test-id="createTask_form_taskName"
-                                name="taskName">
+                                name="taskName"
+                                :maxlength="stringLength.TASK_NAME_MAX_LENGTH"
+                                :show-word-limit="true">
                             </bk-input>
                             <span v-show="veeErrors.has('taskName')" class="common-error-tip error-msg">{{ veeErrors.first('taskName') }}</span>
                         </div>
@@ -145,6 +147,7 @@
                 appmakerTaskName: '',
                 pipelineData: {},
                 unreferenced: {},
+                stringLength: STRING_LENGTH,
                 taskNameRule: {
                     required: true,
                     max: STRING_LENGTH.TASK_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/task/TaskExecute/InjectVariableDialog.vue b/frontend/desktop/src/pages/task/TaskExecute/InjectVariableDialog.vue
index 17cb48e4b7..af6b6e0dc6 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/InjectVariableDialog.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/InjectVariableDialog.vue
@@ -17,7 +17,12 @@
                 <li v-for="(variable, index) in variableList" :key="index" class="variable-item">
                     <bk-form class="key-form" :model="variable" :rules="variable.rules" ref="variableForm">
                         <bk-form-item :required="true" property="key">
-                            <bk-input v-model="variable.key" :placeholder="$t('请输入变量的KEY,如${KEY}')"></bk-input>
+                            <bk-input
+                                v-model="variable.key"
+                                :placeholder="$t('请输入变量的KEY,如${KEY}')"
+                                :maxlength="stringLength.VARIABLE_KEY_MAX_LENGTH"
+                                :show-word-limit="true">
+                            </bk-input>
                         </bk-form-item>
                         <bk-form-item :required="true" property="value" ref="variableValue">
                             <bk-input
@@ -58,6 +63,7 @@
         data () {
             return {
                 variableList: [],
+                stringLength: STRING_LENGTH,
                 rules: {
                     key: [
                         {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskFunctionalization.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskFunctionalization.vue
index 2f49c99257..20a93470eb 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskFunctionalization.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskFunctionalization.vue
@@ -32,7 +32,9 @@
                             class="task-name"
                             name="taskName"
                             v-model="name"
-                            v-validate="taskNameRule">
+                            v-validate="taskNameRule"
+                            :maxlength="stringLength.TASK_NAME_MAX_LENGTH"
+                            :show-word-limit="true">
                         </bk-input>
                         <span class="common-error-tip error-msg">{{ veeErrors.first('taskName') }}</span>
                     </div>
@@ -163,6 +165,7 @@
                 nodeSwitching: false,
                 pipelineData: JSON.parse(this.instanceFlow),
                 previewData: JSON.parse(this.instanceFlow),
+                stringLength: STRING_LENGTH,
                 taskNameRule: {
                     required: true,
                     max: STRING_LENGTH.TASK_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue
index 56c63c97db..9fc63ea700 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperationHeader.vue
@@ -256,7 +256,7 @@
             font-size: 14px;
             overflow: hidden;
             &.name-ellipsis {
-                max-width: 190px;
+                max-width: 700px;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
diff --git a/frontend/desktop/src/pages/task/TaskList/TaskCloneDialog.vue b/frontend/desktop/src/pages/task/TaskList/TaskCloneDialog.vue
index 292de72db2..9cd092a886 100644
--- a/frontend/desktop/src/pages/task/TaskList/TaskCloneDialog.vue
+++ b/frontend/desktop/src/pages/task/TaskList/TaskCloneDialog.vue
@@ -28,7 +28,9 @@
                     <bk-input
                         name="taskName"
                         v-model="name"
-                        v-validate="taskNameRule">
+                        v-validate="taskNameRule"
+                        :maxlength="stringLength.TASK_NAME_MAX_LENGTH"
+                        :show-word-limit="true">
                     </bk-input>
                     <span v-if="veeErrors.has('taskName')" class="common-error-tip error-msg">{{ veeErrors.first('taskName') }}</span>
                 </div>
@@ -45,6 +47,7 @@
         data () {
             return {
                 name: 'copy' + this.taskName.slice(0, STRING_LENGTH.TASK_NAME_MAX_LENGTH - 4),
+                stringLength: STRING_LENGTH,
                 taskNameRule: {
                     required: true,
                     max: STRING_LENGTH.TASK_NAME_MAX_LENGTH,
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
index 05ec54aae5..3219bda3f8 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
@@ -44,10 +44,22 @@
                 </bk-select>
             </bk-form-item>
             <bk-form-item :label="$t('节点名称')" data-test-id="templateEdit_form_nodeName" :required="true" property="nodeName">
-                <bk-input :readonly="isViewMode" v-model="formData.nodeName" @change="updateData"></bk-input>
+                <bk-input
+                    :readonly="isViewMode"
+                    v-model="formData.nodeName"
+                    :maxlength="stringLength.TEMPLATE_NODE_NAME_MAX_LENGTH"
+                    :show-word-limit="true"
+                    @change="updateData">
+                </bk-input>
             </bk-form-item>
             <bk-form-item :label="$t('步骤名称')" data-test-id="templateEdit_form_stageName" property="stageName">
-                <bk-input :readonly="isViewMode" v-model="formData.stageName" @change="updateData"></bk-input>
+                <bk-input
+                    :readonly="isViewMode"
+                    v-model="formData.stageName"
+                    :maxlength="stringLength.STAGE_NAME_MAX_LENGTH"
+                    :show-word-limit="true"
+                    @change="updateData">
+                </bk-input>
             </bk-form-item>
             <!-- <bk-form-item :label="$t('节点标签')" data-test-id="templateEdit_form_nodeLabel" property="label">
                 <bk-search-select
@@ -229,10 +241,22 @@
                 </p>
             </bk-form-item>
             <bk-form-item :label="$t('节点名称')" :required="true" property="nodeName">
-                <bk-input :readonly="isViewMode" v-model="formData.nodeName" @change="updateData"></bk-input>
+                <bk-input
+                    :readonly="isViewMode"
+                    v-model="formData.nodeName"
+                    :maxlength="stringLength.TEMPLATE_NODE_NAME_MAX_LENGTH"
+                    :show-word-limit="true"
+                    @change="updateData">
+                </bk-input>
             </bk-form-item>
             <bk-form-item :label="$t('步骤名称')" property="stageName">
-                <bk-input :readonly="isViewMode" v-model="formData.stageName" @change="updateData"></bk-input>
+                <bk-input
+                    :readonly="isViewMode"
+                    v-model="formData.stageName"
+                    :maxlength="stringLength.STAGE_NAME_MAX_LENGTH"
+                    :show-word-limit="true"
+                    @change="updateData">
+                </bk-input>
             </bk-form-item>
             <bk-form-item>
                 <div slot="tip" class="bk-label slot-bk-label">
@@ -456,6 +480,7 @@
                 maxNodeExecuteTimeout: window.MAX_NODE_EXECUTE_TIMEOUT,
                 schemeList: [],
                 schemeListLoading: true,
+                stringLength: STRING_LENGTH,
                 pluginRules: {
                     plugin: [
                         {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index e8a83f1451..621cae9fd2 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -67,10 +67,20 @@
                     :rules="rules">
                     <template>
                         <bk-form-item :label="$t('变量名称')" property="name" :required="true">
-                            <bk-input name="variableName" v-model="formData.name"></bk-input>
+                            <bk-input
+                                name="variableName"
+                                v-model="formData.name"
+                                :maxlength="stringLength.VARIABLE_NAME_MAX_LENGTH"
+                                :show-word-limit="true">
+                            </bk-input>
                         </bk-form-item>
                         <bk-form-item :label="$t('变量KEY')" property="key" :required="true">
-                            <bk-input name="variableKey" v-model="formData.key"></bk-input>
+                            <bk-input
+                                name="variableKey"
+                                v-model="formData.key"
+                                :maxlength="stringLength.VARIABLE_KEY_MAX_LENGTH"
+                                :show-word-limit="true">
+                            </bk-input>
                         </bk-form-item>
                     </template>
                 </bk-form>
@@ -105,6 +115,7 @@
                 isShow: false,
                 formData: {},
                 selectIndex: '',
+                stringLength: STRING_LENGTH,
                 rules: {
                     name: [
                         {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
index e2e6cdeffd..8e3460bbc8 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
@@ -62,13 +62,25 @@
                         property="name"
                         :label="$t('变量名称')"
                         :required="true">
-                        <bk-input name="variableName" :disabled="createMethod === 'autoCreate'" v-model="formData.name"></bk-input>
+                        <bk-input
+                            name="variableName"
+                            :disabled="createMethod === 'autoCreate'"
+                            v-model="formData.name"
+                            :maxlength="stringLength.VARIABLE_NAME_MAX_LENGTH"
+                            :show-word-limit="true">
+                        </bk-input>
                     </bk-form-item>
                     <bk-form-item
                         property="key"
                         :label="$t('变量KEY')"
                         :required="true">
-                        <bk-input name="variableKey" :disabled="createMethod === 'autoCreate'" v-model="formData.key"></bk-input>
+                        <bk-input
+                            name="variableKey"
+                            :disabled="createMethod === 'autoCreate'"
+                            v-model="formData.key"
+                            :maxlength="stringLength.VARIABLE_KEY_MAX_LENGTH"
+                            :show-word-limit="true">
+                        </bk-input>
                     </bk-form-item>
                 </template>
             </bk-form>
@@ -113,6 +125,7 @@
                     name: this.newVarKeyName.name,
                     key: this.newVarKeyName.key
                 },
+                stringLength: STRING_LENGTH,
                 rules: {
                     name: [
                         {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
index dd794f1728..298a7d5865 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
@@ -504,10 +504,14 @@
                 cursor: pointer;
             }
             .title {
+                flex-shrink: 0;
                 font-size: 14px;
                 color: #313238;
             }
         }
+        .expand {
+            flex-shrink: 0;
+        }
         .header-right-area {
             display: flex;
             align-items: center;
@@ -515,7 +519,6 @@
         }
         .template-name {
             margin: 0 0 0 20px;
-            max-width: 300px;
             font-size: 14px;
             font-weight: normal;
             overflow: hidden;
@@ -548,7 +551,7 @@
         }
         .setting-tab-wrap {
             display: inline-block;
-            margin-right: 20px;
+            margin: 0 20px;
             padding-right: 24px;
             height: 32px;
             line-height: 32px;
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
index 8b70c6a789..ad12003a5e 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
@@ -11,7 +11,9 @@
                             name="variableName"
                             v-model="theEditingData.name"
                             v-validate="variableNameRule"
-                            :readonly="isViewMode || isInternalVal">
+                            :readonly="isViewMode || isInternalVal"
+                            :maxlength="stringLength.VARIABLE_NAME_MAX_LENGTH"
+                            :show-word-limit="true">
                         </bk-input>
                         <span v-show="veeErrors.has('variableName')" class="common-error-tip error-msg">{{ veeErrors.first('variableName') }}</span>
                     </div>
@@ -278,6 +280,7 @@
                 inputRegexp: '', // input，textarea类型正则
                 atomConfigLoading: false,
                 atomTypeKey: '',
+                stringLength: STRING_LENGTH,
                 // 变量名称校验规则
                 variableNameRule: {
                     required: true,
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateConfig.vue
index 6fcf6a4f88..f8eadc168e 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateConfig.vue
@@ -26,7 +26,14 @@
                 <section class="form-section">
                     <h4>{{ $t('基础') }}</h4>
                     <bk-form-item :property="'name'" :label="$t('流程名称')" :required="true" data-test-id="tabTemplateConfig_form_name">
-                        <bk-input :readonly="isViewMode" ref="nameInput" v-model.trim="formData.name" :placeholder="$t('请输入流程模板名称')"></bk-input>
+                        <bk-input
+                            :readonly="isViewMode"
+                            ref="nameInput"
+                            v-model.trim="formData.name"
+                            :placeholder="$t('请输入流程模板名称')"
+                            :maxlength="stringLength.TEMPLATE_NAME_MAX_LENGTH"
+                            :show-word-limit="true">
+                        </bk-input>
                     </bk-form-item>
                     <bk-form-item v-if="!common" :label="$t('标签')" data-test-id="tabTemplateConfig_form_label">
                         <bk-select
@@ -253,6 +260,7 @@
                     labels: template_labels,
                     defaultFlowType: default_flow_type
                 },
+                stringLength: STRING_LENGTH,
                 rules: {
                     name: [
                         {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateSnapshoot.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateSnapshoot.vue
index 6bb48dc8f4..3e12db2d32 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateSnapshoot.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabTemplateSnapshoot.vue
@@ -65,6 +65,8 @@
                                     class="snapshoot-name-input"
                                     :name="'snapshootName' + item.timestamp"
                                     :placeholder="$t('名称')"
+                                    :maxlength="stringLength.DRAFT_NAME_MAX_LENGTH"
+                                    :show-word-limit="true"
                                     @blur="onSaveName(item)"
                                     @enter="onSaveName(item)" />
                                 <span v-else>{{item.name}}</span>
@@ -118,6 +120,7 @@
                     key: null,
                     name: ''
                 },
+                stringLength: STRING_LENGTH,
                 nameRule: {
                     required: true,
                     max: STRING_LENGTH.DRAFT_NAME_MAX_LENGTH,

From 0c06510b88e0e168279ec985eed19496adc9f324 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 7 Aug 2023 21:00:02 +0800
Subject: [PATCH 013/112] =?UTF-8?q?optimization:=20=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=80=81=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=90=86=E4=BA=BA=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E7=88=B6=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/signals/handlers.py | 37 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gcloud/taskflow3/signals/handlers.py b/gcloud/taskflow3/signals/handlers.py
index 1290a4cd1b..bcbd5e1e01 100644
--- a/gcloud/taskflow3/signals/handlers.py
+++ b/gcloud/taskflow3/signals/handlers.py
@@ -14,23 +14,12 @@
 import datetime
 import logging
 
-from bamboo_engine import states as bamboo_engine_states
 from bk_monitor_report.reporter import MonitorReporter
 from django.conf import settings
 from django.dispatch import receiver
-from pipeline.core.pipeline import Pipeline
-from pipeline.engine.signals import activity_failed, pipeline_end, pipeline_revoke
-from pipeline.eri.signals import (
-    execute_interrupt,
-    post_set_state,
-    pre_service_execute,
-    pre_service_schedule,
-    schedule_interrupt,
-)
-from pipeline.models import PipelineInstance
-from pipeline.signals import post_pipeline_finish, post_pipeline_revoke
 
 import env
+from bamboo_engine import states as bamboo_engine_states
 from gcloud.shortcuts.message import ATOM_FAILED, TASK_FINISHED
 from gcloud.taskflow3.celery.tasks import auto_retry_node, send_taskflow_message, task_callback
 from gcloud.taskflow3.models import (
@@ -41,6 +30,17 @@
     TimeoutNodeConfig,
 )
 from gcloud.taskflow3.signals import taskflow_finished, taskflow_revoked
+from pipeline.core.pipeline import Pipeline
+from pipeline.engine.signals import activity_failed, pipeline_end, pipeline_revoke
+from pipeline.eri.signals import (
+    execute_interrupt,
+    post_set_state,
+    pre_service_execute,
+    pre_service_schedule,
+    schedule_interrupt,
+)
+from pipeline.models import PipelineInstance
+from pipeline.signals import post_pipeline_finish, post_pipeline_revoke
 
 logger = logging.getLogger("celery")
 
@@ -76,12 +76,13 @@ def _send_node_fail_message(node_id, pipeline_id):
 
     _check_and_callback(taskflow.id, task_success=False)
 
-    try:
-        activity = taskflow.get_act_web_info(node_id)
-        node_name = activity["name"] if activity else node_id
-        send_taskflow_message.delay(task_id=taskflow.id, msg_type=ATOM_FAILED, node_name=node_name)
-    except Exception as e:
-        logger.exception("pipeline_fail_handler[taskflow_id=%s] task delay error: %s" % (taskflow.id, e))
+    if taskflow.is_child_taskflow is False:
+        try:
+            activity = taskflow.get_act_web_info(node_id)
+            node_name = activity["name"] if activity else node_id
+            send_taskflow_message.delay(task_id=taskflow.id, msg_type=ATOM_FAILED, node_name=node_name)
+        except Exception as e:
+            logger.exception("pipeline_fail_handler[taskflow_id=%s] task delay error: %s" % (taskflow.id, e))
 
 
 def _check_and_callback(taskflow_id, *args, **kwargs):

From 30f29496e44bc18a3eb670dec8d9260a7daa9416 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 9 Aug 2023 11:25:53 +0800
Subject: [PATCH 014/112] =?UTF-8?q?feature:=20=E8=8A=82=E7=82=B9=E6=A0=91?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84&=E5=AD=90=E6=B5=81=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=9F=A5=E7=9C=8B=E4=B8=8E=E6=93=8D=E4=BD=9C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/assets/fonts/bksops-icon.eot  | Bin 38508 -> 39840 bytes
 .../desktop/src/assets/fonts/bksops-icon.svg  |  21 +
 .../desktop/src/assets/fonts/bksops-icon.ttf  | Bin 38340 -> 39672 bytes
 .../desktop/src/assets/fonts/bksops-icon.woff | Bin 22656 -> 23252 bytes
 frontend/desktop/src/assets/js/flow.js        |   2 +-
 .../TemplateCanvas/NodeTemplate/Subflow.vue   |   2 +-
 frontend/desktop/src/config/i18n/cn.js        |   4 +-
 frontend/desktop/src/config/i18n/en.js        |   4 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 826 ++++++++++++------
 .../ExecuteInfo/ExecuteInfoForm.vue           |   2 +-
 .../TaskExecute/ExecuteInfo/ExecuteRecord.vue |  73 +-
 .../TaskExecute/ExecuteInfo/InputParams.vue   |  11 +-
 .../src/pages/task/TaskExecute/NodeTree.vue   | 593 +------------
 .../pages/task/TaskExecute/NodeTreeItem.vue   | 306 +++++++
 .../pages/task/TaskExecute/TaskOperation.vue  | 736 +++++++++-------
 frontend/desktop/src/scss/iconfont.scss       |  21 +
 16 files changed, 1381 insertions(+), 1220 deletions(-)
 create mode 100644 frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.eot b/frontend/desktop/src/assets/fonts/bksops-icon.eot
index c453f074e49b268e48bb6fbeb58db9cc2c7aa36d..4c0606fe87551f30e43741d3c61c77146f3a97b1 100644
GIT binary patch
delta 1666
zcma)5T})eL7=GWca86~?($dluYUyc#Q`ji&>EGx^=_0Ttpa#*Y@nRxBLZqc^Gufu0
z#%vmOOCh}&(adl`qApx0<!{pqV$4F2ge~zxcO!5;%@U(CWIgzv7KF`^t;zE}@Asbf
z@A<y3cPH8S9OK462l(f+Q7({|xV5w~8u>JF5&+)=fD>KO&UjwZsRPKH26(#nt$}mB
zmePp^0R0HS@K|3@XScZc%*PbFN(l6kqoA3)LH75AioWQXvum51*Qwsm0Bm(&u&eWh
z^4d}WorQd-qMc{sxD0=jy`SQ3vCe4Eh`O|IAHb-S5-!FEPoFUqZ2Sq3`UZeMmg+`F
z<vbt-6E>D^B~EIO`~~~+$U!sQk6O1mHHl`NPu;|Ew$9Rh>=%|AXBIbo&L^k{2MLs?
z`XXBn*cf@0!Uu^9vi>|akc#I=lmb)vW~Q5hZy^oSFaxtNM-y<VcJ=wxadq;kMaolt
zH`1%>UiC|B4*(Rv6mcd8%7ryK2dV;Vn>kQDSf@}0R2kN31_jgu)>#fpw{(-P8;cqS
z8ZI@ghugw88`X_%<o!xte?CDnHs4VF#O{L*D!{2o!x9sg7<lCDB3Ai=7?5~Qi=5(>
z8d<<cUVE`o@K+Mp>wF;ws;cB!XHT^}D~i}E_6{3_J6`5Nt?N+T(G|B_zUQi6k&`$i
zC)sVjP+oHOIw`gaTb+rXYHY2H8-+XWL$&ffk0-L?3b{}#$qk{<l~5>qS#+YO*hMI!
zjl*Avey?OSh=NhD1&i3rWAY5PPW-SWU%(GgkBlGw`r7c9lla;L<dk!v``RUtZt)>`
zi9Pg{BX8nGUJQys(-UjFP#ud^$D%c{SWWa%p?l~|NPpBsDJhqieN_)ld*qRM_ZZh?
zMUw`37mDGmLEA6}UHI716WjM=?igfjup_sI+8ApKW!ERvA^rGYa>rn3JDEysU%^#X
zl6?n0I10~`B*BHgKv1w^!ke8_v~#?mK_h2nCh{6+=RyZ5A|Vn5hS680lB}p<F7*2X
zUbMR~%&cfMa1M4`?y}d_+3_Q-&+3UFMm$!ZRvv2a$Fe|+h*v8-o(lQg?vI#k?|+-u
zTMD^^SrGKL{h38&le4i0r6!4$Sux_Ka@Ml^_>1DP`f^0~aS!fxPYj{0*d~~HjYVg+
zWlrqaifVd&o0nAMY#Fpr3>GM-f7by;yPY%Y3?*Jc3ix#i(k18wdTM@$(d$2e^@ye*
zSq|f2vQ_VAK%>`dRLbhgMA$-0?d8ZqN3Hx}j@hzavlEg5ws5-ka>qhMPG{+{L!@4L
zPV?$cyIo`azqP!O>$$O4Yx(zF?_YDhA^qE>YYgYppCsQz4W@A#XK)tha2~Ix?~c5i
gf0%zK*5B-DY1-mvx43zWTe2*<-COM0Vu?=oUme+#djJ3c

delta 360
zcmZ3mo$1XQCbpbu3=Bu6PGmD<Sv~Wp|3ruG`UnOF#u^3&hOp$^#DY5=uii2+u*_g!
z;9*J6sZ6^cu=Y6vgAh=<$|55*F-3i{-c2Cq0T7#I00p>Q*){{&dw^IaBe$gD=>Pva
zf#zLdU|>3ulb@Uzy06HJfk9vnP%I@kv7&(SD8n}(TLP$FAulmEbpnS}1~&skj|EUe
zYe9Z-N%F6DI|hcn0}Kr8jFVFsl~p$~Fai|=vH#JTtK<1?zA|vL00n?<xbyWGjGnxP
zQIc`v<YSBrm>&M#oWXR1$p9$D3dGDntOLYAJ<JopMlmpT0YyQE>Hujjus91-+~gis
z2ax7-tddMXX|~CY995HxIQltDfGR;?^JXs2G>*;31d|vyTL@cLZN4~h1ry`O%~ex?
O0<Wf4vx2N+U;qH{PGnaA

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.svg b/frontend/desktop/src/assets/fonts/bksops-icon.svg
index f4715b9d89..1ba0297788 100644
--- a/frontend/desktop/src/assets/fonts/bksops-icon.svg
+++ b/frontend/desktop/src/assets/fonts/bksops-icon.svg
@@ -563,6 +563,27 @@
       <glyph glyph-name="uniE1FB" unicode="&#xE1FB;" d="M0.001 665.8333L0.001-96.1724 0.001-96.1724C-0.0893-117.4321 5.9538-138.2572 17.3928-156.0913 50.3158-210.14 120.11-227.3022 173.8814-194.5714L422.1984-41.7505C434.5059-33.9975 450.0997-33.9975 462.4073-41.7505L703.1172-192.3726C720.7452-203.9453 741.3297-210.0591 762.3437-209.9635 825.5763-209.7523 876.7846-157.9453 877-93.9735L877 665.8333C877 746.559 811.559 812 730.8333 812L146.1677 812C65.442 812 0.001 746.559 0.001 665.8333ZM438.7103 222.0777L268.2353 131.0594C261.6057 127.3819 253.082 132.8982 254.029 140.2532L287.177 334.2417 148.9028 472.1482C143.2203 477.6644 147.0087 486.8582 154.5853 487.7776L344.949 516.2782 430.1865 692.7986C433.9748 700.1536 444.3928 700.1536 447.234 692.7986L531.5244 516.2782 722.8352 487.7776C730.4119 486.8582 733.2531 477.6644 728.5177 472.1482L590.2436 334.2417 623.3915 140.2532C624.3386 132.8982 616.7619 127.3819 609.1852 131.0594L438.7103 222.0777Z"  horiz-adv-x="877" vert-adv-y="1024"  />
 
       
+      <glyph glyph-name="uniE1FD" unicode="&#xE1FD;" d="M602.7793 721.4903C607.7607 716.5331 614.7546 709.5531 623.338 700.9749L659.933 664.3653 665.5245 658.7674 708.3114 615.9116C716.9484 607.2579 725.8036 598.3843 734.7737 589.3945L761.9253 562.18C816.5047 507.4685 871.5015 452.3055 904.608 419.0867L919.2338 404.4096C925.5314 398.0891 930.2284 393.3734 932.9764 390.6124 983.5255 339.8239 983.5255 260.0047 932.9764 208.9764L929.5964 205.5715 912.49 188.4042C910.0597 185.9683 907.4656 183.3689 904.7206 180.6188L876.2813 152.1427C865.6717 141.5235 854.0469 129.8916 841.7512 117.5909L776.2737 52.1036C767.2226 43.053 758.1282 33.9596 749.0925 24.9254L676.8094-47.3362 669.7879-54.3549 608.3281-115.7835C606.3453-117.7652 604.5428-119.5666 602.9334-121.175 551.4329-172.6443 472.7295-172.6443 421.4823-121.523L402.1773-102.2488C396.877-96.9543 390.9542-91.0366 384.5112-84.5982L363.724-63.8228C352.6524-52.7561 340.6405-40.7479 328.0334-28.1431L253.4569 46.4325C228.9291 70.9637 204.5604 95.3393 182.3634 117.5461L101.5378 198.4369 99.2331 200.7457 90.7648 209.2352C39.7363 260.4442 39.7363 339.0828 90.6124 390.6124L93.0494 393.0758 99.9878 400.0656 102.1287 402.2189 119.1017 419.2673 123.3661 423.5466 147.7722 448.0219C154.9012 455.1682 162.4837 462.7668 170.4163 470.7141L221.3844 521.7551 248.4669 548.8607 328.6592 629.0589C335.6663 636.0617 342.4853 642.875 349.0566 649.4389L376.7519 677.0906C396.677 696.9734 412.4657 712.6994 421.551 721.6981 471.39 771.0625 552.9661 771.0625 602.7793 721.4903ZM437.4182 646.635C424.0046 633.0457 405.5453 614.4846 384.4869 593.3739L362.6526 571.5029C355.1462 563.9891 347.4415 556.2817 339.6292 548.4704L292.1896 501.0736C276.4293 485.3376 260.9635 469.9036 246.5171 455.4894L225.7027 434.7226C222.3912 431.4189 219.1661 428.2013 216.0388 425.0811L171.4572 380.5692 169.136 378.2448 165.5369 374.6328C98.4592 307.1511 100.3431 290.025 165.6621 225.623 167.5663 223.7455 170.4157 220.9184 174.0827 217.2699L230.0088 161.4195C241.5693 149.8577 254.0839 137.3366 267.1016 124.3091L303.8212 87.5558C327.553 63.7989 351.5595 39.7626 373.4233 17.8738L430.1694-38.9224 437.3588-46.1132C502.9769-111.711 519.1027-111.711 586.4323-45.8243 602.6843-29.9206 625.4757-7.2985 651.0438 18.2116L707.5277 74.7146 728.7923 96.041C771.1222 138.5154 811.4881 179.1376 836.0704 203.8406L851.3317 219.1631C853.9695 221.8071 856.0728 223.9112 857.5778 225.4103 922.0212 289.6016 922.0212 309.8224 857.5778 374.6328 854.7322 377.4946 849.6863 382.5588 842.8915 389.3735L831.4442 400.8519C829.3365 402.9649 827.1336 405.1732 824.8426 407.4698L797.8501 434.5227 792.8489 439.5344 754.9191 477.5399C743.5083 488.9726 731.7236 500.7795 719.8672 512.658L696.1486 536.4204 683.2168 549.376 645.9451 586.7162C634.081 598.6022 622.911 609.7932 612.8376 619.8862L594.2721 638.4887C591.4612 641.3053 588.8021 643.9701 586.3095 646.4681 520.5884 712.3165 502.2508 712.3165 437.4182 646.635ZM689.55 245.2737L689.55 187.0919 321.0651 187.0919 321.0651 245.2737 689.55 245.2737ZM689.55 396.1231L689.55 337.9413 321.0651 337.9413 321.0651 396.1231 689.55 396.1231Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE1FC" unicode="&#xE1FC;" d="M596.6753 518.8955L445.0801 518.8955 445.0801 644.848 113.6455 475.5464 445.0801 306.2878 445.0801 432.1965 608.7931 432.1965C738.1578 432.1965 802.8406 376.474 802.8406 264.9861 802.8406 149.3588 736.1096 93.6355 600.7286 93.6355L220.7376 93.6355 220.7376 4.8461 606.7862 4.8461C788.6746 4.8461 881.6455 89.4969 881.6455 256.7082 881.6455 432.1965 786.6703 518.8955 596.6753 518.8955Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE1FE" unicode="&#xE1FE;" d="M602.7793 721.4903C607.7607 716.5331 614.7546 709.5531 623.338 700.9749L659.933 664.3653 665.5245 658.7674 708.3114 615.9116C716.9484 607.2579 725.8036 598.3843 734.7737 589.3945L761.9253 562.18C816.5047 507.4685 871.5015 452.3055 904.608 419.0867L919.2338 404.4096C925.5314 398.0891 930.2284 393.3734 932.9764 390.6124 983.5255 339.8239 983.5255 260.0047 932.9764 208.9764L929.5964 205.5715 912.49 188.4042C910.0597 185.9683 907.4656 183.3689 904.7206 180.6188L876.2813 152.1427C865.6717 141.5235 854.0469 129.8916 841.7512 117.5909L776.2737 52.1036C767.2226 43.053 758.1282 33.9596 749.0925 24.9254L676.8094-47.3362C672.0646-52.0791 667.4437-56.6981 662.9686-61.1711L608.3281-115.7835C606.3453-117.7652 604.5428-119.5666 602.9334-121.175 551.4329-172.6443 472.7295-172.6443 421.4823-121.523L402.1773-102.2488C396.877-96.9543 390.9542-91.0366 384.5112-84.5982L363.724-63.8228C352.6524-52.7561 340.6405-40.7479 328.0334-28.1431L253.4569 46.4325C228.9291 70.9637 204.5604 95.3393 182.3634 117.5461L101.5378 198.4369C99.9371 200.0403 98.4636 201.5165 97.1246 202.8583L90.7648 209.2352C39.7363 260.4442 39.7363 339.0828 90.6124 390.6124L93.0494 393.0758 99.9878 400.0656C101.3627 401.4489 102.8432 402.9376 104.4238 404.5264L119.1017 419.2673 123.3661 423.5466 147.7722 448.0219C154.9012 455.1682 162.4837 462.7668 170.4163 470.7141L221.3844 521.7551 248.4669 548.8607 328.6592 629.0589C335.6663 636.0617 342.4853 642.875 349.0566 649.4389L376.7519 677.0906C396.677 696.9734 412.4657 712.6994 421.551 721.6981 471.39 771.0625 552.9661 771.0625 602.7793 721.4903ZM437.4182 646.635C424.0046 633.0457 405.5453 614.4846 384.4869 593.3739L362.6526 571.5029C355.1462 563.9891 347.4415 556.2817 339.6292 548.4704L292.1896 501.0736C276.4293 485.3376 260.9635 469.9036 246.5171 455.4894L225.7027 434.7226C222.3912 431.4189 219.1661 428.2013 216.0388 425.0811L171.4572 380.5692C168.9685 378.0783 166.976 376.0806 165.5369 374.6328 98.4592 307.1511 100.3431 290.025 165.6621 225.623 167.5663 223.7455 170.4157 220.9184 174.0827 217.2699L230.0088 161.4195C241.5693 149.8577 254.0839 137.3366 267.1016 124.3091L303.8212 87.5558C327.553 63.7989 351.5595 39.7626 373.4233 17.8738L430.1694-38.9224 437.3588-46.1132C502.9769-111.711 519.1027-111.711 586.4323-45.8243 602.6843-29.9206 625.4757-7.2985 651.0438 18.2116L707.5277 74.7146 728.7923 96.041C771.1222 138.5154 811.4881 179.1376 836.0704 203.8406L851.3317 219.1631C853.9695 221.8071 856.0728 223.9112 857.5778 225.4103 922.0212 289.6016 922.0212 309.8224 857.5778 374.6328 854.7322 377.4946 849.6863 382.5588 842.8915 389.3735L831.4442 400.8519C829.3365 402.9649 827.1336 405.1732 824.8426 407.4698L797.8501 434.5227 792.8489 439.5344 754.9191 477.5399C743.5083 488.9726 731.7236 500.7795 719.8672 512.658L696.1486 536.4204 683.2168 549.376 645.9451 586.7162C634.081 598.6022 622.911 609.7932 612.8376 619.8862L594.2721 638.4887C591.4612 641.3053 588.8021 643.9701 586.3095 646.4681 520.5884 712.3165 502.2508 712.3165 437.4182 646.635ZM615.0162 457.5419L656.157 416.4011 546.4264 306.7275 656.157 196.9838 615.0162 155.843 505.2744 265.5755 395.5989 155.843 354.4581 196.9838 464.1224 306.7275 354.4581 416.4011 395.5989 457.5419 505.2744 347.8795 615.0162 457.5419Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE1FF" unicode="&#xE1FF;" d="M602.7793 721.4903C607.7607 716.5331 614.7546 709.5531 623.338 700.9749L659.933 664.3653 665.5245 658.7674 708.3114 615.9116C716.9484 607.2579 725.8036 598.3843 734.7737 589.3945L761.9253 562.18C816.5047 507.4685 871.5015 452.3055 904.608 419.0867L919.2338 404.4096C925.5314 398.0891 930.2284 393.3734 932.9764 390.6124 983.5255 339.8239 983.5255 260.0047 932.9764 208.9764L929.5964 205.5715 912.49 188.4042C910.0597 185.9683 907.4656 183.3689 904.7206 180.6188L876.2813 152.1427C865.6717 141.5235 854.0469 129.8916 841.7512 117.5909L776.2737 52.1036C767.2226 43.053 758.1282 33.9596 749.0925 24.9254L676.8094-47.3362C672.0646-52.0791 667.4437-56.6981 662.9686-61.1711L608.3281-115.7835C606.3453-117.7652 604.5428-119.5666 602.9334-121.175 551.4329-172.6443 472.7295-172.6443 421.4823-121.523L402.1773-102.2488C396.877-96.9543 390.9542-91.0366 384.5112-84.5982L363.724-63.8228C352.6524-52.7561 340.6405-40.7479 328.0334-28.1431L253.4569 46.4325C228.9291 70.9637 204.5604 95.3393 182.3634 117.5461L101.5378 198.4369C99.9371 200.0403 98.4636 201.5165 97.1246 202.8583L90.7648 209.2352C39.7363 260.4442 39.7363 339.0828 90.6124 390.6124L93.0494 393.0758 99.9878 400.0656C101.3627 401.4489 102.8432 402.9376 104.4238 404.5264L119.1017 419.2673 123.3661 423.5466 147.7722 448.0219C154.9012 455.1682 162.4837 462.7668 170.4163 470.7141L221.3844 521.7551 248.4669 548.8607 328.6592 629.0589C335.6663 636.0617 342.4853 642.875 349.0566 649.4389L376.7519 677.0906C396.677 696.9734 412.4657 712.6994 421.551 721.6981 471.39 771.0625 552.9661 771.0625 602.7793 721.4903ZM437.4182 646.635C424.0046 633.0457 405.5453 614.4846 384.4869 593.3739L362.6526 571.5029C355.1462 563.9891 347.4415 556.2817 339.6292 548.4704L292.1896 501.0736C276.4293 485.3376 260.9635 469.9036 246.5171 455.4894L225.7027 434.7226C222.3912 431.4189 219.1661 428.2013 216.0388 425.0811L171.4572 380.5692C168.9685 378.0783 166.976 376.0806 165.5369 374.6328 98.4592 307.1511 100.3431 290.025 165.6621 225.623 167.5663 223.7455 170.4157 220.9184 174.0827 217.2699L230.0088 161.4195C241.5693 149.8577 254.0839 137.3366 267.1016 124.3091L303.8212 87.5558C327.553 63.7989 351.5595 39.7626 373.4233 17.8738L430.1694-38.9224 437.3588-46.1132C502.9769-111.711 519.1027-111.711 586.4323-45.8243 602.6843-29.9206 625.4757-7.2985 651.0438 18.2116L707.5277 74.7146 728.7923 96.041C771.1222 138.5154 811.4881 179.1376 836.0704 203.8406L851.3317 219.1631C853.9695 221.8071 856.0728 223.9112 857.5778 225.4103 922.0212 289.6016 922.0212 309.8224 857.5778 374.6328 854.7322 377.4946 849.6863 382.5588 842.8915 389.3735L831.4442 400.8519C829.3365 402.9649 827.1336 405.1732 824.8426 407.4698L797.8501 434.5227 792.8489 439.5344 754.9191 477.5399C743.5083 488.9726 731.7236 500.7795 719.8672 512.658L696.1486 536.4204 683.2168 549.376 645.9451 586.7162C634.081 598.6022 622.911 609.7932 612.8376 619.8862L594.2721 638.4887C591.4612 641.3053 588.8021 643.9701 586.3095 646.4681 520.5884 712.3165 502.2508 712.3165 437.4182 646.635ZM508.1558 499.9484C616.4612 499.9484 704.2601 412.1496 704.2601 303.8442 704.2601 195.5388 616.4612 107.7399 508.1558 107.7399 399.8504 107.7399 312.0516 195.5388 312.0516 303.8442 312.0516 412.1496 399.8504 499.9484 508.1558 499.9484ZM508.1558 439.6087C433.1752 439.6087 372.3913 378.8248 372.3913 303.8442 372.3913 228.8635 433.1752 168.0797 508.1558 168.0797 583.1365 168.0797 643.9203 228.8635 643.9203 303.8442 643.9203 378.8248 583.1365 439.6087 508.1558 439.6087Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE200" unicode="&#xE200;" d="M720.7552 356.8889L308.3785 356.8889C286.351 357.4842 265.4633 366.8112 250.3144 382.8161 235.1655 398.8211 226.9978 420.1916 227.6095 442.2222 226.9978 464.2528 235.1655 485.6234 250.3144 501.6283 265.4633 517.6333 286.351 526.9602 308.3785 527.5556L698.5722 527.5556C718.7703 492.5638 756.0079 470.9105 796.405 470.6667 859.2282 470.6726 910.1534 521.6109 910.1534 584.4444 910.1534 647.278 859.2282 698.2222 796.405 698.2222 756.0079 697.9783 718.7703 676.3251 698.5722 641.3333L300.4153 641.3333C194.1766 637.3187 110.9687 548.5151 113.8504 442.2222 112.4747 390.7676 131.6015 340.8755 167.0197 303.5309 202.4378 266.1863 251.2434 244.4512 302.6905 243.1111L716.2048 243.1111C763.3254 243.1111 801.5241 204.9061 801.5241 157.7778 801.5241 110.6495 763.3254 72.4444 716.2048 72.4444L325.4423 72.4444C305.2441 107.4362 268.0066 129.0895 227.6095 129.3333 164.7863 129.3274 113.8611 78.3891 113.8611 15.5556 113.8611-47.278 164.7863-98.2222 227.6095-98.2222 268.0066-97.9783 305.2441-76.3251 325.4423-41.3333L723.5992-41.3333C829.7-37.0169 912.7357 51.6029 910.1641 157.7778 912.7094 265.0251 827.9787 354.096 720.7552 356.8889ZM796.405 641.3333C819.4106 641.3333 840.1509 627.4728 848.9548 606.2149 857.7587 584.957 852.8923 560.488 836.6249 544.2179 820.3575 527.9478 795.8925 523.0806 774.6381 531.886 753.3837 540.6913 739.5254 561.435 739.5254 584.4444 739.5254 615.8633 764.9913 641.3333 796.405 641.3333L796.405 641.3333ZM227.6095-41.3333C204.6039-41.3333 183.8635-27.4728 175.0597-6.2149 166.2558 15.043 171.1222 39.512 187.3896 55.7821 203.657 72.0522 228.1219 76.9194 249.3764 68.114 270.6308 59.3087 284.4891 38.565 284.4891 15.5556 284.4891-15.8633 259.0232-41.3333 227.6095-41.3333L227.6095-41.3333Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE201" unicode="&#xE201;" d="M896 716H128C110.4 716 96 701.6 96 684V-84C96-101.6 110.4-116 128-116H896C913.6-116 928-101.6 928-84V684C928 701.6 913.6 716 896 716ZM864-52H160V652H864V-52ZM793.6 536.8L748.8 581.6 608 440.8 608 524H544V332H736V396H652.8L793.6 536.8ZM608 396L608 396 608 396 608 396ZM230.4 63.2L275.2 18.4 416 159.2 416 76H480V268H288V204H371.2L230.4 63.2ZM416 204L416 204 416 204 416 204Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE202" unicode="&#xE202;" d="M896 716H128C110.4 716 96 701.6 96 684V-84C96-101.6 110.4-116 128-116H896C913.6-116 928-101.6 928-84V684C928 701.6 913.6 716 896 716ZM864-52H160V652H864V-52ZM544 376.8L588.8 332 729.6 472.8V389.6H793.6V581.6H601.6V517.6H684.8L544 376.8ZM729.6 517.6L729.6 517.6 729.6 517.6 729.6 517.6ZM480 223.2L435.2 268 294.4 127.2V210.4H230.4V18.4H422.4V82.4H339.2L480 223.2ZM294.4 82.4L294.4 82.4 294.4 82.4 294.4 82.4Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
+
+      
 
   </font>
   </defs>
diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.ttf b/frontend/desktop/src/assets/fonts/bksops-icon.ttf
index 7b4c3a1a45a9937159b3ddd70521218f5ffe8ef4..545c55fd060a3a22725a839480666a1e32624509 100644
GIT binary patch
delta 1658
zcma)5UrbwN6hG%H+>1<FT3R}wmfn_e3mcdA_8)YkbP<>dL^IJPWDgS=2$2@pX0lB~
zjoCCN%(C=hJUD|1iE;WcS72=Jp)rdgNP<gzn0p$1*DNtQL)Kf*?F9!aaX0yWzw@1Y
z{{8Ov-Me40KNr}vD{%q<-vfYS1F`<`qNLjhP&5zl{LovY=Z0+6b8P^oX@JR@;lcis
z;_?e0Q|v=RaF`sWo!o7*?-1&SV`t8;=kvFy-cJDR;po^v|0}gk)c{5t`A)_9&yM3N
z{6Y3!ig(2OV}sKr)x&!LF1sn=;`rF<Gv?Bb-vCnA0r(@A@3`8R04bKRvGQZ$gyGQd
zu&0O|G{WPUeT(ziyqUYNJ4E{uV5*lMHE$_p$61zT=?vaysYht@kh7SeBOD-5E!}5@
zP+&9URg(@7mlpg*Y&5l86jck97FRLj4fqDqFb@l`2sfz%m-?JPpPJ>9&n;7)`rJ;p
zlnj-;w*CY_1>7LcX`ozKS2R!+SkG&qdXS}16;v6rG=mE20a+5GLhY9RwEQHNw~e+<
zwPhnck?-3}+Iy&hsr7t<ROH{#{lFfB5$eFLD#J=ER+@R_oFdlyLl~5K&VZcimD^d+
zPhMw*MF{L8u;Y9g2J7pUMfYHXvM7q!Ee=hZg$F+7MT6ARe0a^{Q65RHYf2I)lq9>y
zmnkdmAveX=W4Ajo*nr*p#x24FPfL^X$m@-+Nnr^MveFg~UkQh`vjE*Gb`i>H;|i2v
zz$aVGqF@mmp>p>6jIw~;bKk8f7w`i#A>${%yf*p8*Vy+2IrX#9acvVwhqyytVi$e2
z$Xj`l7eivm`pg<HG{oZ#@mOO#-WdC*&|P#U<X;<Ol%(YqF4c}{>0a)bcb9RkcC_k|
zmr#rp4BAF8B;o&#p4d8{s@^fi#(K3i+{0K;xUfE>4*Bli$-QIYtz;^(bp%&+N%k%H
z;V`^Rk^~9;!H{6bgs(8C=;U}oj~33(tmHM*PC^$cA|WybM$liclkKQy5(fN1A37zB
zFgsezoQvI42As{!PW;H=w|k?AQLo)^P$rI!U`?<~#H)2)Z=G^(`%6q79eJBK*~+*?
zl^~cLdvnX`Mze7c<qnzE*fHv%a`u|y@mIwot+j}rm%O;$JvV`l3Wrd|>uts=NAB2D
zTUAZBFF&Q5WvgI-3a~*f{ayQ2?M}{OG*|irIT$deGJRZ}E?U54@dfr{E21?-mdkRG
zY~A}g(3?zpow`c7D9dy;U5aLUo0JbVW~(Os(~umn%;}~}y_u+zF3^9Ekh<Pid3;Bk
zZSDWvQpsq&Hg;>N{G#>zS?dYu(9|`COX=(<Z=xR4IFAdsh&OQwZ>2k?-z`4KzY`zn
a^mcV@@{60?xyfAxmOY+L_HMFF-}EmLVUD~2

delta 363
zcmeydmFdW8rU}aR5ey8BH4F?4Vad6P1$R1Ly=7ovnZdxo!;+p;nRY*5?Q;eOA)s`X
zMMi33iuz=|n?TM3AU4YY3UIlyZ3eRU0I^C&Zb`+_|NnOa&AY<Dz;q-hKRGdUUy&69
zgTNf1SW0eUMFHbchHpT&1W>&~USe+Q1P-YTZU%-P3!sM9g8br=<X`P}3=Dk-7#P?Y
zC+<<U-^joSR13uZM`x~%=ePOFz|8^_06O8$*JCjH|D*pRY&V!~fP4-HCXgr)fb?yg
zEXTNj>EZ9q2N-WK82|-XftVSHb$}RX4)X-CG6tqDpeRU#4v^*oi?cArO@6}S0Me|+
zD#-+tW}AGGy=w9)_I}P1ph^(fyg7*@jbpQ%U=riz2||`tn>8n{U}D_3`O;*dfYa1!
JR*-cJ3;-^kV3Pm<

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.woff b/frontend/desktop/src/assets/fonts/bksops-icon.woff
index c56465137392941e97701bc7b7a32896d88097bd..0b0cd50eb9fad63aac77cd6cc8df7ccb77e8c9ee 100644
GIT binary patch
delta 3563
zcmXw5c|6o@`~8Z@G7*xUlznFy8A}<<L-t*heGEcj>}1L^2r0|h1`XMwvNYC^gt8_3
zzK?xLLK@6(p7(u!_x-s(=Q`)U&UOELo>Wtf5UALLO>}huDu8nCjR1`QV$PqJ?3!pt
zS086z0HAsT05p35z=Whp5xe5<9f|}1T8eHo4*-!_yxgzVJ=~lT0AOiKamrIlS@bJk
zf(J#UXfYHnNU56)I<!q5J^>*V?KOoz1Aq$)i)3=6_aj%zoRu8qAOC;LL_nI`$2o+u
zU)lQKL4HaJQuP5x51oD70KobSWypqNj(u^-gVFa9DgXd%c`3Xe0O<7C8U7xmU7~V9
z%gb+_jyuOY*Exq!vm<G~Q2{+33`Zfj&N0uQ8Lph&`+Fyh*Wm^ydKHD1Qx@iRg+gyF
zS*6XVuIXcIKD^h`!HT{7M>uD{Bpazvb0h@qzmLE3UNKF2eD5?LGWYBAt%D65S@C%E
zAp9L^<~xd7^n&Q?)pCQ#$NA=wMJ_)4Xz7fUf=}hdWh)7hmHE8#f@O*9tD{9hBMHbK
z(qY|wS$rs0x5{Tq)iTPRs}rnH7x(Sw>iZ7cDbao^&%eBnlXx!ho$P9zUZ`uSJL|ze
zTVygekPvFutm-wM=~d4`2zPbljgK!_^5B&mKX0}XM+GA}i?}*q-UzrjbB2Tgns8vB
zy(dBp?p>OFGeQ_?16P7;z)knzFV)LZ^HdYk%6r6dx`gd-8@TptT<4_a8t(&N8KrU^
zpMl=pk;Mp^S2Bk+aFEA8H)LMR8#TlydKxIod~2<HC7e0*Z0rMGddI_rPSu|)Pho=?
zu*lFflq}i!tfCR)wPDQsZaFLrJ(M^%^C|iFqR8K&lyfF0!RUr;IA<RV#^1|f%ZF(#
zXxEA623Lknq`L#jKFN(YSTUd85W$+3{dpw9r1v-g>C3Fxm}xiD?ajZ?zCFsj`b#e5
zr&x-7%88WI^+ek~R%}fYvC>I6W$lNRT6>yW=Yz2-Y-uPaP^}lG_MNd3y{6;f0y{d3
zbU?Db|0$6hnk@ZsfXAC?R979n^Rd%-Zj~>{ZP?`RIO?pxv6#F!LXNN+*0h?JJr9HQ
zOCY|8t-MbY^AOg%Q*n#o9?|TpqrBPIc|{5;Q&5G1P`@|gW;kS%q_$Eo;WoR!6-(@W
z0qyHH3}#=IVC??rLkic^2EhuHq{lhTZg)T6`djI<UOVIuVhv>CtMFR4RqwrOFj9ZN
zLYo@q%EQe){dI7H5tQuX?cvP^bCp#9AGyF>b18b?;KVAXt4<DFSB$UDyf+7lw=RJO
zeNeU>?=rQA!vc4hMhOth@pe;tJy>8S*PAUw*}GaazNr^98YpiW9E)#yhuLhR=nu=@
z#o?Q_m`3d%mAxw^=Dk>V3pKeJ2A|_g(7+z+FNyR*MShGA-Xd|Sx}#xhyiV&lYET~P
z1s*l$y^gE5oqL+ljy-m9iN{O9KyHnrrdVf8%?whk*B55@5Ry*3471ba>`@pp#hPJm
z*CZ*Y6OCbZU7S7snRqEzkQ<k~Snn*RCJB=67KN8$1G!}*#Cj1hyAq0rvda@wV@P?z
z;H8c!!f@I=%{BDB6Os_Dkpq50Vuf*Ka`!a!nRXE|3h$~SFszbB$6K~;C-;S|d77Rp
zVZYyV$s<~1+CDlt6?Omzyp`o@8UtZX++B)@sGN|=UkOIuH4#B<xu8R2B7V+WX(Sgy
zX>%zpWF(gl6IMHH`Y4EJv!5T<GU-(Y+2h*m*Fg8qQtv;_P>k>>a~H7Nm5xu54(9qI
ziY0-TEMSjkAC<kQlM24^#T`pxT|)KpG3>|U=g^*wUe{Y|X4+UB;k$_VM^eY&FZGz!
zO(+Z%I5>De7T>6f@Oal+Kf`=QlQXAY0MtM2+&jy<pGIs=_%k^eaqiNXDfFB(XSxVW
zQjuJ;>CNNt>l?(8ksbqR2zU+6nX{$|>L)v5o54#B#7K~R>dHVeOt@E_H%=nS9!)LZ
zIS>xis?qZ6qbs)WxlE~it|Hq7&9Z1#J@uAq?qU?7mHM<rcUk26-P{)?#&BT{D>2>~
zJ<~#3h^dv8POKE7O#7<eR<r~|hPf5qtoTEeL3#RAS)4>hR3WZMIx~Mt!iQO30J^F6
zu})swpE;i^#l4HXJ#c#PhfF59(he0a5L9Dn6JM`|prt~T)S0<uA_p(V84VQ>l<05j
zZrvQ%6iFYiN+>wdZVgg^^Tev12-X7NPehlOoPi=oH+|KfbPo-hi!pI9#L-{0VYtZD
zY<_{`9<mDX)cU3w3zyBLZ;E1%e)UVSN+DUf1V3TjwD2I2E9_!&aj@)4Eyjo;n>PnL
z{sDZ5Kx-*8U#n@_4^#5jUVZ)Q<M8UiB(4+c)TD`5xj<hN%vpMToJ>8_p}#>JBQb7K
z9g5p~@a+oZ>nCEL&YCr^cXq-!h^w;lL&la>ohY}kHP~-&SeEZ?TxbwXy`z=)#s>6Z
zTif?Ny<Hb7wGLB})e6Q4Os$Lf_n^v|taH8Ui|D&@+*|%(xK1$;xc+;}-d;X=V|Q{?
zBP+_vS~R21PI!)0{La<wg$r=W<IT<8w^hDD0o?SAY|E%4=dFpCY@RWxaX~-haAr9%
zj7N?82^Xo1Quqyo(lz`LeGeuQTXedZMrDh2xzcm>*3GiTJ=1jTUrY}+KcT6FFWfy9
zwMCaY*5);avYiQaV+#fqwK&lJyE~}zW#ot8<YOCKx3j}krLTw(8Ky6`X^0g)3DfcA
z9R->gt4aL#7YE8ci_iw@mS3kDapzjmQjk}1e%=WkfoI%S^SifOSR#xa&l%^}vRKw7
zSyPzSHJRlir(_HjlGH{K{!gcFhL=BuXQ9I_6L|#xAm3Q)8u4AxL{5}16P|QDF4;1B
ze2_mss}XpqEUX_AUFy8U=$BGsYa=?#eMQP+1**?7CmPO4FTItzv^!HzcGds;iQc4q
z{fb3b`w(a9mt>u4el>{pK89|yvlC>dh0`pK75D-BmEH(WPoilwU@{QiXYB{EZK4Zr
z))T7Bu3@_RtUqI!7Y?7-=7p%UJV7|Q)ag$?6TG^uP8S}h47+~%suay8+s^Kw72Izf
z(d=3novse(o71Q6T+7XPJJ|m4^tKhDKcB{V-#J3%<sZ41a)>*_9{E!T?0!rg{YF#@
zv=RHX;9pl9qE|+fr&Z`s3pYh~C%w=WwFQoGKhSp+0_u9t7)QsNIm&)Mw)SF1<z*YX
zBWonnHgYNnxov?)$fO6Odr|O{@!N0jhsK)8qr6IHG72vXSg0A|wAT?)v4o=~k~wjN
zhrURGK6wpoXR9@zQ&@7ngudgsgQXVtVqeU!`#j*ZP6z7=5!=P!ic^Usk_?*3Vq0NV
zNXUFB=KAop+0OTMM@My^!;i{rMgj0B4`I37Vy%4^!uzB*(&}(ISOOhWY_aADfvQ`7
zD;6`Jk35U>=N{1d<H6b3@+$V9i|^qdLsWe~wp|qboy3qaX;b=XeBI(cGPis2*M=;1
z7{gn`dR!RWSFy0m;fP3=XWv2#{-*xwhjCZGJv9AEE-U~<jBA$lJh6m0EbIpvGBusH
zO+FUaIRYGO*U5ubJ7~%ENqy>p15Gl?54_-b>x!nIkYNcKkeO-*0U<b7Cxnv|u;f@O
zGtzx99pScsbOxT%&7+7;zsY)Jor#BX(?BCHlcAs)5VHX)`ZqKF&op-OzJsMBh(s<T
zw^7Cb9n(*jfvVt33~3?eQ49+f)WFwH1#bYTu|QDCsC%m?sV`|5YIJE{(liAA|Ko}F
zpU<8qQqg2R$ztp~XI@nV07d@`9ko%G4peBHdUhT5+l!N&EKE)V3|Z}R_M=v_H%js^
zXDJG<R&vS-W!;D`%R&v@Vq9uFSllJ8e#8-W-!!+Okh&;c#e$O}GI<+uxw%TRxf+U^
zj1KK{H#u^7bmUCMIGK4iQ9!NoB3dO2rjp*Fg1e!TTBMSrBZZ{z_Lb`PQxo+S5=B?1
zyW#r8aXp?%;+M1yShJty(3jTY6jjn{RdP`tSwllV6sw|8w^9xopD;GYCpO01ZA|KI
zjFPnbCSi@b>eZ0r)qve<$meNznM(<24H?r7dC-P5!c6DvOh-%Qvc~Qj75~b0ex!Oz
z)zf6P9#^#iHnndSYW<4;&01)07e(2c*vyHZ-jAOvyqA?6)<APB(v*ZXM^v9%qt;lt
zp|Q%QK~&UOV{BcKY+dDPB|=-*=pt7{BUi6Q5+RXm%;zhz=SV2@Ph8$9)Ma_*aBJ+S
zv%#0vJpenf(l^j!2Q3{)sP(HG7?^~{W!oj?{f&*p!`H9=jeUrR`>eD7jXnDuStYPd
zM`|ZU8CMDXjxrvkpS$`yD){0aL(?6|rtWMRPhio*k>n<`|B@EPO}(=+fy2Aa#j`^X
zJ?lTfr=)kVK?cxo(A40Yd;iS6{CHzSxaD=`?^K7OyJ7!P&t4ZC)~2=FTtho<*!<0i
zEdC!@OqTDAv{pQ}X?EX<B!rLdS~c73I1pMAS`tWx+lRYK)zIqkKdt-EyU1P<^C5c6
zk;yGxEjg3V!@;}q1n7S*<j{U=9!`3DHWumCcDOs%3~w1TE*+oT+YUTZ-P=8#g_82x
z^h$>}0#x&i!Fzlyq$AZ9V@;C!^xn?#Q8+1jk8Ym1l_vty*E%dP<L;Z{ygDbx4`p=c
NOg^XniJm3^{|6)l+tmO7

delta 2977
zcmY+Fc|6oz8^(WwkRb|TlF>qw?6ND5#!^oz`x1s3#!&Vxgt25ION42xnUoYJnIv19
zFk~!KDr5{1LSvFG`}=#|=l$nB=W~7TbA7LKpY!MasSXnV0wQtain%!e0l?)H4?zE^
zdF|N}#&{=Be{>K4K;i*_uNeS@`B*7)9GqX2HvsS(0l>v60EpHbv#Or)!J@qYz~(sE
zsR2soM2_mP4+uf#1bTT;$A!%JsXqQ;kst#FqyPX<d&ll>gI}O0c+VC@5bzC%m;IX%
z1AlZR_^*x~2mm=y@{kT-H30381pvES;3Y?}IXO$v2O1O@8U_INEYOz$fB?jE<M!Dc
zK?nxF<Nam*d7D_9U)wK!M33M-UVzmPU5G5|_+rr`iIt!)?(Q*_@Dofd4TEH(9wlW^
z!m<@x)>JVNXla<WNe7P*;$b}Y3g+nE)jg~CWT7U`$VBB|Mr-*QF0PR$j2E^Qx#$vo
zEp89gmB-Ff#rE-5Lx#=H!*>LhixT&F*A#wgJ5R~7tF`HaeCKC0*6!|CYu&4+Txp3@
z82hSJ{}*Q>=#(M2z=TIL98Ul62a(y~xOlNBeIQt;&;51QZf7^bETckv<so)CmFC=J
z@Wq>xSvBfLIb-)JPPTK>)U@c1Rxri&X7B@>=>>XZxki%3FeBS$LCGHRxv%<iz$HAx
zWgc_gWzHUkg1Hyi6gW_-v(8lH7C-BGZ1+v`nT^WLkUfqel8&JwpBsoUSBp#6tPAI<
zhT#nfhn`w&|8zjYK9CeyrnUtiiVA&cD#L>gFUv*zeJySpFtabS{>C*jwR0k#2%MQU
z3k;ZySQx*&@K7{%)&kG3o@K)7JtK_w7DUR>gUr?M-IVEwP4^b|l(|0>Z7fdeI<Bad
z{4{EMV2Op(OdIY&t1glHc@Ea5bTp{E_dm&S>JyUlP!O%Xb35wz&AI|@Bl@HfEvE{5
zcs}aRli|1KIxq57{IG}mzq2_;j8LQgeG$KT)P5gmip+P6%o`l)l|#*B{M<z1e|j1R
z{yr!WS(wz^)+9TjZc*Etr?xS-GjnBj*KoPj`1A6WJZy(M{83(Vx^!|gJT-ATK;ksM
ztTgIya&utnIX2Do2p9V>>xQ;<*Jj~sRxaXMK?$#Q@9%{ZLi(a9=lTR6W`!mpzAGOQ
z(su`~>_Y;XTR^0yB1&WHgk$l8I?HaIAz$`~i*PD&KJKv${R^jSii%B<NY6tuu#q9=
zkRpN3_VV$wMS2#3fW;gt6v^;M`}kc%db)t%D|1MPctz-8^{mWcj_~I?UAsY=m74`J
zyjb}2=(P$8mE5RGm}`VRoA<7uG?5$S2y@Y(!B$Y}$&F|6gt-mS;VLMt<VFaw|173-
z$~H^dYu)HLzsp&f)FZ_H^Oy><=RU2lo^OOq{dY_a3z)%l3wZ2iYH+DB(+A2_9=vIn
zMmp1B-I{$?#6?0aD-glpLpm#h;Jp>`J)zc8BNzLOtUMr$%@05@gptnPV8pN@4ioUT
zJzz#5D=&c=*v5l&J_zfs?Xn_v5Negd=qXv5A&hkf+k}wL4l>=fU#*DRgxV_YTx>B}
zd0qq?)!p6tKqvQlQXW3=bZ&4CIlWK>%fcWg9T@eBFM5}oGdaXS8_aF;(va_ZghGV#
z8(iurG0+urmmC^9if1;wL9d@xT)p}xKQ)%f^})1GjTGp4ROkwbtW0N-*|IvH3Xc(@
zmrBU&=D-SFIBc%h8ribmWfgc9OgstEp{$UWzhW>`!Vh3`!#HB)-ic5~_@2e&DWRl4
zAFbS5H9rlC6X!)It~2rk7c-^`ZvFXU#cid!J`o#pp*Xpuz?BD8+wT%9r6*1x2j_60
zq>zJ3!fuuBB5svq%8q}va|x6YIH(JZmHolpA&*VBe1AmmU>l;3UOv?L3a9L7*Y3=y
zlML=-YVVFPwT%O1*9DwT*1V$z@ylJn7oPn2$jn<Gb;KJY_o`JztiZYN8y8}J8*kN<
zd#tN-bujJ9Et&IL{=6SW@G_)*dRw0H%j-@@!cRm#&p4|7y^dxGpl>tsVTFmR;yKt`
zMFQ~yBEJPhzaBR7frinxk_2`&FyVWTiJs3GHKFsBUW|jY?xzGXV-(FuNn+@?cqr-v
zKZ;x-3?H}ANv=L6M(8}Vl)yh!BH=L|6r?vko&_|%=NpRb^8Eu%LkW0D$xKL;^PY<l
z5{fy;)bOy{<O|D;m#pE4@xofAUJ+P9Ja7m^g(7gNun>8*?yV|C=TDG+#E&V5tTrNT
zV7^A*DcB5q>#Wz36I$t@UQGzz(4rwo<5i+XMI}wvQGT=N<()hEcZ70I+tFID{W>XL
z{X>YjbKN63ZL#5~@aE>;Ydm*fr9LHQrHkeM?ZKB?@O0~Did)Q)2=uZc>E(xrVtH<F
z;(ZnRuQDO^zY|=bs?-`+6rebNG>t?W`G_g_Ga6aOIU`OYHT$b~-#$pXhL<0vk4fZw
zq4(HH_)hk==Z^crd!Zw04nme%r7Mq1FUgdCWJ!Or=U4m4?=aUh(QT=nZrQWD^IM&=
zxt5<@k4RR-462svPLxyicBVCSw+f4`OZNZl>uYb3oN%AE_t@=*%**o+^(N1idmKwR
zIVL^(DLm9Z*gSmNej*WHiBH(}FDK$>c6`+p)>HTHtVoGTNqKAp?A+}v3ho`tE1epF
zS#G3%eS^nsZ>@=iDDn*`${)VAy_T>2+Q=T;x934NuIsJ*dmqG6Re`VL-h2(#y|NL4
zXAOOvWqc}+i9af&i8e-Fa<eixH!pA>F=OGo2Wer>{9V9_FiCfDq~b%AB3{(gaG=;}
zw9sfjy@w^@*H)v^yTK?&RG(DT$jR_85G%_$G9da3Q-t^XVCh$NyV0pZ8mm)V8<30s
zj^P-zchlPe;6Q6T4xI3jMV=mB9v%Q@w@k~ib7>?7JMN7J5(I9%kxTlp3*VMPH_`lf
zzlW%+CzwL=Dnua%auVzg^P2-TL4v$FkL(ip0l;iS(~7EY?*)<j-)lo%zwRWYLHJ1V
zBxui$=(H99Xx8yGQ{OqDAo$r4dt2%F#ZX*|X6}m~P3(Ct>iYA#wf9-EtL!I&3P>`-
zlT6DxN;R!WSJ>YzP2M>NZ`_=YiK5K6e7U(>GE+o*L|g37rS0M~HB)o+@@@6<-WSnl
zEzwH2AVplT&H$-Tzlaf4)W65IOV~SPzf|bn`yn#-L-#mprd7T!z+Zn&oG10Ju-;~{
z+GPX0RmCOvjw+;Dn)PNyvEEg)=$xLJeK7NvVaw^xZ_h1!S3MZ4yB4ID=KL;Jc`8nB
z+(Zr|!-yhTMCM9Xeb<n~NmfQBo&aZL6anYlcC}<O3gvNl9vqmc?+U1CNu5Qd!r^z<
zoBJHt<CoYI{_JmfH}+)gt3}Ajde+?`T4&6=CqKQUn%2|%*Avy&?>rxFL%l)6$7&yN
z|CI1<y}i5DZnAGttM%8Z)<r{n5XpEw?bueY@fO26Q)EapYG9)-R>N8^Nz33OF2ox*
zRaJa!hB>U~f}8nSJUK}v1<grqBnOZke@Hcg#rB8PDips-i>rbE6yQP)XmL!afys$T
zM<$dl*?j5;|7gXb@UnnU8I9JubLRh=<-Q8|N?F_|H4ZW2V$<W%j{&~*FI~Q#<Q(Uo
zXJ<Dbi?aBg`RM-gJ=DjG(HGQa75<^iIdNb5H=K><aobf7R;d4P@Q>YR9XImg{w<fW
zPhQz>QdZqKC3Tyh7wnrHIjFjupH~U1gaxgagH40X1tw~8lWqvxeZCkwc{pQJdlj~J
z?Q$5aEckBr=zn)hHuvf-`)eSle${2O`bIr_bgnMKprtPk_nbNybz_Fh9_DVHF(|(L
vWMDQdT7mmxw0>|ld_#PUy3LLYY^^t5-5y%=9LtE+l@sCLg&a9gX9NEM?~K2-

diff --git a/frontend/desktop/src/assets/js/flow.js b/frontend/desktop/src/assets/js/flow.js
index 78e2ba464d..5d0f96c109 100644
--- a/frontend/desktop/src/assets/js/flow.js
+++ b/frontend/desktop/src/assets/js/flow.js
@@ -1 +1 @@
-function t(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)}return n}function e(e){for(var i=1;i<arguments.length;i++){var o=null!=arguments[i]?arguments[i]:{};i%2?t(Object(o),!0).forEach(function(t){n(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):t(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}function n(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var i,o,s=[],r=!0,a=!1;try{for(n=n.call(t);!(r=(i=n.next()).done)&&(s.push(i.value),!e||s.length!==e);r=!0);}catch(t){a=!0,o=t}finally{try{r||null==n.return||n.return()}finally{if(a)throw o}}return s}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,i=new Array(e);n<e;n++)i[n]=t[n];return i}var s="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var r,a=(function(t,e){(function(){void 0===Math.sgn&&(Math.sgn=function(t){return 0==t?0:t>0?1:-1});var t=function(t,e){return{x:t.x-e.x,y:t.y-e.y}},n=function(t,e){return t.x*e.x+t.y*e.y},i=function(t){return Math.sqrt(t.x*t.x+t.y*t.y)},o=function(t,e){return{x:t.x*e,y:t.y*e}},s=Math.pow(2,-65),r=function(e,n){for(var o=[],s=a(e,n),r=n.length-1,u=l(s,2*r-1,o,0),c=t(e,n[0]),h=i(c),p=0,f=0;f<u;f++){c=t(e,d(n,r,o[f],null,null));var g=i(c);g<h&&(h=g,p=o[f])}return c=t(e,n[r]),(g=i(c))<h&&(h=g,p=1),{location:p,distance:h}},a=function(e,i){for(var s=i.length-1,r=2*s-1,a=[],l=[],u=[],c=[],h=[[1,.6,.3,.1],[.4,.6,.6,.4],[.1,.3,.6,1]],d=0;d<=s;d++)a[d]=t(i[d],e);for(d=0;d<=s-1;d++)l[d]=t(i[d+1],i[d]),l[d]=o(l[d],3);for(var p=0;p<=s-1;p++)for(var f=0;f<=s;f++)u[p]||(u[p]=[]),u[p][f]=n(l[p],a[f]);for(d=0;d<=r;d++)c[d]||(c[d]=[]),c[d].y=0,c[d].x=parseFloat(d)/r;for(var g=s,m=s-1,v=0;v<=g+m;v++){var y=Math.max(0,v-m),b=Math.min(v,g);for(d=y;d<=b;d++){var P=v-d;c[d+P].y+=u[P][d]*h[P][d]}}return c},l=function(t,e,n,i){var o,s,r=[],a=[],p=[],f=[];switch(u(t,e)){case 0:return 0;case 1:if(i>=64)return n[0]=(t[0].x+t[e].x)/2,1;if(c(t,e))return n[0]=h(t,e),1}d(t,e,.5,r,a),o=l(r,e,p,i+1),s=l(a,e,f,i+1);for(var g=0;g<o;g++)n[g]=p[g];for(g=0;g<s;g++)n[g+o]=f[g];return o+s},u=function(t,e){var n,i,o=0;n=i=Math.sgn(t[0].y);for(var s=1;s<=e;s++)(n=Math.sgn(t[s].y))!=i&&o++,i=n;return o},c=function(t,e){var n,i,o,r,a,l,u,c,h;r=t[0].y-t[e].y,a=t[e].x-t[0].x,l=t[0].x*t[e].y-t[e].x*t[0].y,c=h=0;for(var d=1;d<e;d++){var p=r*t[d].x+a*t[d].y+l;p>c?c=p:p<h&&(h=p)}return 0,1,0,n=(1*(l-c)-0*(u=a))*(1/(0*u-1*r)),i=(1*(l-h)-0*(u=a))*(1/(0*u-1*r)),o=Math.min(n,i),Math.max(n,i)-o<s?1:0},h=function(t,e){var n=t[e].x-t[0].x,i=t[e].y-t[0].y,o=t[0].x-0;return 0+1*((n*(t[0].y-0)-i*o)*(1/(0*n-1*i)))},d=function(t,e,n,i,o){for(var s=[[]],r=0;r<=e;r++)s[0][r]=t[r];for(var a=1;a<=e;a++)for(r=0;r<=e-a;r++)s[a]||(s[a]=[]),s[a][r]||(s[a][r]={}),s[a][r].x=(1-n)*s[a-1][r].x+n*s[a-1][r+1].x,s[a][r].y=(1-n)*s[a-1][r].y+n*s[a-1][r+1].y;if(null!=i)for(r=0;r<=e;r++)i[r]=s[r][0];if(null!=o)for(r=0;r<=e;r++)o[r]=s[e-r][r];return s[e][0]},p={},f=function(t,e){for(var n=function(t){var e=p[t];if(!e){var n=function(t){return function(e){return t}},i=function(){return function(t){return t}},o=function(){return function(t){return 1-t}},s=function(t){return function(e){for(var n=1,i=0;i<t.length;i++)n*=t[i](e);return n}};(e=[]).push(new function(){return function(e){return Math.pow(e,t)}});for(var r=1;r<t;r++){for(var a=[new n(t)],l=0;l<t-r;l++)a.push(new i);for(l=0;l<r;l++)a.push(new o);e.push(new s(a))}e.push(new function(){return function(e){return Math.pow(1-e,t)}}),p[t]=e}return e}(t.length-1),i=0,o=0,s=0;s<t.length;s++)i+=t[s].x*n[s](e),o+=t[s].y*n[s](e);return{x:i,y:o}},g=function(t,e){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))},m=function(t){return t[0].x===t[1].x&&t[0].y===t[1].y},v=function(t,e,n){if(m(t))return{point:t[0],location:e};for(var i=f(t,e),o=0,s=e,r=n>0?1:-1,a=null;o<Math.abs(n);)a=f(t,s+=.005*r),o+=g(a,i),i=a;return{point:a,location:s}},y=function(t,e){var n=f(t,e),i=f(t.slice(0,t.length-1),e),o=i.y-n.y,s=i.x-n.x;return 0===o?1/0:Math.atan(o/s)},b=function(t,e,n,i,o){var s=i-e,r=t-n,a=t*(e-i)+e*(n-t),l=function(t){return[P(t,"x"),P(t,"y")]}(o),u=[s*l[0][0]+r*l[1][0],s*l[0][1]+r*l[1][1],s*l[0][2]+r*l[1][2],s*l[0][3]+r*l[1][3]+a],c=function(t,e,n,i){var o,s,r=e/t,a=n/t,l=i/t,u=(3*a-Math.pow(r,2))/9,c=(9*r*a-27*l-2*Math.pow(r,3))/54,h=Math.pow(u,3)+Math.pow(c,2),d=[];if(h>=0)o=x(c+Math.sqrt(h))*Math.pow(Math.abs(c+Math.sqrt(h)),1/3),s=x(c-Math.sqrt(h))*Math.pow(Math.abs(c-Math.sqrt(h)),1/3),d[0]=-r/3+(o+s),d[1]=-r/3-(o+s)/2,d[2]=-r/3-(o+s)/2,0!==Math.abs(Math.sqrt(3)*(o-s)/2)&&(d[1]=-1,d[2]=-1);else{var p=Math.acos(c/Math.sqrt(-Math.pow(u,3)));d[0]=2*Math.sqrt(-u)*Math.cos(p/3)-r/3,d[1]=2*Math.sqrt(-u)*Math.cos((p+2*Math.PI)/3)-r/3,d[2]=2*Math.sqrt(-u)*Math.cos((p+4*Math.PI)/3)-r/3}for(var f=0;f<3;f++)(d[f]<0||d[f]>1)&&(d[f]=-1);return d}.apply(null,u),h=[];if(null!=c)for(var d=0;d<3;d++){var p,f=c[d],g=Math.pow(f,2),m=Math.pow(f,3),v=[l[0][0]*m+l[0][1]*g+l[0][2]*f+l[0][3],l[1][0]*m+l[1][1]*g+l[1][2]*f+l[1][3]];p=n-t!=0?(v[0]-t)/(n-t):(v[1]-e)/(i-e),f>=0&&f<=1&&p>=0&&p<=1&&h.push(v)}return h};function P(t,e){return[-t[0][e]+3*t[1][e]+-3*t[2][e]+t[3][e],3*t[0][e]-6*t[1][e]+3*t[2][e],-3*t[0][e]+3*t[1][e],t[0][e]]}function x(t){return t<0?-1:t>0?1:0}var C=this.jsBezier={distanceFromCurve:r,gradientAtPoint:y,gradientAtPointAlongCurveFrom:function(t,e,n){var i=v(t,e,n);return i.location>1&&(i.location=1),i.location<0&&(i.location=0),y(t,i.location)},nearestPointOnCurve:function(t,e){var n=r(t,e);return{point:d(e,e.length-1,n.location,null,null),location:n.location}},pointOnCurve:f,pointAlongCurveFrom:function(t,e,n){return v(t,e,n).point},perpendicularToCurveAt:function(t,e,n,i){var o=v(t,e,i=null==i?0:i),s=y(t,o.location),r=Math.atan(-1/s),a=n/2*Math.sin(r),l=n/2*Math.cos(r);return[{x:o.point.x+l,y:o.point.y+a},{x:o.point.x-l,y:o.point.y-a}]},locationAlongCurveFrom:function(t,e,n){return v(t,e,n).location},getLength:function(t){var e=(new Date).getTime();if(m(t))return 0;for(var n=f(t,0),i=0,o=0,s=null;o<1;)s=f(t,o+=.005),i+=g(s,n),n=s;return console.log("length",(new Date).getTime()-e),i},lineIntersection:b,boxIntersection:function(t,e,n,i,o){var s=[];return s.push.apply(s,b(t,e,t+n,e,o)),s.push.apply(s,b(t+n,e,t+n,e+i,o)),s.push.apply(s,b(t+n,e+i,t,e+i,o)),s.push.apply(s,b(t,e+i,t,e,o)),s},boundingBoxIntersection:function(t,e){var n=[];return n.push.apply(n,b(t.x,t.y,t.x+t.w,t.y,e)),n.push.apply(n,b(t.x+t.w,t.y,t.x+t.w,t.y+t.h,e)),n.push.apply(n,b(t.x+t.w,t.y+t.h,t.x,t.y+t.h,e)),n.push.apply(n,b(t.x,t.y+t.h,t.x,t.y,e)),n},version:"0.9.0"};e.jsBezier=C}).call("undefined"!=typeof window?window:s),function(){var t=this.Biltong={version:"0.4.0"};e.Biltong=t;var n=function(t){return"[object Array]"===Object.prototype.toString.call(t)},i=function(t,e,i){return i(t=n(t)?t:[t.x,t.y],e=n(e)?e:[e.x,e.y])},o=t.gradient=function(t,e){return i(t,e,function(t,e){return e[0]==t[0]?e[1]>t[1]?1/0:-1/0:e[1]==t[1]?e[0]>t[0]?0:-0:(e[1]-t[1])/(e[0]-t[0])})},s=(t.normal=function(t,e){return-1/o(t,e)},t.lineLength=function(t,e){return i(t,e,function(t,e){return Math.sqrt(Math.pow(e[1]-t[1],2)+Math.pow(e[0]-t[0],2))})},t.quadrant=function(t,e){return i(t,e,function(t,e){return e[0]>t[0]?e[1]>t[1]?2:1:e[0]==t[0]?e[1]>t[1]?2:1:e[1]>t[1]?3:4})}),r=(t.theta=function(t,e){return i(t,e,function(t,e){var n=o(t,e),i=Math.atan(n),r=s(t,e);return 4!=r&&3!=r||(i+=Math.PI),i<0&&(i+=2*Math.PI),i})},t.intersects=function(t,e){var n=t.x,i=t.x+t.w,o=t.y,s=t.y+t.h,r=e.x,a=e.x+e.w,l=e.y,u=e.y+e.h;return n<=r&&r<=i&&o<=l&&l<=s||n<=a&&a<=i&&o<=l&&l<=s||n<=r&&r<=i&&o<=u&&u<=s||n<=a&&r<=i&&o<=u&&u<=s||r<=n&&n<=a&&l<=o&&o<=u||r<=i&&i<=a&&l<=o&&o<=u||r<=n&&n<=a&&l<=s&&s<=u||r<=i&&n<=a&&l<=s&&s<=u},t.encloses=function(t,e,n){var i=t.x,o=t.x+t.w,s=t.y,r=t.y+t.h,a=e.x,l=e.x+e.w,u=e.y,c=e.y+e.h,h=function(t,e,i,o){return n?t<=e&&i>=o:t<e&&i>o};return h(i,a,o,l)&&h(s,u,r,c)},[null,[1,-1],[1,1],[-1,1],[-1,-1]]),a=[null,[-1,-1],[-1,1],[1,1],[1,-1]];t.pointOnLine=function(t,e,n){var i=o(t,e),l=s(t,e),u=n>0?r[l]:a[l],c=Math.atan(i),h=Math.abs(n*Math.sin(c))*u[1],d=Math.abs(n*Math.cos(c))*u[0];return{x:t.x+d,y:t.y+h}},t.perpendicularLineTo=function(t,e,n){var i=o(t,e),s=Math.atan(-1/i),r=n/2*Math.sin(s),a=n/2*Math.cos(s);return[{x:e.x+a,y:e.y+r},{x:e.x-a,y:e.y-r}]}}.call("undefined"!=typeof window?window:s),function(){function t(t,e,n,i,o,s,r,a){return function(){var t=[];return Array.prototype.push.apply(t,arguments),t.item=function(t){return this[t]},t}(function(t,e,n,i,o,s,r,a){return new Touch({target:e,identifier:A(),pageX:n,pageY:i,screenX:o,screenY:s,clientX:r||o,clientY:a||s})}.apply(null,arguments))}var n=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},i=function(t){return"string"==typeof t||t.constructor===String?document.getElementById(t):t},o=function(t){return t.srcElement||t.target},s=function(t,e,n,i){if(i){if(void 0!==t.path&&t.path.indexOf)return{path:t.path,end:t.path.indexOf(n)};var o={path:[],end:-1},s=function(t){o.path.push(t),t===n?o.end=o.path.length-1:null!=t.parentNode&&s(t.parentNode)};return s(e),o}return{path:[e],end:1}},r=function(t,e){for(var n=0,i=t.length;n<i&&t[n]!=e;n++);n<t.length&&t.splice(n,1)},a=1,l=function(t,e,n){var i=a++;return t.__ta=t.__ta||{},t.__ta[e]=t.__ta[e]||{},t.__ta[e][i]=n,n.__tauid=i,i},u=function(t,e,i,r){if(null==t)return i;var a=t.split(","),l=function(r){l.__tauid=i.__tauid;var u=o(r),c=u,h=s(r,u,e,null!=t);if(-1!=h.end)for(var d=0;d<h.end;d++){c=h.path[d];for(var p=0;p<a.length;p++)n(c,a[p],e)&&i.apply(c,arguments)}};return c(i,r,l),l},c=function(t,e,n){t.__taExtra=t.__taExtra||[],t.__taExtra.push([e,n])},h=function(t,e,n,i){if(m&&y[e]){var o=u(i,t,n,y[e]);S(t,y[e],o,n)}"focus"===e&&null==t.getAttribute("tabindex")&&t.setAttribute("tabindex","1"),S(t,e,u(i,t,n,e),n)},d={tap:{touches:1,taps:1},dbltap:{touches:1,taps:2},contextmenu:{touches:2,taps:1}},p=function(t,e){return function(i,a,l,u){if("contextmenu"==a&&v)h(i,a,l,u);else{if(null==i.__taTapHandler){var c=i.__taTapHandler={tap:[],dbltap:[],contextmenu:[],down:!1,taps:0,downSelectors:[]},p=function(){c.down=!1},f=function(){c.taps=0};h(i,"mousedown",function(r){for(var a=o(r),l=s(r,a,i,null!=u),h=!1,d=0;d<l.end;d++){if(h)return;a=l.path[d];for(var g=0;g<c.downSelectors.length;g++)if(null==c.downSelectors[g]||n(a,c.downSelectors[g],i)){c.down=!0,setTimeout(p,t),setTimeout(f,e),h=!0;break}}}),h(i,"mouseup",function(t){if(c.down){var e,r,a=o(t);c.taps++;var l=E(t);for(var u in d)if(d.hasOwnProperty(u)){var h=d[u];if(h.touches===l&&(1===h.taps||h.taps===c.taps))for(var p=0;p<c[u].length;p++){r=s(t,a,i,null!=c[u][p][1]);for(var f=0;f<r.end;f++)if(e=r.path[f],null==c[u][p][1]||n(e,c[u][p][1],i)){c[u][p][0].apply(e,[t]);break}}}}})}i.__taTapHandler.downSelectors.push(u),i.__taTapHandler[a].push([l,u]),l.__taUnstore=function(){r(i.__taTapHandler[a],l)}}}},f=function(t,e,n,i){for(var o in n.__tamee[t])n.__tamee[t].hasOwnProperty(o)&&n.__tamee[t][o].apply(i,[e])},g=function(){var t=[];return function(e,i,s,r){if(!e.__tamee){e.__tamee={over:!1,mouseenter:[],mouseexit:[]};var a=function(i){var s=o(i);(null==r&&s==e&&!e.__tamee.over||n(s,r,e)&&(null==s.__tamee||!s.__tamee.over))&&(f("mouseenter",i,e,s),s.__tamee=s.__tamee||{},s.__tamee.over=!0,t.push(s))},c=function(i){for(var s=o(i),r=0;r<t.length;r++)s!=t[r]||n(i.relatedTarget||i.toElement,"*",s)||(s.__tamee.over=!1,t.splice(r,1),f("mouseexit",i,e,s))};S(e,"mouseover",u(r,e,a,"mouseover"),a),S(e,"mouseout",u(r,e,c,"mouseout"),c)}s.__taUnstore=function(){delete e.__tamee[i][s.__tauid]},l(e,i,s),e.__tamee[i][s.__tauid]=s}},m="ontouchstart"in document.documentElement||navigator.maxTouchPoints,v="onmousedown"in document.documentElement,y={mousedown:"touchstart",mouseup:"touchend",mousemove:"touchmove"},b=function(){var t=-1;if("Microsoft Internet Explorer"==navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),P=b>-1&&b<9,x=function(t,e){if(null==t)return[0,0];var n=j(t),i=_(n,0);return[i[e+"X"],i[e+"Y"]]},C=function(t){return null==t?[0,0]:P?[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop]:x(t,"page")},_=function(t,e){return t.item?t.item(e):t[e]},j=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},E=function(t){return j(t).length},S=function(t,e,n,i){if(l(t,e,n),i.__tauid=n.__tauid,t.addEventListener)t.addEventListener(e,n,!1);else if(t.attachEvent){var o=e+n.__tauid;t["e"+o]=n,t[o]=function(){t["e"+o]&&t["e"+o](window.event)},t.attachEvent("on"+e,t[o])}},w=function(t,e,n){null!=n&&D(t,function(){var o=i(this);if(function(t,e,n){if(t.__ta&&t.__ta[e]&&delete t.__ta[e][n.__tauid],n.__taExtra){for(var i=0;i<n.__taExtra.length;i++)w(t,n.__taExtra[i][0],n.__taExtra[i][1]);n.__taExtra.length=0}n.__taUnstore&&n.__taUnstore()}(o,e,n),null!=n.__tauid)if(o.removeEventListener)o.removeEventListener(e,n,!1),m&&y[e]&&o.removeEventListener(y[e],n,!1);else if(this.detachEvent){var s=e+n.__tauid;o[s]&&o.detachEvent("on"+e,o[s]),o[s]=null,o["e"+s]=null}n.__taTouchProxy&&w(t,n.__taTouchProxy[1],n.__taTouchProxy[0])})},D=function(t,e){if(null!=t){t="undefined"!=typeof Window&&"unknown"!=typeof t.top&&t==t.top?[t]:"string"!=typeof t&&null==t.tagName&&null!=t.length?t:"string"==typeof t?document.querySelectorAll(t):[t];for(var n=0;n<t.length;n++)e.apply(t[n])}},A=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"==t?e:3&e|8).toString(16)})};this.Mottle=function(e){var n=(e=e||{}).clickThreshold||250,s=e.dblClickThreshold||450,a=new g,l=new p(n,s),u=e.smartClicks,c=function(t,e,n,s){null!=n&&D(t,function(){var t=i(this);u&&"click"===e?function(t,e,n,i){null==t.__taSmartClicks&&(h(t,"mousedown",function(e){t.__tad=C(e)},i),h(t,"mouseup",function(e){t.__tau=C(e)},i),h(t,"click",function(e){if(t.__tad&&t.__tau&&t.__tad[0]===t.__tau[0]&&t.__tad[1]===t.__tau[1])for(var n=0;n<t.__taSmartClicks.length;n++)t.__taSmartClicks[n].apply(o(e),[e])},i),t.__taSmartClicks=[]);t.__taSmartClicks.push(n),n.__taUnstore=function(){r(t.__taSmartClicks,n)}}(t,0,n,s):"tap"===e||"dbltap"===e||"contextmenu"===e?l(t,e,n,s):"mouseenter"===e||"mouseexit"==e?a(t,e,n,s):h(t,e,n,s)})};this.remove=function(t){return D(t,function(){var t=i(this);if(t.__ta)for(var e in t.__ta)if(t.__ta.hasOwnProperty(e))for(var n in t.__ta[e])t.__ta[e].hasOwnProperty(n)&&w(t,e,t.__ta[e][n]);t.parentNode&&t.parentNode.removeChild(t)}),this},this.on=function(t,e,n,i){var o=arguments[0],s=4==arguments.length?arguments[2]:null,r=arguments[1],a=arguments[arguments.length-1];return c(o,r,a,s),this},this.off=function(t,e,n){return w(t,e,n),this},this.trigger=function(e,n,o,s){var r=v&&("undefined"==typeof MouseEvent||null==o||o.constructor===MouseEvent),a=m&&!v&&y[n]?y[n]:n,l=!(m&&!v&&y[n]),u=C(o),c=x(o,"screen"),h=function(t){return x(t,"client")}(o);return D(e,function(){var e,d=i(this);o=o||{screenX:c[0],screenY:c[1],clientX:h[0],clientY:h[1]};var p=function(t){s&&(t.payload=s)},f={TouchEvent:function(e){var n=t(window,d,0,u[0],u[1],c[0],c[1],h[0],h[1]);(e.initTouchEvent||e.initEvent)(a,!0,!0,window,null,c[0],c[1],h[0],h[1],!1,!1,!1,!1,n,n,n,1,0)},MouseEvents:function(t){t.initMouseEvent(a,!0,!0,window,0,c[0],c[1],h[0],h[1],!1,!1,!1,!1,1,d)}};if(document.createEvent){var g=!l&&!r&&m&&y[n]?"TouchEvent":"MouseEvents";e=document.createEvent(g),f[g](e),p(e),d.dispatchEvent(e)}else document.createEventObject&&((e=document.createEventObject()).eventType=e.eventName=a,e.screenX=c[0],e.screenY=c[1],e.clientX=h[0],e.clientY=h[1],p(e),d.fireEvent("on"+a,e))}),this}},this.Mottle.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.Mottle.pageLocation=C,this.Mottle.setForceTouchEvents=function(t){m=t},this.Mottle.setForceMouseEvents=function(t){v=t},this.Mottle.version="0.8.0",e.Mottle=this.Mottle}.call("undefined"==typeof window?s:window),function(){var t=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},n=function(t,e){var n=t.indexOf(e);-1!==n&&t.splice(n,1)},i=function(t){return null!=t&&("string"==typeof t||t.constructor===String)},o=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},s=function(t,e,n){if(o(e,n,t))return e;for(var i=e.parentNode;null!=i&&i!==t;){if(o(i,n,t))return i;i=i.parentNode}},r=function(){var t=-1;if("Microsoft Internet Explorer"===navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),a=r>-1&&r<9,l=9===r,u=function(t){if(a)return[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop];var e=h(t),n=c(e,0);return l?[n.pageX||n.clientX,n.pageY||n.clientY]:[n.pageX,n.pageY]},c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d={delegatedDraggable:"katavorio-delegated-draggable",draggable:"katavorio-draggable",droppable:"katavorio-droppable",drag:"katavorio-drag",selected:"katavorio-drag-selected",active:"katavorio-drag-active",hover:"katavorio-drag-hover",noSelect:"katavorio-drag-no-select",ghostProxy:"katavorio-ghost-proxy",clonedDrag:"katavorio-clone-drag"},p=["stop","start","drag","drop","over","out","beforeStart"],f=function(){},g=function(){return!0},m=function(t,e,n){for(var i=0;i<t.length;i++)t[i]!=n&&e(t[i])},v=function(t,e,n,i){m(t,function(t){t.setActive(e),e&&t.updatePosition(),n&&t.setHover(i,e)})},y=function(t,e){if(null!=t){t=i(t)||null!=t.tagName||null==t.length?[t]:t;for(var n=0;n<t.length;n++)e.apply(t[n],[t[n]])}},b=function(t){t.stopPropagation?(t.stopPropagation(),t.preventDefault()):t.returnValue=!1},P=function(t,e,n,i){this.params=e||{},this.el=t,this.params.addClass(this.el,this._class),this.uuid=E();var o=!0;return this.setEnabled=function(t){o=t},this.isEnabled=function(){return o},this.toggleEnabled=function(){o=!o},this.setScope=function(t){this.scopes=t?t.split(/\s+/):[i]},this.addScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.removeScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){delete e[t]}),this.scopes=[],e)this.scopes.push(n)},this.toggleScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]?delete e[t]:e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.setScope(e.scope),this.k=e.katavorio,e.katavorio},x=function(){return!0},C=function(){return!1},_=function(t,e,n,r){this._class=n.draggable;var a=P.apply(this,arguments);this.rightButtonCanDrag=this.params.rightButtonCanDrag;var l,c,h,p,f,m,y=[0,0],_=null,j=null,w=[0,0],D=!1,A=[0,0],I=!1!==this.params.consumeStartEvent,k=this.el,O=this.params.clone,M=(this.params.scroll,!1!==e.multipleDrop),T=!1,F=null,L=[],N=null,R=e.ghostProxyParent;if(l=!0===e.ghostProxy?x:e.ghostProxy&&"function"==typeof e.ghostProxy?e.ghostProxy:function(t,e){return!(!N||!N.useGhostProxy)&&N.useGhostProxy(t,e)},c=e.makeGhostProxy?e.makeGhostProxy:function(t){return N&&N.makeGhostProxy?N.makeGhostProxy(t):t.cloneNode(!0)},e.selector){var G=t.getAttribute("katavorio-draggable");null==G&&(G=""+(new Date).getTime(),t.setAttribute("katavorio-draggable",G)),L.push(e)}var B,H=e.snapThreshold,U=function(t,e,n,i,o){var s=e*Math.floor(t[0]/e),r=s+e,a=Math.abs(t[0]-s)<=i?s:Math.abs(r-t[0])<=i?r:t[0],l=n*Math.floor(t[1]/n),u=l+n;return[a,Math.abs(t[1]-l)<=o?l:Math.abs(u-t[1])<=o?u:t[1]]};this.posses=[],this.posseRoles={},this.toGrid=function(t){if(null==this.params.grid)return t;var e=this.params.grid?this.params.grid[0]/2:H||5,n=this.params.grid?this.params.grid[1]/2:H||5;return U(t,this.params.grid[0],this.params.grid[1],e,n)},this.snap=function(t,e){if(null!=k){t=t||(this.params.grid?this.params.grid[0]:10),e=e||(this.params.grid?this.params.grid[1]:10);var n=this.params.getPosition(k),i=this.params.grid?this.params.grid[0]/2:H,o=this.params.grid?this.params.grid[1]/2:H,s=U(n,t,e,i,o);return this.params.setPosition(k,s),s}},this.setUseGhostProxy=function(t){l=t?x:C};var X=function(t){return!1===e.allowNegative?[Math.max(0,t[0]),Math.max(0,t[1])]:t},Y=function(t){B="function"==typeof t?t:t?function(t,e,n,i){return X([Math.max(0,Math.min(n.w-i[0],t[0])),Math.max(0,Math.min(n.h-i[1],t[1]))])}.bind(this):function(t){return X(t)}}.bind(this);Y("function"==typeof this.params.constrain?this.params.constrain:this.params.constrain||this.params.containment),this.setConstrain=function(t){Y(t)};var z;this.setRevert=function(t){z=t},this.params.revert&&(z=this.params.revert);var $={},W=this.setFilter=function(e,n){if(e){var s="function"==typeof(r=e)?(r._katavorioId=E(),r._katavorioId):r;$[s]=[function(n){var s,r=n.srcElement||n.target;return i(e)?s=o(r,e,t):"function"==typeof e&&(s=e(n,t)),s},!1!==n]}var r};this.addFilter=W,this.removeFilter=function(t){var e="function"==typeof t?t._katavorioId:t;delete $[e]};this.clearAllFilters=function(){$={}},this.canDrag=this.params.canDrag||g;var V,q=[],J=[];this.addSelector=function(t){t.selector&&L.push(t)},this.downListener=function(t){var e,i,r,l,c,h,p,f,g;if(!t.defaultPrevented&&((this.rightButtonCanDrag||3!==t.which&&2!==t.button)&&this.isEnabled()&&this.canDrag()))if(function(t){for(var e in $){var n=$[e],i=n[0](t);if(n[1]&&(i=!i),!i)return!1}return!0}(t)&&function(t,e,n){var i=t.srcElement||t.target;return!o(i,n.getInputFilterSelector(),e)}(t,this.el,this.k)){if(N=null,F=null,L.length>0){var m=function(t,e,n){for(var i=null,r=e.getAttribute("katavorio-draggable"),a=null!=r?"[katavorio-draggable='"+r+"'] ":"",l=0;l<t.length;l++)if(null!=(i=s(e,n,a+t[l].selector))){if(t[l].filter){var u=o(n,t[l].filter,i);if(!0===t[l].filterExclude&&!u||u)return null}return[t[l],i]}return null}(L,this.el,t.target||t.srcElement);if(null!=m&&(N=m[0],F=m[1]),null==F)return}else F=this.el;if(O)if(k=F.cloneNode(!0),this.params.addClass(k,d.clonedDrag),k.setAttribute("id",null),k.style.position="absolute",null!=this.params.parent){var v=this.params.getPosition(this.el);k.style.left=v[0]+"px",k.style.top=v[1]+"px",this.params.parent.appendChild(k)}else{var P=(e=F.getBoundingClientRect(),i=document.body,r=document.documentElement,l=window.pageYOffset||r.scrollTop||i.scrollTop,c=window.pageXOffset||r.scrollLeft||i.scrollLeft,h=r.clientTop||i.clientTop||0,p=r.clientLeft||i.clientLeft||0,f=e.top+l-h,g=e.left+c-p,{top:Math.round(f),left:Math.round(g)});k.style.left=P.left+"px",k.style.top=P.top+"px",document.body.appendChild(k)}else k=F;I&&b(t),y=u(t),k&&k.parentNode&&(A=[k.parentNode.scrollLeft,k.parentNode.scrollTop]),this.params.bind(document,"mousemove",this.moveListener),this.params.bind(document,"mouseup",this.upListener),a.markSelection(this),a.markPosses(this),this.params.addClass(document.body,n.noSelect),Q("beforeStart",{el:this.el,pos:_,e:t,drag:this})}else this.params.consumeFilteredEvents&&b(t)}.bind(this),this.moveListener=function(t){if(y){if(!D)if(!1!==Q("start",{el:this.el,pos:_,e:t,drag:this})){if(!y)return;this.mark(!0),D=!0}else this.abort();if(y){J.length=0;var e=u(t),n=e[0]-y[0],i=e[1]-y[1],o=this.params.ignoreZoom?1:a.getZoom();k&&k.parentNode&&(n+=k.parentNode.scrollLeft-A[0],i+=k.parentNode.scrollTop-A[1]),n/=o,i/=o,this.moveBy(n,i,t),a.updateSelection(n,i,this),a.updatePosses(n,i,this)}}}.bind(this),this.upListener=function(t){y&&(y=null,this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.params.removeClass(document.body,n.noSelect),this.unmark(t),a.unmarkSelection(this,t),a.unmarkPosses(this,t),this.stop(t),a.notifyPosseDragStop(this,t),D=!1,J.length=0,O?(k&&k.parentNode&&k.parentNode.removeChild(k),k=null):z&&!0===z(k,this.params.getPosition(k))&&(this.params.setPosition(k,_),Q("revert",k)))}.bind(this),this.getFilters=function(){return $},this.abort=function(){null!=y&&this.upListener()},this.getDragElement=function(t){return t?F||this.el:k||this.el};var Z={start:[],drag:[],stop:[],over:[],out:[],beforeStart:[],revert:[]};e.events.start&&Z.start.push(e.events.start),e.events.beforeStart&&Z.beforeStart.push(e.events.beforeStart),e.events.stop&&Z.stop.push(e.events.stop),e.events.drag&&Z.drag.push(e.events.drag),e.events.revert&&Z.revert.push(e.events.revert),this.on=function(t,e){Z[t]&&Z[t].push(e)},this.off=function(t,e){if(Z[t]){for(var n=[],i=0;i<Z[t].length;i++)Z[t][i]!==e&&n.push(Z[t][i]);Z[t]=n}};var K,Q=function(t,e){var n=null;if(N&&N[t])n=N[t](e);else if(Z[t])for(var i=0;i<Z[t].length;i++)try{var o=Z[t][i](e);null!=o&&(n=o)}catch(t){}return n};this.notifyStart=function(t){Q("start",{el:this.el,pos:this.params.getPosition(k),e:t,drag:this})},this.stop=function(t,e){if(e||D){var n=[],i=a.getSelection(),o=this.params.getPosition(k);if(i.length>0)for(var s=0;s<i.length;s++){var r=this.params.getPosition(i[s].el);n.push([i[s].el,{left:r[0],top:r[1]},i[s]])}else n.push([k,{left:o[0],top:o[1]},this]);Q("stop",{el:k,pos:K||o,finalPos:o,e:t,drag:this,selection:n})}},this.mark=function(t){var e;_=this.params.getPosition(k),j=this.params.getPosition(k,!0),w=[j[0]-_[0],j[1]-_[1]],this.size=this.params.getSize(k),q=a.getMatchingDroppables(this),v(q,!0,!1,this),this.params.addClass(k,this.params.dragClass||n.drag),e=this.params.getConstrainingRectangle?this.params.getConstrainingRectangle(k):this.params.getSize(k.parentNode),V={w:e[0],h:e[1]},f=0,m=0,t&&a.notifySelectionDragStart(this)},this.unmark=function(t,i){if(v(q,!1,!0,this),T&&l(F,k)?(K=[k.offsetLeft-f,k.offsetTop-m],k.parentNode.removeChild(k),k=F):K=null,this.params.removeClass(k,this.params.dragClass||n.drag),q.length=0,T=!1,!i){J.length>0&&K&&e.setPosition(F,K),J.sort(S);for(var o=0;o<J.length;o++){if(!0===J[o].drop(this,t))break}}},this.moveBy=function(t,n,i){J.length=0;var o=this.toGrid([_[0]+t,_[1]+n]),s=function(t,e,n,i){return null!=N&&N.constrain&&"function"==typeof N.constrain?N.constrain(t,e,n,i):B(t,e,n,i)}(o,k,V,this.size);if(l(this.el,k))if(o[0]!==s[0]||o[1]!==s[1]){if(!T){var r=c(F);e.addClass(r,d.ghostProxy),R?(R.appendChild(r),h=e.getPosition(F.parentNode,!0),p=e.getPosition(e.ghostProxyParent,!0),f=h[0]-p[0],m=h[1]-p[1]):F.parentNode.appendChild(r),k=r,T=!0}s=o}else T&&(k.parentNode.removeChild(k),k=F,T=!1,h=null,p=null,f=0,m=0);var a={x:s[0],y:s[1],w:this.size[0],h:this.size[1]},u={x:a.x+w[0],y:a.y+w[1],w:a.w,h:a.h},g=null;this.params.setPosition(k,[s[0]+f,s[1]+m]);for(var v=0;v<q.length;v++){var y={x:q[v].pagePosition[0],y:q[v].pagePosition[1],w:q[v].size[0],h:q[v].size[1]};this.params.intersects(u,y)&&(M||null==g||g===q[v].el)&&q[v].canDrop(this)?(g||(g=q[v].el),J.push(q[v]),q[v].setHover(this,!0,i)):q[v].isHover()&&q[v].setHover(this,!1,i)}Q("drag",{el:this.el,pos:s,e:i,drag:this})},this.destroy=function(){this.params.unbind(this.el,"mousedown",this.downListener),this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.downListener=null,this.upListener=null,this.moveListener=null},this.params.bind(this.el,"mousedown",this.downListener),this.params.handle?W(this.params.handle,!1):W(this.params.filter,this.params.filterExclude)},j=function(t,e,n,i){this._class=n.droppable,this.params=e||{},this.rank=e.rank||0,this._activeClass=this.params.activeClass||n.active,this._hoverClass=this.params.hoverClass||n.hover,P.apply(this,arguments);var o=!1;this.allowLoopback=!1!==this.params.allowLoopback,this.setActive=function(t){this.params[t?"addClass":"removeClass"](this.el,this._activeClass)},this.updatePosition=function(){this.position=this.params.getPosition(this.el),this.pagePosition=this.params.getPosition(this.el,!0),this.size=this.params.getSize(this.el)},this.canDrop=this.params.canDrop||function(t){return!0},this.isHover=function(){return o},this.setHover=function(t,e,n){(e||null==this.el._katavorioDragHover||this.el._katavorioDragHover===t.el._katavorio)&&(this.params[e?"addClass":"removeClass"](this.el,this._hoverClass),this.el._katavorioDragHover=e?t.el._katavorio:null,o!==e&&this.params.events[e?"over":"out"]({el:this.el,e:n,drag:t,drop:this}),o=e)},this.drop=function(t,e){return this.params.events.drop({drag:t,e:e,drop:this})},this.destroy=function(){this._class=null,this._activeClass=null,this._hoverClass=null,o=null}},E=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"===t?e:3&e|8).toString(16)})},S=function(t,e){return t.rank<e.rank?1:t.rank>e.rank?-1:0},w=function(t){return null==t?null:null==(t="string"==typeof t||t.constructor===String?document.getElementById(t):t)?null:(t._katavorio=t._katavorio||E(),t)};this.Katavorio=function(e){var o=[],s={};this._dragsByScope={},this._dropsByScope={};var r=1,a=function(t,e){y(t,function(t){for(var n=0;n<t.scopes.length;n++)e[t.scopes[n]]=e[t.scopes[n]]||[],e[t.scopes[n]].push(t)})},l=function(t,n){var i=0;return y(t,function(t){for(var o=0;o<t.scopes.length;o++)if(n[t.scopes[o]]){var s=e.indexOf(n[t.scopes[o]],t);-1!==s&&(n[t.scopes[o]].splice(s,1),i++)}}),i>0},u=(this.getMatchingDroppables=function(t){for(var e=[],n={},i=0;i<t.scopes.length;i++){var o=this._dropsByScope[t.scopes[i]];if(o)for(var s=0;s<o.length;s++)!o[s].canDrop(t)||n[o[s].uuid]||!o[s].allowLoopback&&o[s].el===t.el||(n[o[s].uuid]=!0,e.push(o[s]))}return e.sort(S),e},function(t){t=t||{};var n,i={events:{}};for(n in e)i[n]=e[n];for(n in t)i[n]=t[n];for(n=0;n<p.length;n++)i.events[p[n]]=t[p[n]]||f;return i.katavorio=this,i}.bind(this)),c=function(t,e){for(var n=0;n<p.length;n++)e[p[n]]&&t.on(p[n],e[p[n]])}.bind(this),h={},g=e.css||{},v=e.scope||"katavorio-drag-scope";for(var b in d)h[b]=d[b];for(var b in g)h[b]=g[b];var P=e.inputFilterSelector||"input,textarea,select,button,option";this.getInputFilterSelector=function(){return P},this.setInputFilterSelector=function(t){return P=t,this},this.draggable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t)))if(null==t._katavorioDrag){var o=u(n);t._katavorioDrag=new _(t,o,h,v),a(t._katavorioDrag,this._dragsByScope),i.push(t._katavorioDrag),e.addClass(t,o.selector?h.delegatedDraggable:h.draggable)}else c(t._katavorioDrag,n)}.bind(this)),i},this.droppable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t))){var o=new j(t,u(n),h,v);t._katavorioDrop=t._katavorioDrop||[],t._katavorioDrop.push(o),a(o,this._dropsByScope),i.push(o),e.addClass(t,h.droppable)}}.bind(this)),i},this.select=function(t){return y(t,function(){var t=w(this);t&&t._katavorioDrag&&(s[t._katavorio]||(o.push(t._katavorioDrag),s[t._katavorio]=[t,o.length-1],e.addClass(t,h.selected)))}),this},this.deselect=function(t){return y(t,function(){var t=w(this);if(t&&t._katavorio&&s[t._katavorio]){for(var n=[],i=0;i<o.length;i++)o[i].el!==t&&n.push(o[i]);o=n,delete s[t._katavorio],e.removeClass(t,h.selected)}}),this},this.deselectAll=function(){for(var t in s){var n=s[t];e.removeClass(n[0],h.selected)}o.length=0,s={}},this.markSelection=function(t){m(o,function(t){t.mark()},t)},this.markPosses=function(t){t.posses&&y(t.posses,function(e){t.posseRoles[e]&&A[e]&&m(A[e].members,function(t){t.mark()},t)})},this.unmarkSelection=function(t,e){m(o,function(t){t.unmark(e)},t)},this.unmarkPosses=function(t,e){t.posses&&y(t.posses,function(n){t.posseRoles[n]&&A[n]&&m(A[n].members,function(t){t.unmark(e,!0)},t)})},this.getSelection=function(){return o.slice(0)},this.updateSelection=function(t,e,n){m(o,function(n){n.moveBy(t,e)},n)};var x=function(t,e){e.posses&&y(e.posses,function(n){e.posseRoles[n]&&A[n]&&m(A[n].members,function(e){t(e)},e)})};this.updatePosses=function(t,e,n){x(function(n){n.moveBy(t,e)},n)},this.notifyPosseDragStop=function(t,e){x(function(t){t.stop(e,!0)},t)},this.notifySelectionDragStop=function(t,e){m(o,function(t){t.stop(e,!0)},t)},this.notifySelectionDragStart=function(t,e){m(o,function(t){t.notifyStart(e)},t)},this.setZoom=function(t){r=t},this.getZoom=function(){return r};var C=function(t,e,n,i){y(t,function(t){l(t,n),t[i](e),a(t,n)})};y(["set","add","remove","toggle"],function(t){this[t+"Scope"]=function(e,n){C(e._katavorioDrag,n,this._dragsByScope,t+"Scope"),C(e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this),this[t+"DragScope"]=function(e,n){C(e.constructor===_?e:e._katavorioDrag,n,this._dragsByScope,t+"Scope")}.bind(this),this[t+"DropScope"]=function(e,n){C(e.constructor===j?e:e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this)}.bind(this)),this.snapToGrid=function(t,e){for(var n in this._dragsByScope)m(this._dragsByScope[n],function(n){n.snap(t,e)})},this.getDragsForScope=function(t){return this._dragsByScope[t]},this.getDropsForScope=function(t){return this._dropsByScope[t]};var E=function(t,e,n){if((t=w(t))[e]){var i=o.indexOf(t[e]);i>=0&&o.splice(i,1),l(t[e],n)&&y(t[e],function(t){t.destroy()}),delete t[e]}},D=function(t,e,n,i){(t=w(t))[e]&&t[e].off(n,i)};this.elementRemoved=function(t){t._katavorioDrag&&this.destroyDraggable(t),t._katavorioDrop&&this.destroyDroppable(t)},this.destroyDraggable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrag",this._dragsByScope):D(t,"_katavorioDrag",e,n)},this.destroyDroppable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrop",this._dropsByScope):D(t,"_katavorioDrop",e,n)},this.reset=function(){this._dragsByScope={},this._dropsByScope={},o=[],s={},A={}};var A={},I=function(e,n,o){var s,r=i(n)?n:n.id,a=!!i(n)||!1!==n.active,l=A[r]||(s={name:r,members:[]},A[r]=s,s);return y(e,function(e){if(e._katavorioDrag){if(o&&null!=e._katavorioDrag.posseRoles[l.name])return;t(l.members,e._katavorioDrag),t(e._katavorioDrag.posses,l.name),e._katavorioDrag.posseRoles[l.name]=a}}),l};this.addToPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i]));return 1===n.length?n[0]:n},this.setPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i],!0).name);return y(t,function(t){if(t._katavorioDrag){var e=function(t,e){for(var n=[],i=0;i<t.length;i++)-1===e.indexOf(t[i])&&n.push(t[i]);return n}(t._katavorioDrag.posses,n);Array.prototype.push.apply([],t._katavorioDrag.posses);for(var i=0;i<e.length;i++)this.removeFromPosse(t,e[i])}}.bind(this)),1===n.length?n[0]:n},this.removeFromPosse=function(t,e){if(arguments.length<2)throw new TypeError("No posse id provided for remove operation");for(var i=1;i<arguments.length;i++)e=arguments[i],y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var i=t._katavorioDrag;y(e,function(t){n(A[t].members,i),n(i.posses,t),delete i.posseRoles[t]})}})},this.removeFromAllPosses=function(t){y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var e=t._katavorioDrag;y(e.posses,function(t){n(A[t].members,e)}),e.posses.length=0,e.posseRoles={}}})},this.setPosseState=function(t,e,n){var i=A[e];i&&y(t,function(t){t._katavorioDrag&&t._katavorioDrag.posses&&(t._katavorioDrag.posseRoles[i.name]=n)})}},this.Katavorio.version="1.0.0",e.Katavorio=this.Katavorio}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil=this.jsPlumbUtil||{};var t=this.jsPlumbUtil;function n(t){return"[object Array]"===Object.prototype.toString.call(t)}function i(t){return"string"==typeof t}function o(t){return"boolean"==typeof t}function s(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function r(t){return"[object Date]"===Object.prototype.toString.call(t)}function a(t){return"[object Function]"===Object.prototype.toString.call(t)}function l(t){if(i(t))return""+t;if(o(t))return!!t;if(r(t))return new Date(t.getTime());if(a(t))return t;if(n(t)){for(var e=[],u=0;u<t.length;u++)e.push(l(t[u]));return e}if(s(t)){var c={};for(var h in t)c[h]=l(t[h]);return c}return t}function u(t,e,r,a){var u,c,h={},d={};for(r=r||[],a=a||[],c=0;c<r.length;c++)h[r[c]]=!0;for(c=0;c<a.length;c++)d[a[c]]=!0;var p=l(t);for(c in e)if(null==p[c]||d[c])p[c]=e[c];else if(i(e[c])||o(e[c]))h[c]?((u=[]).push.apply(u,n(p[c])?p[c]:[p[c]]),u.push.apply(u,o(e[c])?e[c]:[e[c]]),p[c]=u):p[c]=e[c];else if(n(e[c]))u=[],n(p[c])&&u.push.apply(u,p[c]),u.push.apply(u,e[c]),p[c]=u;else if(s(e[c]))for(var f in s(p[c])||(p[c]={}),e[c])p[c][f]=e[c][f];return p}function c(t,e){if(t)for(var n=0;n<t.length;n++)if(e(t[n]))return n;return-1}function h(t,e){var n=t.indexOf(e);return n>-1&&t.splice(n,1),-1!==n}function d(t,e,n,i){var o=t[e];return null==o&&(o=[],t[e]=o),o[i?"unshift":"push"](n),o}e.jsPlumbUtil=t,t.isArray=n,t.isNumber=function(t){return"[object Number]"===Object.prototype.toString.call(t)},t.isString=i,t.isBoolean=o,t.isNull=function(t){return null==t},t.isObject=s,t.isDate=r,t.isFunction=a,t.isNamedFunction=function(t){return a(t)&&null!=t.name&&t.name.length>0},t.isEmpty=function(t){for(var e in t)if(t.hasOwnProperty(e))return!1;return!0},t.clone=l,t.merge=u,t.replace=function(t,e,n){if(null!=t){var i=t;return e.replace(/([^\.])+/g,function(t,e,o,s){var r=t.match(/([^\[0-9]+){1}(\[)([0-9+])/),a=function(){return i[r[1]]||(i[r[1]]=[],i[r[1]])};if(o+t.length>=s.length)r?a()[r[3]]=n:i[t]=n;else if(r){var l=a();i=l[r[3]]||(l[r[3]]={},l[r[3]])}else i=i[t]||(i[t]={},i[t]);return""}),t}},t.functionChain=function(t,e,n){for(var i=0;i<n.length;i++){var o=n[i][0][n[i][1]].apply(n[i][0],n[i][2]);if(o===e)return o}return t},t.populate=function(t,e,o,r){var l=function(t){if(null!=t){if(i(t))return function(t){var n=t.match(/(\${.*?})/g);if(null!=n)for(var i=0;i<n.length;i++){var o=e[n[i].substring(2,n[i].length-1)]||"";null!=o&&(t=t.replace(n[i],o))}return t}(t);if(!a(t)||r||null!=o&&0!==(t.name||"").indexOf(o)){if(n(t)){for(var u=[],c=0;c<t.length;c++)u.push(l(t[c]));return u}if(s(t)){var h={};for(var d in t)h[d]=l(t[d]);return h}return t}return t(e)}};return l(t)},t.findWithFunction=c,t.removeWithFunction=function(t,e){var n=c(t,e);return n>-1&&t.splice(n,1),-1!==n},t.remove=h,t.addWithFunction=function(t,e,n){-1===c(t,n)&&t.push(e)},t.addToList=d,t.suggest=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},t.extend=function(t,e,i){var o;e=n(e)?e:[e];var s=function(e){for(var n=e.__proto__;null!=n;)if(null!=n.prototype){for(var i in n.prototype)n.prototype.hasOwnProperty(i)&&!t.prototype.hasOwnProperty(i)&&(t.prototype[i]=n.prototype[i]);n=n.prototype.__proto__}else n=null};for(o=0;o<e.length;o++){for(var r in e[o].prototype)e[o].prototype.hasOwnProperty(r)&&!t.prototype.hasOwnProperty(r)&&(t.prototype[r]=e[o].prototype[r]);s(e[o])}var a=function(t,n){return function(){for(o=0;o<e.length;o++)e[o].prototype[t]&&e[o].prototype[t].apply(this,arguments);return n.apply(this,arguments)}},l=function(e){for(var n in e)t.prototype[n]=a(n,e[n])};if(arguments.length>2)for(o=2;o<arguments.length;o++)l(arguments[o]);return t};for(var p=[],f=0;f<256;f++)p[f]=(f<16?"0":"")+f.toString(16);function g(){var t=4294967295*Math.random()|0,e=4294967295*Math.random()|0,n=4294967295*Math.random()|0,i=4294967295*Math.random()|0;return p[255&t]+p[t>>8&255]+p[t>>16&255]+p[t>>24&255]+"-"+p[255&e]+p[e>>8&255]+"-"+p[e>>16&15|64]+p[e>>24&255]+"-"+p[63&n|128]+p[n>>8&255]+"-"+p[n>>16&255]+p[n>>24&255]+p[255&i]+p[i>>8&255]+p[i>>16&255]+p[i>>24&255]}function m(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];if(t.logEnabled&&"undefined"!=typeof console)try{var i=arguments[arguments.length-1];console.log(i)}catch(t){}}t.uuid=g,t.fastTrim=function(t){if(null==t)return null;for(var e=t.replace(/^\s\s*/,""),n=/\s/,i=e.length;n.test(e.charAt(--i)););return e.slice(0,i+1)},t.each=function(t,e){t=null==t.length||"string"==typeof t?[t]:t;for(var n=0;n<t.length;n++)e(t[n])},t.map=function(t,e){for(var n=[],i=0;i<t.length;i++)n.push(e(t[i]));return n},t.mergeWithParents=function(t,e,n){n=n||"parent";var i=function(t){return t?e[t]:null},o=function(t){return t?i(t[n]):null},s=function(t,e){if(null==t)return e;var n=["anchor","anchors","cssClass","connector","paintStyle","hoverPaintStyle","endpoint","endpoints"];"override"===e.mergeStrategy&&Array.prototype.push.apply(n,["events","overlays"]);var i=u(t,e,[],n);return s(o(t),i)},r=function(t){if(null==t)return{};if("string"==typeof t)return i(t);if(t.length){for(var e=!1,n=0,o=void 0;!e&&n<t.length;)(o=r(t[n]))?e=!0:n++;return o}},a=r(t);return a?s(o(a),a):{}},t.logEnabled=!0,t.log=m,t.wrap=function(t,e,n){return function(){var i=null;try{null!=e&&(i=e.apply(this,arguments))}catch(t){m("jsPlumb function failed : "+t)}if(null!=t&&(null==n||i!==n))try{i=t.apply(this,arguments)}catch(t){m("wrapped function failed : "+t)}return i}};var v=function(){return function(){var t=this;this._listeners={},this.eventsSuspended=!1,this.tick=!1,this.eventsToDieOn={ready:!0},this.queue=[],this.bind=function(e,n,i){var o=function(e){d(t._listeners,e,n,i),n.__jsPlumb=n.__jsPlumb||{},n.__jsPlumb[g()]=e};if("string"==typeof e)o(e);else if(null!=e.length)for(var s=0;s<e.length;s++)o(e[s]);return t},this.fire=function(t,e,n){if(this.tick)this.queue.unshift(arguments);else{if(this.tick=!0,!this.eventsSuspended&&this._listeners[t]){var i=this._listeners[t].length,o=0,s=!1,r=null;if(!this.shouldFireEvent||this.shouldFireEvent(t,e,n))for(;!s&&o<i&&!1!==r;){if(this.eventsToDieOn[t])this._listeners[t][o].apply(this,[e,n]);else try{r=this._listeners[t][o].apply(this,[e,n])}catch(e){m("jsPlumb: fire failed for event "+t+" : "+e)}o++,null!=this._listeners&&null!=this._listeners[t]||(s=!0)}}this.tick=!1,this._drain()}return this},this._drain=function(){var e=t.queue.pop();e&&t.fire.apply(t,e)},this.unbind=function(t,e){if(0===arguments.length)this._listeners={};else if(1===arguments.length){if("string"==typeof t)delete this._listeners[t];else if(t.__jsPlumb){var n=void 0;for(var i in t.__jsPlumb)n=t.__jsPlumb[i],h(this._listeners[n]||[],t)}}else 2===arguments.length&&h(this._listeners[t]||[],e);return this},this.getListener=function(e){return t._listeners[e]},this.setSuspendEvents=function(e){t.eventsSuspended=e},this.isSuspendEvents=function(){return t.eventsSuspended},this.silently=function(e){t.setSuspendEvents(!0);try{e()}catch(t){m("Cannot execute silent function "+t)}t.setSuspendEvents(!1)},this.cleanupListeners=function(){for(var e in t._listeners)t._listeners[e]=null}}}();function y(t,e,n){var i=[t[0]-e[0],t[1]-e[1]],o=Math.cos(n/360*Math.PI*2),s=Math.sin(n/360*Math.PI*2);return[i[0]*o-i[1]*s+e[0],i[1]*o+i[0]*s+e[1],o,s]}t.EventGenerator=v,t.rotatePoint=y,t.rotateAnchorOrientation=function(t,e){var n=y(t,[0,0],e);return[Math.round(n[0]),Math.round(n[1])]}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil.matchesSelector=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},this.jsPlumbUtil.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.jsPlumbUtil.sizeElement=function(t,e,n,i,o){t&&(t.style.height=o+"px",t.height=o,t.style.width=i+"px",t.width=i,t.style.left=e+"px",t.style.top=n+"px")}}.call("undefined"!=typeof window?window:s),function(){var t={deriveAnchor:function(t,e,n,i){return{top:["TopRight","TopLeft"],bottom:["BottomRight","BottomLeft"]}[t][e]}},e=function(t,e){this.count=0,this.instance=t,this.lists={},this.options=e||{},this.instance.addList=function(t,e){return this.listManager.addList(t,e)},this.instance.removeList=function(t){this.listManager.removeList(t)},this.instance.bind("manageElement",function(t){for(var e=this.instance.getSelector(t.el,"[jtk-scrollable-list]"),n=0;n<e.length;n++)this.addList(e[n])}.bind(this)),this.instance.bind("unmanageElement",function(t){this.removeList(t.el)}),this.instance.bind("connection",function(t,e){null==e&&(this._maybeUpdateParentList(t.source),this._maybeUpdateParentList(t.target))}.bind(this))};this.jsPlumbListManager=e,e.prototype={addList:function(e,i){var o=this.instance.extend({},t);this.instance.extend(o,this.options),i=this.instance.extend(o,i||{});var s=[this.instance.getInstanceIndex(),this.count++].join("_");this.lists[s]=new n(this.instance,e,i,s)},removeList:function(t){var e=this.lists[t._jsPlumbList];e&&(e.destroy(),delete this.lists[t._jsPlumbList])},_maybeUpdateParentList:function(t){for(var e=t.parentNode,n=this.instance.getContainer();null!=e&&e!==n;){if(null!=e._jsPlumbList&&null!=this.lists[e._jsPlumbList])return void e._jsPlumbScrollHandler();e=e.parentNode}}};var n=function(t,e,n,i){function o(t,e,i,o){return n.anchor?n.anchor:n.deriveAnchor(t,e,i,o)}function s(t,e,i,o){return n.deriveEndpoint?n.deriveEndpoint(t,e,i,o):n.endpoint?n.endpoint:i.type}e._jsPlumbList=i;var r=function(n){for(var i=t.getSelector(e,".jtk-managed"),r=t.getId(e),a=0;a<i.length;a++){if(i[a].offsetTop<e.scrollTop)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("top",0,n.endpoints[0],n)},function(){return o("top",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("top",1,n.endpoints[1],n)},function(){return o("top",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a].offsetTop+i[a].offsetHeight>e.scrollTop+e.offsetHeight)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("bottom",0,n.endpoints[0],n)},function(){return o("bottom",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("bottom",1,n.endpoints[1],n)},function(){return o("bottom",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a]._jsPlumbProxies){for(var l=0;l<i[a]._jsPlumbProxies.length;l++)t.unproxyConnection(i[a]._jsPlumbProxies[l][0],i[a]._jsPlumbProxies[l][1],r);delete i[a]._jsPlumbProxies}t.revalidate(i[a])}!function(e){for(var n=e.parentNode,i=t.getContainer();null!=n&&n!==i;){if(t.hasClass(n,"jtk-managed"))return void t.recalculateOffsets(n);n=n.parentNode}}(e)};t.setAttribute(e,"jtk-scrollable-list","true"),e._jsPlumbScrollHandler=r,t.on(e,"scroll",r),r(),this.destroy=function(){t.off(e,"scroll",r),delete e._jsPlumbScrollHandler;for(var n=t.getSelector(e,".jtk-managed"),i=t.getId(e),o=0;o<n.length;o++)if(n[o]._jsPlumbProxies){for(var s=0;s<n[o]._jsPlumbProxies.length;s++)t.unproxyConnection(n[o]._jsPlumbProxies[s][0],n[o]._jsPlumbProxies[s][1],i);delete n[o]._jsPlumbProxies}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,n=t.jsPlumbUtil,i=function(t){if(t._jsPlumb.paintStyle&&t._jsPlumb.hoverPaintStyle){var e={};d.extend(e,t._jsPlumb.paintStyle),d.extend(e,t._jsPlumb.hoverPaintStyle),delete t._jsPlumb.hoverPaintStyle,e.gradient&&t._jsPlumb.paintStyle.fill&&delete e.gradient,t._jsPlumb.hoverPaintStyle=e}},o=["tap","dbltap","click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","contextmenu"],s=function(t){return null==t?null:t.split(" ")},r=function(t,e,n){for(var i in e)t[i]=n},a=function(t,e,i){if(t.getDefaultType){var o=t.getTypeDescriptor(),s={},a=t.getDefaultType(),l=n.merge({},a);r(s,a,"__default");for(var u=0,c=t._jsPlumb.types.length;u<c;u++){var h=t._jsPlumb.types[u];if("__default"!==h){var d=t._jsPlumb.instance.getType(h,o);if(null!=d){var p=["anchor","anchors","connector","paintStyle","hoverPaintStyle","endpoint","endpoints","connectorOverlays","connectorStyle","connectorHoverStyle","endpointStyle","endpointHoverStyle"],f=[];"override"===d.mergeStrategy?Array.prototype.push.apply(p,["events","overlays","cssClass"]):f.push("cssClass"),l=n.merge(l,d,f,p),r(s,d,h)}}}e&&(l=n.populate(l,e,"_")),t.applyType(l,i,s),i||t.repaint()}},l=t.jsPlumbUIComponent=function(t){n.EventGenerator.apply(this,arguments);var e=arguments,i=this.idPrefix+(new Date).getTime();this._jsPlumb={instance:t._jsPlumb,parameters:t.parameters||{},paintStyle:null,hoverPaintStyle:null,paintStyleInUse:null,hover:!1,beforeDetach:t.beforeDetach,beforeDrop:t.beforeDrop,overlayPlacements:[],hoverClass:t.hoverClass||t._jsPlumb.Defaults.HoverClass,types:[],typeCache:{}},this.cacheTypeItem=function(t,e,n){this._jsPlumb.typeCache[n]=this._jsPlumb.typeCache[n]||{},this._jsPlumb.typeCache[n][t]=e},this.getCachedTypeItem=function(t,e){return this._jsPlumb.typeCache[e]?this._jsPlumb.typeCache[e][t]:null},this.getId=function(){return i};var o=t.overlays||[],s={};if(this.defaultOverlayKeys){for(var r=0;r<this.defaultOverlayKeys.length;r++)Array.prototype.push.apply(o,this._jsPlumb.instance.Defaults[this.defaultOverlayKeys[r]]||[]);for(r=0;r<o.length;r++){var a=d.convertToFullOverlaySpec(o[r]);s[a[1].id]=a}}var l={overlays:s,parameters:t.parameters||{},scope:t.scope||this._jsPlumb.instance.getDefaultScope()};if(this.getDefaultType=function(){return l},this.appendToDefaultType=function(t){for(var e in t)l[e]=t[e]},t.events)for(var u in t.events)this.bind(u,t.events[u]);this.clone=function(){var t=Object.create(this.constructor.prototype);return this.constructor.apply(t,e),t}.bind(this),this.isDetachAllowed=function(t){var e=!0;if(this._jsPlumb.beforeDetach)try{e=this._jsPlumb.beforeDetach(t)}catch(t){n.log("jsPlumb: beforeDetach callback failed",t)}return e},this.isDropAllowed=function(t,e,i,o,s,r,a){var l=this._jsPlumb.instance.checkCondition("beforeDrop",{sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a});if(this._jsPlumb.beforeDrop)try{l=this._jsPlumb.beforeDrop({sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a})}catch(t){n.log("jsPlumb: beforeDrop callback failed",t)}return l};var c=[];this.setListenerComponent=function(t){for(var e=0;e<c.length;e++)c[e][3]=t}},u=function(t,e){var n=t._jsPlumb.types[e],i=t._jsPlumb.instance.getType(n,t.getTypeDescriptor());null!=i&&i.cssClass&&t.canvas&&t._jsPlumb.instance.removeClass(t.canvas,i.cssClass)};n.extend(t.jsPlumbUIComponent,n.EventGenerator,{getParameter:function(t){return this._jsPlumb.parameters[t]},setParameter:function(t,e){this._jsPlumb.parameters[t]=e},getParameters:function(){return this._jsPlumb.parameters},setParameters:function(t){this._jsPlumb.parameters=t},getClass:function(){return d.getClass(this.canvas)},hasClass:function(t){return d.hasClass(this.canvas,t)},addClass:function(t){d.addClass(this.canvas,t)},removeClass:function(t){d.removeClass(this.canvas,t)},updateClasses:function(t,e){d.updateClasses(this.canvas,t,e)},setType:function(t,e,n){this.clearTypes(),this._jsPlumb.types=s(t)||[],a(this,e,n)},getType:function(){return this._jsPlumb.types},reapplyTypes:function(t,e){a(this,t,e)},hasType:function(t){return-1!==this._jsPlumb.types.indexOf(t)},addType:function(t,e,n){var i=s(t),o=!1;if(null!=i){for(var r=0,l=i.length;r<l;r++)this.hasType(i[r])||(this._jsPlumb.types.push(i[r]),o=!0);o&&a(this,e,n)}},removeType:function(t,e,n){var i=s(t),o=!1,r=function(t){var e=this._jsPlumb.types.indexOf(t);return-1!==e&&(u(this,e),this._jsPlumb.types.splice(e,1),!0)}.bind(this);if(null!=i){for(var l=0,c=i.length;l<c;l++)o=r(i[l])||o;o&&a(this,e,n)}},clearTypes:function(t,e){for(var n=this._jsPlumb.types.length,i=0;i<n;i++)u(this,0),this._jsPlumb.types.splice(0,1);a(this,t,e)},toggleType:function(t,e,n){var i=s(t);if(null!=i){for(var o=0,r=i.length;o<r;o++){var l=this._jsPlumb.types.indexOf(i[o]);-1!==l?(u(this,l),this._jsPlumb.types.splice(l,1)):this._jsPlumb.types.push(i[o])}a(this,e,n)}},applyType:function(t,e){if(this.setPaintStyle(t.paintStyle,e),this.setHoverPaintStyle(t.hoverPaintStyle,e),t.parameters)for(var n in t.parameters)this.setParameter(n,t.parameters[n]);this._jsPlumb.paintStyleInUse=this.getPaintStyle()},setPaintStyle:function(t,e){this._jsPlumb.paintStyle=t,this._jsPlumb.paintStyleInUse=this._jsPlumb.paintStyle,i(this),e||this.repaint()},getPaintStyle:function(){return this._jsPlumb.paintStyle},setHoverPaintStyle:function(t,e){this._jsPlumb.hoverPaintStyle=t,i(this),e||this.repaint()},getHoverPaintStyle:function(){return this._jsPlumb.hoverPaintStyle},destroy:function(t){(t||null==this.typeId)&&(this.cleanupListeners(),this.clone=null,this._jsPlumb=null)},isHover:function(){return this._jsPlumb.hover},setHover:function(t,e,n){if(this._jsPlumb&&!this._jsPlumb.instance.currentlyDragging&&!this._jsPlumb.instance.isHoverSuspended()){this._jsPlumb.hover=t;var i=t?"addClass":"removeClass";null!=this.canvas&&(null!=this._jsPlumb.instance.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.instance.hoverClass),null!=this._jsPlumb.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.hoverClass)),null!=this._jsPlumb.hoverPaintStyle&&(this._jsPlumb.paintStyleInUse=t?this._jsPlumb.hoverPaintStyle:this._jsPlumb.paintStyle,this._jsPlumb.instance.isSuspendDrawing()||(n=n||jsPlumbUtil.uuid(),this.repaint({timestamp:n,recalc:!1}))),this.getAttachedElements&&!e&&function(t,e,n,i){var o=t.getAttachedElements();if(o)for(var s=0,r=o.length;s<r;s++)i&&i===o[s]||o[s].setHover(e,!0,n)}(this,t,jsPlumbUtil.uuid(),this)}}});var c=0,h=t.jsPlumbInstance=function(e){this.version="2.15.6",this.Defaults={Anchor:"Bottom",Anchors:[null,null],ConnectionsDetachable:!0,ConnectionOverlays:[],Connector:"Bezier",Container:null,DoNotThrowErrors:!1,DragOptions:{},DropOptions:{},Endpoint:"Dot",EndpointOverlays:[],Endpoints:[null,null],EndpointStyle:{fill:"#456"},EndpointStyles:[null,null],EndpointHoverStyle:null,EndpointHoverStyles:[null,null],HoverPaintStyle:null,LabelStyle:{color:"black"},ListStyle:{},LogEnabled:!1,Overlays:[],MaxConnections:1,PaintStyle:{"stroke-width":4,stroke:"#456"},ReattachConnections:!1,RenderMode:"svg",Scope:"jsPlumb_DefaultScope"},e&&d.extend(this.Defaults,e),this.logEnabled=this.Defaults.LogEnabled,this._connectionTypes={},this._endpointTypes={},n.EventGenerator.apply(this);var i=this,s=function(){var t=c+1;return c++,t}(),r=i.bind,a={},u=1,h=function(t){if(null==t)return null;if(3===t.nodeType||8===t.nodeType)return{el:t,text:!0};var e=i.getElement(t);return{el:e,id:n.isString(t)&&null==e?t:B(e)}};for(var p in this.getInstanceIndex=function(){return s},this.setZoom=function(t,e){return u=t,i.fire("zoom",u),e&&i.repaintEverything(),!0},this.getZoom=function(){return u},this.Defaults)a[p]=this.Defaults[p];var f,g=[];this.unbindContainer=function(){if(null!=f&&g.length>0)for(var t=0;t<g.length;t++)i.off(f,g[t][0],g[t][1])},this.setContainer=function(t){this.unbindContainer(),t=this.getElement(t),this.select().each(function(e){e.moveParent(t)}),this.selectEndpoints().each(function(e){e.moveParent(t)});var e=f;f=t,g.length=0;for(var n={endpointclick:"endpointClick",endpointdblclick:"endpointDblClick"},s=function(t,e,o){var s=e.srcElement||e.target,r=(s&&s.parentNode?s.parentNode._jsPlumb:null)||(s?s._jsPlumb:null)||(s&&s.parentNode&&s.parentNode.parentNode?s.parentNode.parentNode._jsPlumb:null);if(r){r.fire(t,r,e);var a=o&&n[o+t]||t;i.fire(a,r.component||r,e)}},r=function(t,e,n){g.push([t,n]),i.on(f,t,e,n)},a=function(t){r(t,".jtk-connector",function(e){s(t,e)}),r(t,".jtk-endpoint",function(e){s(t,e,"endpoint")}),r(t,".jtk-overlay",function(e){s(t,e)})},l=0;l<o.length;l++)a(o[l]);for(var u in x){var c=x[u].el;c.parentNode===e&&(e.removeChild(c),f.appendChild(c))}},this.getContainer=function(){return f},this.bind=function(t,e){"ready"===t&&v?e():r.apply(i,[t,e])},i.importDefaults=function(t){for(var e in t)i.Defaults[e]=t[e];return t.Container&&i.setContainer(t.Container),i},i.restoreDefaults=function(){return i.Defaults=d.extend({},a),i};var m=null,v=!1,y=[],b={},P={},x={},C={},_={},j=!1,E=[],S=!1,w=null,D=this.Defaults.Scope,A=1,I=function(){return""+A++},k=function(t,e){f?f.appendChild(t):e?this.getElement(e).appendChild(t):this.appendToRoot(t)}.bind(this),O=function(t,e,n,o){var s={c:[],e:[]};if(!S&&null!=(t=i.getElement(t))){var r=B(t),a=t.querySelectorAll(".jtk-managed");null==n&&(n=jsPlumbUtil.uuid());it({elId:r,offset:e,recalc:!1,timestamp:n});for(var l=0;l<a.length;l++)it({elId:a[l].getAttribute("id"),recalc:!0,timestamp:n});var u=i.router.redraw(r,e,n,null,o);if(Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e),a)for(var c=0;c<a.length;c++)u=i.router.redraw(a[c].getAttribute("id"),null,n,null,o,!0),Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e)}return s},M=function(t){return P[t]},T=function(t,e){var o=d.extend({},t);if(e&&d.extend(o,e),o.source&&(o.source.endpoint?o.sourceEndpoint=o.source:o.source=i.getElement(o.source)),o.target&&(o.target.endpoint?o.targetEndpoint=o.target:o.target=i.getElement(o.target)),t.uuids&&(o.sourceEndpoint=M(t.uuids[0]),o.targetEndpoint=M(t.uuids[1])),o.sourceEndpoint&&o.sourceEndpoint.isFull())n.log(i,"could not add connection; source endpoint is full");else if(o.targetEndpoint&&o.targetEndpoint.isFull())n.log(i,"could not add connection; target endpoint is full");else{if(!o.type&&o.sourceEndpoint&&(o.type=o.sourceEndpoint.connectionType),o.sourceEndpoint&&o.sourceEndpoint.connectorOverlays){o.overlays=o.overlays||[];for(var s=0,r=o.sourceEndpoint.connectorOverlays.length;s<r;s++)o.overlays.push(o.sourceEndpoint.connectorOverlays[s])}o.sourceEndpoint&&o.sourceEndpoint.scope&&(o.scope=o.sourceEndpoint.scope),!o["pointer-events"]&&o.sourceEndpoint&&o.sourceEndpoint.connectorPointerEvents&&(o["pointer-events"]=o.sourceEndpoint.connectorPointerEvents);var a=function(t,e,n){var s=function(t,e){var n=d.extend({},t);for(var i in e)e[i]&&(n[i]=e[i]);return n}(e,{anchor:o.anchors?o.anchors[n]:o.anchor,endpoint:o.endpoints?o.endpoints[n]:o.endpoint,paintStyle:o.endpointStyles?o.endpointStyles[n]:o.endpointStyle,hoverPaintStyle:o.endpointHoverStyles?o.endpointHoverStyles[n]:o.endpointHoverStyle});return i.addEndpoint(t,s)},l=function(t,e,n,i){if(o[t]&&!o[t].endpoint&&!o[t+"Endpoint"]&&!o.newConnection){var s=n[B(o[t])];if(s=s?s[i]:null){if(!s.enabled)return!1;var r=d.extend({},s.def);delete r.label;var l=null!=s.endpoint&&s.endpoint._jsPlumb?s.endpoint:a(o[t],r,e);if(l.isFull())return!1;o[t+"Endpoint"]=l,!o.scope&&r.scope&&(o.scope=r.scope),s.uniqueEndpoint?s.endpoint?l.finalEndpoint=s.endpoint:(s.endpoint=l,l.setDeleteOnEmpty(!1)):l.setDeleteOnEmpty(!0),0===e&&s.def.connectorOverlays&&(o.overlays=o.overlays||[],Array.prototype.push.apply(o.overlays,s.def.connectorOverlays))}}};if(!1!==l("source",0,this.sourceEndpointDefinitions,o.type||"default")&&!1!==l("target",1,this.targetEndpointDefinitions,o.type||"default"))return o.sourceEndpoint&&o.targetEndpoint&&(function(t,e){for(var n=t.scope.split(/\s/),i=e.scope.split(/\s/),o=0;o<n.length;o++)for(var s=0;s<i.length;s++)if(i[s]===n[o])return!0;return!1}(o.sourceEndpoint,o.targetEndpoint)||(o=null)),o}}.bind(i),F=function(t){var e=i.Defaults.ConnectionType||i.getDefaultConnectionType();t._jsPlumb=i,t.newConnection=F,t.newEndpoint=N,t.endpointsByUUID=P,t.endpointsByElement=b,t.finaliseConnection=L,t.id="con_"+I();var n=new e(t);return n.isDetachable()&&(n.endpoints[0].initDraggable("_jsPlumbSource"),n.endpoints[1].initDraggable("_jsPlumbTarget")),n},L=i.finaliseConnection=function(t,e,n,o){if(e=e||{},t.suspendedEndpoint||y.push(t),t.pending=null,t.endpoints[0].isTemporarySource=!1,!1!==o&&i.router.newConnection(t),O(t.source),!e.doNotFireConnectionEvent&&!1!==e.fireEvent){var s={connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]};i.fire("connection",s,n)}},N=function(t,e){var n=i.Defaults.EndpointType||d.Endpoint,o=d.extend({},t);o._jsPlumb=i,o.newConnection=F,o.newEndpoint=N,o.endpointsByUUID=P,o.endpointsByElement=b,o.fireDetachEvent=X,o.elementId=e||B(o.source);var s=new n(o);return s.id="ep_"+I(),nt(o.elementId,o.source),d.headless||i.getDragManager().endpointAdded(o.source,e),s},R=function(t,e,n){var i=b[t];if(i&&i.length)for(var o=0,s=i.length;o<s;o++){for(var r=0,a=i[o].connections.length;r<a;r++){if(e(i[o].connections[r]))return}n&&n(i[o])}},G=function(t,e,n){e="block"===e;var i=null;n&&(i=function(t){t.setVisible(e,!0,!0)});var o=h(t);R(o.id,function(t){if(e&&n){var i=t.sourceId===o.id?1:0;t.endpoints[i].isVisible()&&t.setVisible(!0)}else t.setVisible(e)},i)},B=function(t,e,o){if(n.isString(t))return t;if(null==t)return null;var r=i.getAttribute(t,"id");return r&&"undefined"!==r||(2===arguments.length&&void 0!==arguments[1]?r=e:(1===arguments.length||3===arguments.length&&!arguments[2])&&(r="jsPlumb_"+s+"_"+I()),o||i.setAttribute(t,"id",r)),r};this.setConnectionBeingDragged=function(t){j=t},this.isConnectionBeingDragged=function(){return j},this.getManagedElements=function(){return x},this.connectorClass="jtk-connector",this.connectorOutlineClass="jtk-connector-outline",this.connectedClass="jtk-connected",this.hoverClass="jtk-hover",this.endpointClass="jtk-endpoint",this.endpointConnectedClass="jtk-endpoint-connected",this.endpointFullClass="jtk-endpoint-full",this.endpointDropAllowedClass="jtk-endpoint-drop-allowed",this.endpointDropForbiddenClass="jtk-endpoint-drop-forbidden",this.overlayClass="jtk-overlay",this.draggingClass="jtk-dragging",this.elementDraggingClass="jtk-element-dragging",this.sourceElementDraggingClass="jtk-source-element-dragging",this.targetElementDraggingClass="jtk-target-element-dragging",this.endpointAnchorClassPrefix="jtk-endpoint-anchor",this.hoverSourceClass="jtk-source-hover",this.hoverTargetClass="jtk-target-hover",this.dragSelectClass="jtk-drag-select",this.Anchors={},this.Connectors={svg:{}},this.Endpoints={svg:{}},this.Overlays={svg:{}},this.ConnectorRenderers={},this.SVG="svg",this.addEndpoint=function(t,e,o){o=o||{};var s=d.extend({},o);d.extend(s,e),s.endpoint=s.endpoint||i.Defaults.Endpoint,s.paintStyle=s.paintStyle||i.Defaults.EndpointStyle;for(var r=[],a=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],l=0,u=a.length;l<u;l++){s.source=i.getElement(a[l]),et(s.source);var c=B(s.source),h=N(s,c),p=nt(c,s.source,null,!S).info.o;n.addToList(b,c,h),S||h.paint({anchorLoc:h.anchor.compute({xy:[p.left,p.top],wh:E[c],element:h,timestamp:w,rotation:this.getRotation(c)}),timestamp:w}),r.push(h)}return 1===r.length?r[0]:r},this.addEndpoints=function(t,e,o){for(var s=[],r=0,a=e.length;r<a;r++){var l=i.addEndpoint(t,e[r],o);n.isArray(l)?Array.prototype.push.apply(s,l):s.push(l)}return s},this.animate=function(t,e,o){if(!this.animationSupported)return!1;o=o||{};var s=i.getElement(t),r=B(s),a=d.animEvents.step,l=d.animEvents.complete;o[a]=n.wrap(o[a],function(){i.revalidate(r)}),o[l]=n.wrap(o[l],function(){i.revalidate(r)}),i.doAnimate(s,e,o)},this.checkCondition=function(t,e){var o=i.getListener(t),s=!0;if(o&&o.length>0){var r=Array.prototype.slice.call(arguments,1);try{for(var a=0,l=o.length;a<l;a++)s=s&&o[a].apply(o[a],r)}catch(e){n.log(i,"cannot check condition ["+t+"]"+e)}}return s},this.connect=function(t,e){var i,o=T(t,e);if(o){if(null==o.source&&null==o.sourceEndpoint)return void n.log("Cannot establish connection - source does not exist");if(null==o.target&&null==o.targetEndpoint)return void n.log("Cannot establish connection - target does not exist");et(o.source),i=F(o),L(i,o)}return i};var H=[{el:"source",elId:"sourceId",epDefs:"sourceEndpointDefinitions"},{el:"target",elId:"targetId",epDefs:"targetEndpointDefinitions"}],U=function(t,e,n,i){var o,s,r,a=H[n],l=t[a.elId],u=(t[a.el],t.endpoints[n]),c={index:n,originalSourceId:0===n?l:t.sourceId,newSourceId:t.sourceId,originalTargetId:1===n?l:t.targetId,newTargetId:t.targetId,connection:t};if(e.constructor===d.Endpoint)(o=e).addConnection(t),e=o.element;else if(s=B(e),r=this[a.epDefs][s],s===t[a.elId])o=null;else if(r)for(var h in r){if(!r[h].enabled)return;o=null!=r[h].endpoint&&r[h].endpoint._jsPlumb?r[h].endpoint:this.addEndpoint(e,r[h].def),r[h].uniqueEndpoint&&(r[h].endpoint=o),o.addConnection(t)}else o=t.makeEndpoint(0===n,e,s);return null!=o&&(u.detachFromConnection(t),t.endpoints[n]=o,t[a.el]=o.element,t[a.elId]=o.elementId,c[0===n?"newSourceId":"newTargetId"]=o.elementId,Y(c),i||t.repaint()),c.element=e,c}.bind(this);this.setSource=function(t,e,n){var i=U(t,e,0,n);this.router.sourceOrTargetChanged(i.originalSourceId,i.newSourceId,t,i.el,0)},this.setTarget=function(t,e,n){var i=U(t,e,1,n);this.router.sourceOrTargetChanged(i.originalTargetId,i.newTargetId,t,i.el,1)},this.deleteEndpoint=function(t,e,n){var o="string"==typeof t?P[t]:t;return o&&i.deleteObject({endpoint:o,dontUpdateHover:e,deleteAttachedObjects:n}),i},this.deleteEveryEndpoint=function(){var t=i.setSuspendDrawing(!0);for(var e in b){var n=b[e];if(n&&n.length)for(var o=0,s=n.length;o<s;o++)i.deleteEndpoint(n[o],!0)}b={},x={},P={},C={},_={},i.router.reset();var r=i.getDragManager();return r&&r.reset(),t||i.setSuspendDrawing(!1),i};var X=function(t,e,n){var o=i.Defaults.ConnectionType||i.getDefaultConnectionType(),s=t.constructor===o?{connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]}:t;e&&i.fire("connectionDetached",s,n),i.fire("internal.connectionDetached",s,n),i.router.connectionDetached(s)},Y=i.fireMoveEvent=function(t,e){i.fire("connectionMoved",t,e)};this.unregisterEndpoint=function(t){for(var e in t._jsPlumb.uuid&&(P[t._jsPlumb.uuid]=null),i.router.deleteEndpoint(t),b){var n=b[e];if(n){for(var o=[],s=0,r=n.length;s<r;s++)n[s]!==t&&o.push(n[s]);b[e]=o}b[e].length<1&&delete b[e]}};this.deleteConnection=function(t,e){return!(null==t||!(e=e||{}).force&&!n.functionChain(!0,!1,[[t.endpoints[0],"isDetachAllowed",[t]],[t.endpoints[1],"isDetachAllowed",[t]],[t,"isDetachAllowed",[t]],[i,"checkCondition",["beforeDetach",t]]]))&&(t.setHover(!1),X(t,!t.pending&&!1!==e.fireEvent,e.originalEvent),t.endpoints[0].detachFromConnection(t),t.endpoints[1].detachFromConnection(t),n.removeWithFunction(y,function(e){return t.id===e.id}),t.cleanup(),t.destroy(),!0)},this.deleteEveryConnection=function(t){t=t||{};var e=y.length,n=0;return i.batch(function(){for(var o=0;o<e;o++)n+=i.deleteConnection(y[0],t)?1:0}),n},this.deleteConnectionsForElement=function(t,e){e=e||{},t=i.getElement(t);var n=B(t),o=b[n];if(o&&o.length)for(var s=0,r=o.length;s<r;s++)o[s].deleteEveryConnection(e);return i},this.deleteObject=function(t){var e={endpoints:{},connections:{},endpointCount:0,connectionCount:0},o=!1!==t.deleteAttachedObjects,s=function(n){null!=n&&null==e.connections[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.connections[n.id]=n,e.connectionCount++)};for(var r in t.connection?s(t.connection):function(n){if(null!=n&&null==e.endpoints[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.endpoints[n.id]=n,e.endpointCount++,o))for(var i=0;i<n.connections.length;i++){var r=n.connections[i];s(r)}}(t.endpoint),e.connections){var a=e.connections[r];if(a._jsPlumb){n.removeWithFunction(y,function(t){return a.id===t.id}),X(a,!1!==t.fireEvent&&!a.pending,t.originalEvent);var l=null==t.deleteAttachedObjects?null:!t.deleteAttachedObjects;a.endpoints[0].detachFromConnection(a,null,l),a.endpoints[1].detachFromConnection(a,null,l),a.cleanup(!0),a.destroy(!0)}}for(var u in e.endpoints){var c=e.endpoints[u];c._jsPlumb&&(i.unregisterEndpoint(c),c.cleanup(!0),c.destroy(!0))}return e};var z=function(t,e,n){return function(){return function(t,e,n,i){for(var o=0,s=t.length;o<s;o++)t[o][e].apply(t[o],n);return i(t)}(t,e,arguments,n)}},$=function(t,e){return function(){return function(t,e,n){for(var i=[],o=0,s=t.length;o<s;o++)i.push([t[o][e].apply(t[o],n),t[o]]);return i}(t,e,arguments)}},W=function(t,e){var n=[];if(t)if("string"==typeof t){if("*"===t)return t;n.push(t)}else if(e)n=t;else if(t.length)for(var i=0,o=t.length;i<o;i++)n.push(h(t[i]).id);else n.push(h(t).id);return n},V=function(t,e,n){return"*"===t||(t.length>0?-1!==t.indexOf(e):!n)};this.getConnections=function(t,e){t?t.constructor===String&&(t={scope:t}):t={};for(var n=t.scope||i.getDefaultScope(),o=W(n,!0),s=W(t.source),r=W(t.target),a=!e&&o.length>1?{}:[],l=function(t,n){if(!e&&o.length>1){var i=a[t];null==i&&(i=a[t]=[]),i.push(n)}else a.push(n)},u=0,c=y.length;u<c;u++){var h=y[u],d=h.proxies&&h.proxies[0]?h.proxies[0].originalEp.elementId:h.sourceId,p=h.proxies&&h.proxies[1]?h.proxies[1].originalEp.elementId:h.targetId;V(o,h.scope)&&V(s,d)&&V(r,p)&&l(h.scope,h)}return a};var q=function(t,e){return function(n){for(var i=0,o=t.length;i<o;i++)n(t[i]);return e(t)}},J=function(t){return function(e){return t[e]}},Z=function(t,e){var n,i,o={length:t.length,each:q(t,e),get:J(t)},s=["setHover","removeAllOverlays","setLabel","addClass","addOverlay","removeOverlay","removeOverlays","showOverlay","hideOverlay","showOverlays","hideOverlays","setPaintStyle","setHoverPaintStyle","setSuspendEvents","setParameter","setParameters","setVisible","repaint","addType","toggleType","removeType","removeClass","setType","bind","unbind"],r=["getLabel","getOverlay","isHover","getParameter","getParameters","getPaintStyle","getHoverPaintStyle","isVisible","hasType","getType","isSuspendEvents"];for(n=0,i=s.length;n<i;n++)o[s[n]]=z(t,s[n],e);for(n=0,i=r.length;n<i;n++)o[r[n]]=$(t,r[n]);return o},K=function(t){var e=Z(t,K);return d.extend(e,{setDetachable:z(t,"setDetachable",K),setReattach:z(t,"setReattach",K),setConnector:z(t,"setConnector",K),delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteConnection(t[e])},isDetachable:$(t,"isDetachable"),isReattach:$(t,"isReattach")})},Q=function(t){var e=Z(t,Q);return d.extend(e,{setEnabled:z(t,"setEnabled",Q),setAnchor:z(t,"setAnchor",Q),isEnabled:$(t,"isEnabled"),deleteEveryConnection:function(){for(var e=0,n=t.length;e<n;e++)t[e].deleteEveryConnection()},delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteEndpoint(t[e])}})};this.select=function(t){return(t=t||{}).scope=t.scope||"*",K(t.connections||i.getConnections(t,!0))},this.selectEndpoints=function(t){(t=t||{}).scope=t.scope||"*";var e=!t.element&&!t.source&&!t.target,n=e?"*":W(t.element),i=e?"*":W(t.source),o=e?"*":W(t.target),s=W(t.scope,!0),r=[];for(var a in b){var l=V(n,a,!0),u=V(i,a,!0),c="*"!==i,h=V(o,a,!0),d="*"!==o;if(l||u||h)t:for(var p=0,f=b[a].length;p<f;p++){var g=b[a][p];if(V(s,g.scope,!0)){var m=c&&i.length>0&&!g.isSource,v=d&&o.length>0&&!g.isTarget;if(m||v)continue t;r.push(g)}}}return Q(r)},this.getAllConnections=function(){return y},this.getDefaultScope=function(){return D},this.getEndpoint=M,this.getEndpoints=function(t){return b[h(t).id]||[]},this.getDefaultEndpointType=function(){return d.Endpoint},this.getDefaultConnectionType=function(){return d.Connection},this.getId=B,this.draw=O,this.info=h,this.appendElement=k;var tt=!1;this.isHoverSuspended=function(){return tt},this.setHoverSuspended=function(t){tt=t},this.hide=function(t,e){return G(t,"none",e),i},this.idstamp=I;var et=function(t){if(!f&&t){var e=i.getElement(t);e.offsetParent&&i.setContainer(e.offsetParent)}},nt=i.manage=function(t,e,n,o){return x[t]?o&&(x[t].info=it({elId:t,timestamp:w,recalc:!0})):(x[t]={el:e,endpoints:[],connections:[],rotation:0},x[t].info=it({elId:t,timestamp:w}),i.addClass(e,"jtk-managed"),n||i.fire("manageElement",{id:t,info:x[t].info,el:e})),x[t]};this.unmanage=function(t){if(x[t]){var e=x[t].el;i.removeClass(e,"jtk-managed"),delete x[t],i.fire("unmanageElement",{id:t,el:e})}},this.rotate=function(t,e,n){return x[t]&&(x[t].rotation=e,x[t].el.style.transform="rotate("+e+"deg)",x[t].el.style.transformOrigin="center center",!0!==n)?this.revalidate(t):{c:[],e:[]}},this.getRotation=function(t){return x[t]&&x[t].rotation||0};var it=function(t){var e,n=t.timestamp,o=t.recalc,s=t.offset,r=t.elId;return S&&!n&&(n=w),!o&&n&&n===_[r]?{o:t.offset||C[r],s:E[r]}:(o||!s&&null==C[r]?null!=(e=x[r]?x[r].el:null)&&(E[r]=i.getSize(e),C[r]=i.getOffset(e),_[r]=n):(C[r]=s||C[r],null==E[r]&&null!=(e=x[r].el)&&(E[r]=i.getSize(e)),_[r]=n),C[r]&&!C[r].right&&(C[r].right=C[r].left+E[r][0],C[r].bottom=C[r].top+E[r][1],C[r].width=E[r][0],C[r].height=E[r][1],C[r].centerx=C[r].left+C[r].width/2,C[r].centery=C[r].top+C[r].height/2),{o:C[r],s:E[r]})};this.updateOffset=it,this.init=function(){v||(i.Defaults.Container&&i.setContainer(i.Defaults.Container),i.router=new t.jsPlumb.DefaultRouter(i),i.anchorManager=i.router.anchorManager,v=!0,i.fire("ready",i))}.bind(this),this.log=m,this.jsPlumbUIComponent=l,this.makeAnchor=function(){var e,o=function(e,n){if(t.jsPlumb.Anchors[e])return new t.jsPlumb.Anchors[e](n);if(!i.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown anchor type '"+e+"'"}};if(0===arguments.length)return null;var s=arguments[0],r=arguments[1],a=null;if(s.compute&&s.getOrientation)return s;if("string"==typeof s)a=o(arguments[0],{elementId:r,jsPlumbInstance:i});else if(n.isArray(s))if(n.isArray(s[0])||n.isString(s[0]))2===s.length&&n.isObject(s[1])?n.isString(s[0])?(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i},s[1]),a=o(s[0],e)):(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i,anchors:s[0]},s[1]),a=new t.jsPlumb.DynamicAnchor(e)):a=new d.DynamicAnchor({anchors:s,selector:null,elementId:r,jsPlumbInstance:i});else{var l={x:s[0],y:s[1],orientation:s.length>=4?[s[2],s[3]]:[0,0],offsets:s.length>=6?[s[4],s[5]]:[0,0],elementId:r,jsPlumbInstance:i,cssClass:7===s.length?s[6]:null};(a=new t.jsPlumb.Anchor(l)).clone=function(){return new t.jsPlumb.Anchor(l)}}return a.id||(a.id="anchor_"+I()),a},this.makeAnchors=function(e,o,s){for(var r=[],a=0,l=e.length;a<l;a++)"string"==typeof e[a]?r.push(t.jsPlumb.Anchors[e[a]]({elementId:o,jsPlumbInstance:s})):n.isArray(e[a])&&r.push(i.makeAnchor(e[a],o,s));return r},this.makeDynamicAnchor=function(e,n){return new t.jsPlumb.DynamicAnchor({anchors:e,selector:n,elementId:null,jsPlumbInstance:i})},this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={};var ot=function(e,o,s,r,a){var u=new l(o),c=o._jsPlumb.EndpointDropHandler({jsPlumb:i,enabled:function(){return e.def.enabled},isFull:function(){var t=i.select({target:e.id}).length;return e.def.maxConnections>0&&t>=e.def.maxConnections},element:e.el,elementId:e.id,isSource:r,isTarget:a,addClass:function(t){i.addClass(e.el,t)},removeClass:function(t){i.removeClass(e.el,t)},onDrop:function(t){t.endpoints[0].anchor.locked=!1},isDropAllowed:function(){return u.isDropAllowed.apply(u,arguments)},isRedrop:function(t){return null!=t.suspendedElement&&null!=t.suspendedEndpoint&&t.suspendedEndpoint.element===e.el},getEndpoint:function(n){var s=e.def.endpoint;if(null==s||null==s._jsPlumb){var r=i.deriveEndpointAndAnchorSpec(n.getType().join(" "),!0),a=r.endpoints?t.jsPlumb.extend(o,{endpoint:e.def.def.endpoint||r.endpoints[1]}):o;r.anchors&&(a=t.jsPlumb.extend(a,{anchor:e.def.def.anchor||r.anchors[1]})),(s=i.addEndpoint(e.el,a))._mtNew=!0}if(o.uniqueEndpoint&&(e.def.endpoint=s),s.setDeleteOnEmpty(!0),n.isDetachable()&&s.initDraggable(),null!=s.anchor.positionFinder){var l=i.getUIPosition(arguments,i.getZoom()),u=i.getOffset(e.el),c=i.getSize(e.el),h=null==l?[0,0]:s.anchor.positionFinder(l,u,c,s.anchor.constructorParams);s.anchor.x=h[0],s.anchor.y=h[1]}return s},maybeCleanup:function(t){t._mtNew&&0===t.connections.length?i.deleteObject({endpoint:t}):delete t._mtNew}}),h=t.jsPlumb.dragEvents.drop;return s.scope=s.scope||o.scope||i.Defaults.Scope,s[h]=n.wrap(s[h],c,!0),s.rank=o.rank||0,a&&(s[t.jsPlumb.dragEvents.over]=function(){return!0}),!1===o.allowLoopback&&(s.canDrop=function(t){return t.getDragElement()._jsPlumbRelatedElement!==e.el}),i.initDroppable(e.el,s,"internal"),c};this.makeTarget=function(e,n,o){var s=t.jsPlumb.extend({_jsPlumb:this},o);t.jsPlumb.extend(s,n);for(var r=s.maxConnections||-1,a=function(e){var n=h(e),o=n.id,a=t.jsPlumb.extend({},s.dropOptions||{}),l=s.connectionType||"default";this.targetEndpointDefinitions[o]=this.targetEndpointDefinitions[o]||{},et(o),n.el._isJsPlumbGroup&&null==a.rank&&(a.rank=-1);var u={def:t.jsPlumb.extend({},s),uniqueEndpoint:s.uniqueEndpoint,maxConnections:r,enabled:!0};s.createEndpoint&&(u.uniqueEndpoint=!0,u.endpoint=i.addEndpoint(e,u.def),u.endpoint.setDeleteOnEmpty(!1)),n.def=u,this.targetEndpointDefinitions[o][l]=u,ot(n,s,a,!0===s.isSource,!0),n.el._katavorioDrop[n.el._katavorioDrop.length-1].targetDef=u}.bind(this),l=e.length&&e.constructor!==String?e:[e],u=0,c=l.length;u<c;u++)a(l[u]);return this},this.unmakeTarget=function(t,e){var n=h(t);return i.destroyDroppable(n.el,"internal"),e||delete this.targetEndpointDefinitions[n.id],this},this.makeSource=function(e,o,s){var r=t.jsPlumb.extend({_jsPlumb:this},s);t.jsPlumb.extend(r,o);var a=r.connectionType||"default",l=i.deriveEndpointAndAnchorSpec(a);r.endpoint=r.endpoint||l.endpoints[0],r.anchor=r.anchor||l.anchors[0];for(var c=r.maxConnections||-1,d=r.onMaxConnections,p=function(o){var s=o.id,l=this.getElement(o.el);this.sourceEndpointDefinitions[s]=this.sourceEndpointDefinitions[s]||{},et(s);var h={def:t.jsPlumb.extend({},r),uniqueEndpoint:r.uniqueEndpoint,maxConnections:c,enabled:!0};r.createEndpoint&&(h.uniqueEndpoint=!0,h.endpoint=i.addEndpoint(e,h.def),h.endpoint.setDeleteOnEmpty(!1)),this.sourceEndpointDefinitions[s][a]=h,o.def=h;var p=t.jsPlumb.dragEvents.stop,f=t.jsPlumb.dragEvents.drag,g=t.jsPlumb.extend({},r.dragOptions||{}),m=g.drag,v=g.stop,y=null,b=!1;g.scope=g.scope||r.scope,g[f]=n.wrap(g[f],function(){m&&m.apply(this,arguments),b=!1}),g[p]=n.wrap(g[p],function(){if(v&&v.apply(this,arguments),this.currentlyDragging=!1,null!=y._jsPlumb){var t=r.anchor||this.Defaults.Anchor,e=y.anchor,n=y.connections[0],o=this.makeAnchor(t,s,this),a=y.element;if(null!=o.positionFinder){var l=i.getOffset(a),u=this.getSize(a),c={left:l.left+e.x*u[0],top:l.top+e.y*u[1]},h=o.positionFinder(c,l,u,o.constructorParams);o.x=h[0],o.y=h[1]}y.setAnchor(o,!0),y.repaint(),this.repaint(y.elementId),null!=n&&this.repaint(n.targetId)}}.bind(this));var P=function(e){if(3!==e.which&&2!==e.button){s=this.getId(this.getElement(o.el));var h=this.sourceEndpointDefinitions[s][a];if(h.enabled){if(r.filter)if(!1===(n.isString(r.filter)?function(t,e,n,i,o){for(var s=t.target||t.srcElement,r=!1,a=i.getSelector(e,n),l=0;l<a.length;l++)if(a[l]===s){r=!0;break}return o?!r:r}(e,o.el,r.filter,this,r.filterExclude):r.filter(e,o.el)))return;var p=this.select({source:s}).length;if(h.maxConnections>=0&&p>=h.maxConnections)return d&&d({element:o.el,maxConnections:c},e),!1;var f=t.jsPlumb.getPositionOnElement(e,l,u),m={};t.jsPlumb.extend(m,h.def),m.isTemporarySource=!0,m.anchor=[f[0],f[1],0,0],m.dragOptions=g,h.def.scope&&(m.scope=h.def.scope),y=this.addEndpoint(s,m),b=!0,y.setDeleteOnEmpty(!0),h.uniqueEndpoint&&(h.endpoint?y.finalEndpoint=h.endpoint:(h.endpoint=y,y.setDeleteOnEmpty(!1)));var v=function(){i.off(y.canvas,"mouseup",v),i.off(o.el,"mouseup",v),b&&(b=!1,i.deleteEndpoint(y))};i.on(y.canvas,"mouseup",v),i.on(o.el,"mouseup",v);var P={};if(h.def.extract)for(var x in h.def.extract){var C=(e.srcElement||e.target).getAttribute(x);C&&(P[h.def.extract[x]]=C)}i.trigger(y.canvas,"mousedown",e,P),n.consume(e)}}}.bind(this);this.on(o.el,"mousedown",P),h.trigger=P,r.filter&&(n.isString(r.filter)||n.isFunction(r.filter))&&i.setDragFilter(o.el,r.filter);var x=t.jsPlumb.extend({},r.dropOptions||{});ot(o,r,x,!0,!0===r.isTarget)}.bind(this),f=e.length&&e.constructor!==String?e:[e],g=0,m=f.length;g<m;g++)p(h(f[g]));return this},this.unmakeSource=function(t,e,n){var o=h(t);i.destroyDroppable(o.el,"internal");var s=this.sourceEndpointDefinitions[o.id];if(s)for(var r in s)if(null==e||e===r){var a=s[r].trigger;a&&i.off(o.el,"mousedown",a),n||delete this.sourceEndpointDefinitions[o.id][r]}return this},this.unmakeEverySource=function(){for(var t in this.sourceEndpointDefinitions)i.unmakeSource(t,null,!0);return this.sourceEndpointDefinitions={},this};var st=function(t,e,i){e=n.isArray(e)?e:[e];var o=B(t);i=i||"default";for(var s=0;s<e.length;s++){var r=this[e[s]][o];if(r&&r[i])return r[i].def.scope||this.Defaults.Scope}}.bind(this),rt=function(t,e,i,o){i=n.isArray(i)?i:[i];var s=B(t);o=o||"default";for(var r=0;r<i.length;r++){var a=this[i[r]][s];a&&a[o]&&(a[o].def.scope=e)}}.bind(this);this.getScope=function(t,e){return st(t,["sourceEndpointDefinitions","targetEndpointDefinitions"])},this.getSourceScope=function(t){return st(t,"sourceEndpointDefinitions")},this.getTargetScope=function(t){return st(t,"targetEndpointDefinitions")},this.setScope=function(t,e,n){this.setSourceScope(t,e,n),this.setTargetScope(t,e,n)},this.setSourceScope=function(t,e,n){rt(t,e,"sourceEndpointDefinitions",n),this.setDragScope(t,e)},this.setTargetScope=function(t,e,n){rt(t,e,"targetEndpointDefinitions",n),this.setDropScope(t,e)},this.unmakeEveryTarget=function(){for(var t in this.targetEndpointDefinitions)i.unmakeTarget(t,!0);return this.targetEndpointDefinitions={},this};var at=function(t,e,o,s,r){var a,l,u,c="source"===t?this.sourceEndpointDefinitions:this.targetEndpointDefinitions;if(r=r||"default",e.length&&!n.isString(e)){a=[];for(var d=0,p=e.length;d<p;d++)c[(l=h(e[d])).id]&&c[l.id][r]&&(a[d]=c[l.id][r].enabled,u=s?!a[d]:o,c[l.id][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}else{var f=(l=h(e)).id;c[f]&&c[f][r]&&(a=c[f][r].enabled,u=s?!a:o,c[f][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}return a}.bind(this),lt=function(t,e){if(null!=t){if(n.isString(t)||!t.length)return e.apply(this,[t]);if(t.length)return e.apply(this,[t[0]])}}.bind(this);this.toggleSourceEnabled=function(t,e){return at("source",t,null,!0,e),this.isSourceEnabled(t,e)},this.setSourceEnabled=function(t,e,n){return at("source",t,e,null,n)},this.isSource=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isSourceEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.toggleTargetEnabled=function(t,e){return at("target",t,null,!0,e),this.isTargetEnabled(t,e)},this.isTarget=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isTargetEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.setTargetEnabled=function(t,e,n){return at("target",t,e,null,n)},this.ready=function(t){i.bind("ready",t)};this.repaint=function(t,e,n){return function(t,e){if("object"==typeof t&&t.length)for(var n=0,o=t.length;n<o;n++)e(t[n]);else e(t);return i}(t,function(t){O(t,e,n)})},this.revalidate=function(t,e,n){var o=n?t:i.getId(t);i.updateOffset({elId:o,recalc:!0,timestamp:e});var s=i.getDragManager();return s&&s.updateOffsets(o),O(t,null,e)},this.repaintEverything=function(){var t,e=jsPlumbUtil.uuid();for(t in b)i.updateOffset({elId:t,recalc:!0,timestamp:e});for(t in b)O(t,null,e);return this},this.removeAllEndpoints=function(t,e,n){n=n||[];var o=function(t){var s,r,a=h(t),l=b[a.id];if(l)for(n.push(a),s=0,r=l.length;s<r;s++)i.deleteEndpoint(l[s],!1);if(delete b[a.id],e&&a.el&&3!==a.el.nodeType&&8!==a.el.nodeType)for(s=0,r=a.el.childNodes.length;s<r;s++)o(a.el.childNodes[s])};return o(t),this};var ut=function(t,e){i.removeAllEndpoints(t.id,!0,e);for(var n=i.getDragManager(),o=function(t){n&&n.elementRemoved(t.id),i.router.elementRemoved(t.id),i.isSource(t.el)&&i.unmakeSource(t.el),i.isTarget(t.el)&&i.unmakeTarget(t.el),i.destroyDraggable(t.el),i.destroyDroppable(t.el),delete i.floatingConnections[t.id],delete x[t.id],delete C[t.id],t.el&&(i.removeElement(t.el),t.el._jsPlumb=null)},s=1;s<e.length;s++)o(e[s]);o(t)};this.remove=function(t,e){var n=h(t),o=[];return n.text&&n.el.parentNode?n.el.parentNode.removeChild(n.el):n.id&&i.batch(function(){ut(n,o)},!0===e),i},this.empty=function(t,e){var n=[],o=function(t,e){var i=h(t);if(i.text)i.el.parentNode.removeChild(i.el);else if(i.el){for(;i.el.childNodes.length>0;)o(i.el.childNodes[0]);e||ut(i,n)}};return i.batch(function(){o(t,!0)},!1===e),i},this.reset=function(t){i.silently(function(){tt=!1,i.removeAllGroups(),i.removeGroupManager(),i.deleteEveryEndpoint(),t||i.unbind(),this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={},y.length=0,this.doReset&&this.doReset()}.bind(this))},this.destroy=function(){this.reset(),f=null,g=null};var ct=function(t){t.canvas&&t.canvas.parentNode&&t.canvas.parentNode.removeChild(t.canvas),t.cleanup(),t.destroy()};this.clear=function(){i.select().each(ct),i.selectEndpoints().each(ct),b={},P={}},this.setDefaultScope=function(t){return D=t,i},this.deriveEndpointAndAnchorSpec=function(t,e){for(var n=((e?"":"default ")+t).split(/[\s]/),o=null,s=null,r=null,a=null,l=0;l<n.length;l++){var u=i.getType(n[l],"connection");u&&(u.endpoints&&(o=u.endpoints),u.endpoint&&(s=u.endpoint),u.anchors&&(a=u.anchors),u.anchor&&(r=u.anchor))}return{endpoints:o||[s,s],anchors:a||[r,r]}},this.setId=function(t,e,i){var o;n.isString(t)?o=t:(t=this.getElement(t),o=this.getId(t));var s=this.getConnections({source:o,scope:"*"},!0),r=this.getConnections({target:o,scope:"*"},!0);e=""+e,i?t=this.getElement(e):(t=this.getElement(o),this.setAttribute(t,"id",e)),b[e]=b[o]||[];for(var a=0,l=b[e].length;a<l;a++)b[e][a].setElementId(e),b[e][a].setReferenceElement(t);delete b[o],this.sourceEndpointDefinitions[e]=this.sourceEndpointDefinitions[o],delete this.sourceEndpointDefinitions[o],this.targetEndpointDefinitions[e]=this.targetEndpointDefinitions[o],delete this.targetEndpointDefinitions[o],this.router.changeId(o,e);var u=this.getDragManager();u&&u.changeId(o,e),x[e]=x[o],delete x[o];var c=function(n,i,o){for(var s=0,r=n.length;s<r;s++)n[s].endpoints[i].setElementId(e),n[s].endpoints[i].setReferenceElement(t),n[s][o+"Id"]=e,n[s][o]=t};c(s,0,"source"),c(r,1,"target"),this.repaint(e)},this.setDebugLog=function(t){m=t},this.setSuspendDrawing=function(t,e){var n=S;return S=t,w=t?(new Date).getTime():null,e&&this.repaintEverything(),n},this.isSuspendDrawing=function(){return S},this.getSuspendedAt=function(){return w},this.batch=function(t,e){var i=this.isSuspendDrawing();i||this.setSuspendDrawing(!0);try{t()}catch(t){n.log("Function run while suspended failed",t)}i||this.setSuspendDrawing(!1,!e)},this.doWhileSuspended=this.batch,this.getCachedData=function(t){var e=C[t];return e?{o:e,s:E[t]}:it({elId:t})},this.show=function(t,e){return G(t,"block",e),i},this.toggleVisible=function(t,e){var n=null;e&&(n=function(t){var e=t.isVisible();t.setVisible(!e)}),R(t,function(t){var e=t.isVisible();t.setVisible(!e)},n)},this.addListener=this.bind;var ht=[];this.registerFloatingConnection=function(t,e,i){ht[t.id]=e,n.addToList(b,t.id,i)},this.getFloatingConnectionFor=function(t){return ht[t]},this.listManager=new t.jsPlumbListManager(this,this.Defaults.ListStyle)};n.extend(t.jsPlumbInstance,n.EventGenerator,{setAttribute:function(t,e,n){this.setAttribute(t,e,n)},getAttribute:function(e,n){return this.getAttribute(t.jsPlumb.getElement(e),n)},convertToFullOverlaySpec:function(t){return n.isString(t)&&(t=[t,{}]),t[1].id=t[1].id||n.uuid(),t},registerConnectionType:function(e,n){if(this._connectionTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._connectionTypes[e].overlays=i}},registerConnectionTypes:function(t){for(var e in t)this.registerConnectionType(e,t[e])},registerEndpointType:function(e,n){if(this._endpointTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._endpointTypes[e].overlays=i}},registerEndpointTypes:function(t){for(var e in t)this.registerEndpointType(e,t[e])},getType:function(t,e){return"connection"===e?this._connectionTypes[t]:this._endpointTypes[t]},setIdChanged:function(t,e){this.setId(t,e,!0)},setParent:function(t,e){var n=this.getElement(t),i=this.getId(n),o=this.getElement(e),s=this.getId(o),r=this.getDragManager();n.parentNode.removeChild(n),o.appendChild(n),r&&r.setParent(n,i,o,s)},extend:function(t,e,n){var i;if(n)for(i=0;i<n.length;i++)t[n[i]]=e[n[i]];else for(i in e)t[i]=e[i];return t},floatingConnections:{},getFloatingAnchorIndex:function(t){return t.endpoints[0].isFloating()?0:t.endpoints[1].isFloating()?1:-1},proxyConnection:function(t,e,n,i,o,s){var r,a=t.endpoints[e].elementId,l=t.endpoints[e];t.proxies=t.proxies||[],(r=t.proxies[e]?t.proxies[e].ep:this.addEndpoint(n,{endpoint:o(t,e),anchor:s(t,e),parameters:{isProxyEndpoint:!0}})).setDeleteOnEmpty(!0),t.proxies[e]={ep:r,originalEp:l},0===e?this.router.sourceOrTargetChanged(a,i,t,n,0):this.router.sourceOrTargetChanged(a,i,t,n,1),l.detachFromConnection(t,null,!0),r.connections=[t],t.endpoints[e]=r,l.setVisible(!1),t.setVisible(!0),this.revalidate(n)},unproxyConnection:function(t,e,n){if(null!=t._jsPlumb&&null!=t.proxies&&null!=t.proxies[e]){var i=t.proxies[e].originalEp.element,o=t.proxies[e].originalEp.elementId;t.endpoints[e]=t.proxies[e].originalEp,0===e?this.router.sourceOrTargetChanged(n,o,t,i,0):this.router.sourceOrTargetChanged(n,o,t,i,1),t.proxies[e].ep.detachFromConnection(t,null),t.proxies[e].originalEp.addConnection(t),t.isVisible()&&t.proxies[e].originalEp.setVisible(!0),delete t.proxies[e]}}});var d=new h;t.jsPlumb=d,d.getInstance=function(t,e){var n=new h(t);if(e)for(var i in e)n[i]=e[i];return n.init(),n},d.each=function(t,e){if(null!=t)if("string"==typeof t)e(d.getElement(t));else if(null!=t.length)for(var n=0;n<t.length;n++)e(d.getElement(t[n]));else e(t)},e.jsPlumb=d}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil;e.OverlayCapableJsPlumbUIComponent=function(e){t.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.overlays={},this._jsPlumb.overlayPositions={},e.label&&(this.getDefaultType().overlays.__label=["Label",{label:e.label,location:e.labelLocation||this.defaultLabelLocation||.5,labelStyle:e.labelStyle||this._jsPlumb.instance.Defaults.LabelStyle,id:"__label"}]),this.setListenerComponent=function(t){if(this._jsPlumb)for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].setListenerComponent(t)}},e.OverlayCapableJsPlumbUIComponent.applyType=function(t,e){if(e.overlays){var n,i={};for(n in e.overlays){var o=t._jsPlumb.overlays[e.overlays[n][1].id];if(o)o.updateFrom(e.overlays[n][1]),i[e.overlays[n][1].id]=!0,o.reattach(t._jsPlumb.instance,t);else{var s=t.getCachedTypeItem("overlay",e.overlays[n][1].id);null!=s?(s.reattach(t._jsPlumb.instance,t),s.setVisible(!0),s.updateFrom(e.overlays[n][1]),t._jsPlumb.overlays[s.id]=s):s=t.addOverlay(e.overlays[n],!0),i[s.id]=!0}}for(n in t._jsPlumb.overlays)null==i[t._jsPlumb.overlays[n].id]&&t.removeOverlay(t._jsPlumb.overlays[n].id,!0)}},n.extend(e.OverlayCapableJsPlumbUIComponent,t.jsPlumbUIComponent,{setHover:function(t,e){if(this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged())for(var n in this._jsPlumb.overlays)this._jsPlumb.overlays[n][t?"addClass":"removeClass"](this._jsPlumb.instance.hoverClass)},addOverlay:function(t,i){var o=function(t,i){var o=null;if(n.isArray(i)){var s=i[0],r=e.extend({component:t,_jsPlumb:t._jsPlumb.instance},i[1]);3===i.length&&e.extend(r,i[2]),o=new(e.Overlays[t._jsPlumb.instance.getRenderMode()][s])(r)}else o=i.constructor===String?new(e.Overlays[t._jsPlumb.instance.getRenderMode()][i])({component:t,_jsPlumb:t._jsPlumb.instance}):i;return o.id=o.id||n.uuid(),t.cacheTypeItem("overlay",o,o.id),t._jsPlumb.overlays[o.id]=o,o}(this,t);if(this.getData&&"Label"===o.type&&n.isArray(t)){var s=this.getData(),r=t[1];if(s){var a=r.labelLocationAttribute||"labelLocation",l=s?s[a]:null;l&&(o.loc=l)}}return i||this.repaint(),o},getOverlay:function(t){return this._jsPlumb.overlays[t]},getOverlays:function(){return this._jsPlumb.overlays},hideOverlay:function(t){var e=this.getOverlay(t);e&&e.hide()},hideOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].hide()},showOverlay:function(t){var e=this.getOverlay(t);e&&e.show()},showOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].show()},removeAllOverlays:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup&&this._jsPlumb.overlays[e].cleanup();this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null,this._jsPlumb.overlayPlacements={},t||this.repaint()},removeOverlay:function(t,e){var n=this._jsPlumb.overlays[t];n&&(n.setVisible(!1),!e&&n.cleanup&&n.cleanup(),delete this._jsPlumb.overlays[t],this._jsPlumb.overlayPositions&&delete this._jsPlumb.overlayPositions[t],this._jsPlumb.overlayPlacements&&delete this._jsPlumb.overlayPlacements[t])},removeOverlays:function(){for(var t=0,e=arguments.length;t<e;t++)this.removeOverlay(arguments[t])},moveParent:function(t){if(this.bgCanvas&&(this.bgCanvas.parentNode.removeChild(this.bgCanvas),t.appendChild(this.bgCanvas)),this.canvas&&this.canvas.parentNode)for(var e in this.canvas.parentNode.removeChild(this.canvas),t.appendChild(this.canvas),this._jsPlumb.overlays)if(this._jsPlumb.overlays[e].isAppendedAtTopLevel){var n=this._jsPlumb.overlays[e].getElement();n.parentNode.removeChild(n),t.appendChild(n)}},getLabel:function(){var t=this.getOverlay("__label");return null!=t?t.getLabel():null},getLabelOverlay:function(){return this.getOverlay("__label")},setLabel:function(t){var n=this.getOverlay("__label");n?t.constructor===String||t.constructor===Function?n.setLabel(t):(t.label&&n.setLabel(t.label),t.location&&n.setLocation(t.location)):(n=function(t,n){var i={cssClass:n.cssClass,labelStyle:t.labelStyle,id:"__label",component:t,_jsPlumb:t._jsPlumb.instance},o=e.extend(i,n);return new(e.Overlays[t._jsPlumb.instance.getRenderMode()].Label)(o)}(this,t.constructor===String||t.constructor===Function?{label:t}:t),this._jsPlumb.overlays.__label=n);this._jsPlumb.instance.isSuspendDrawing()||this.repaint()},cleanup:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup(t),this._jsPlumb.overlays[e].destroy(t);t&&(this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null)},setVisible:function(t){this[t?"showOverlays":"hideOverlays"]()},setAbsoluteOverlayPosition:function(t,e){this._jsPlumb.overlayPositions[t.id]=e},getAbsoluteOverlayPosition:function(t){return this._jsPlumb.overlayPositions?this._jsPlumb.overlayPositions[t.id]:null},_clazzManip:function(t,e,n){if(!n)for(var i in this._jsPlumb.overlays)this._jsPlumb.overlays[i][t+"Class"](e)},addClass:function(t,e){this._clazzManip("add",t,e)},removeClass:function(t,e){this._clazzManip("remove",t,e)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=["connectorStyle","connectorHoverStyle","connectorOverlays","connector","connectionType","connectorClass","connectorHoverClass"];t.Endpoint=function(i){var o=i._jsPlumb,s=i.newConnection,r=i.newEndpoint;this.idPrefix="_jsplumb_e_",this.defaultLabelLocation=[.5,.5],this.defaultOverlayKeys=["Overlays","EndpointOverlays"],t.OverlayCapableJsPlumbUIComponent.apply(this,arguments),this.appendToDefaultType({connectionType:i.connectionType,maxConnections:null==i.maxConnections?this._jsPlumb.instance.Defaults.MaxConnections:i.maxConnections,paintStyle:i.endpointStyle||i.paintStyle||i.style||this._jsPlumb.instance.Defaults.EndpointStyle||t.Defaults.EndpointStyle,hoverPaintStyle:i.endpointHoverStyle||i.hoverPaintStyle||this._jsPlumb.instance.Defaults.EndpointHoverStyle||t.Defaults.EndpointHoverStyle,connectorStyle:i.connectorStyle,connectorHoverStyle:i.connectorHoverStyle,connectorClass:i.connectorClass,connectorHoverClass:i.connectorHoverClass,connectorOverlays:i.connectorOverlays,connector:i.connector,connectorTooltip:i.connectorTooltip}),this._jsPlumb.enabled=!(!1===i.enabled),this._jsPlumb.visible=!0,this.element=t.getElement(i.source),this._jsPlumb.uuid=i.uuid,this._jsPlumb.floatingEndpoint=null,this._jsPlumb.uuid&&(i.endpointsByUUID[this._jsPlumb.uuid]=this),this.elementId=i.elementId,this.dragProxy=i.dragProxy,this._jsPlumb.connectionCost=i.connectionCost,this._jsPlumb.connectionsDirected=i.connectionsDirected,this._jsPlumb.currentAnchorClass="",this._jsPlumb.events={};var a=!0===i.deleteOnEmpty;this.setDeleteOnEmpty=function(t){a=t};var l=function(){var e=o.endpointAnchorClassPrefix+"-"+this._jsPlumb.currentAnchorClass;this._jsPlumb.currentAnchorClass=this.anchor.getCssClass();var n=o.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");this.removeClass(e),this.addClass(n),t.updateClasses(this.element,n,e)}.bind(this);this.prepareAnchor=function(t){var e=this._jsPlumb.instance.makeAnchor(t,this.elementId,o);return e.bind("anchorChanged",function(t){this.fire("anchorChanged",{endpoint:this,anchor:t}),l()}.bind(this)),e},this.setPreparedAnchor=function(t,e){return this._jsPlumb.instance.continuousAnchorFactory.clear(this.elementId),this.anchor=t,l(),e||this._jsPlumb.instance.repaint(this.elementId),this},this.setAnchor=function(t,e){var n=this.prepareAnchor(t);return this.setPreparedAnchor(n,e),this};var u=function(t){if(this.connections.length>0)for(var e=0;e<this.connections.length;e++)this.connections[e].setHover(t,!1);else this.setHover(t)}.bind(this);this.bind("mouseover",function(){u(!0)}),this.bind("mouseout",function(){u(!1)}),i._transient||this._jsPlumb.instance.router.addEndpoint(this,this.elementId),this.prepareEndpoint=function(n,s){var r,a=function(e,n){var i=o.getRenderMode();if(t.Endpoints[i][e])return new t.Endpoints[i][e](n);if(!o.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown endpoint type '"+e+"'"}},l={_jsPlumb:this._jsPlumb.instance,cssClass:i.cssClass,container:i.container,tooltip:i.tooltip,connectorTooltip:i.connectorTooltip,endpoint:this};return e.isString(n)?r=a(n,l):e.isArray(n)?(l=e.merge(n[1],l),r=a(n[0],l)):r=n.clone(),r.clone=function(){return e.isString(n)?a(n,l):e.isArray(n)?(l=e.merge(n[1],l),a(n[0],l)):void 0}.bind(this),r.typeId=s,r},this.setEndpoint=function(t,e){var n=this.prepareEndpoint(t);this.setPreparedEndpoint(n,!0)},this.setPreparedEndpoint=function(t,e){null!=this.endpoint&&(this.endpoint.cleanup(),this.endpoint.destroy()),this.endpoint=t,this.type=this.endpoint.type,this.canvas=this.endpoint.canvas},t.extend(this,i,n),this.isSource=i.isSource||!1,this.isTemporarySource=i.isTemporarySource||!1,this.isTarget=i.isTarget||!1,this.connections=i.connections||[],this.connectorPointerEvents=i["connector-pointer-events"],this.scope=i.scope||o.getDefaultScope(),this.timestamp=null,this.reattachConnections=i.reattach||o.Defaults.ReattachConnections,this.connectionsDetachable=o.Defaults.ConnectionsDetachable,!1!==i.connectionsDetachable&&!1!==i.detachable||(this.connectionsDetachable=!1),this.dragAllowedWhenFull=!1!==i.dragAllowedWhenFull,i.onMaxConnections&&this.bind("maxConnections",i.onMaxConnections),this.addConnection=function(t){this.connections.push(t),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)},this.detachFromConnection=function(t,e,n){(e=null==e?this.connections.indexOf(t):e)>=0&&(this.connections.splice(e,1),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)),!n&&a&&0===this.connections.length&&o.deleteObject({endpoint:this,fireEvent:!1,deleteAttachedObjects:!0!==n})},this.deleteEveryConnection=function(t){for(var e=this.connections.length,n=0;n<e;n++)o.deleteConnection(this.connections[0],t)},this.detachFrom=function(t,e,n){for(var i=[],s=0;s<this.connections.length;s++)this.connections[s].endpoints[1]!==t&&this.connections[s].endpoints[0]!==t||i.push(this.connections[s]);for(var r=0,a=i.length;r<a;r++)o.deleteConnection(i[0]);return this},this.getElement=function(){return this.element},this.setElement=function(n){var s=this._jsPlumb.instance.getId(n),r=this.elementId;return e.removeWithFunction(i.endpointsByElement[this.elementId],function(t){return t.id===this.id}.bind(this)),this.element=t.getElement(n),this.elementId=o.getId(this.element),o.router.rehomeEndpoint(this,r,this.element),o.dragManager.endpointAdded(this.element),e.addToList(i.endpointsByElement,s,this),this},this.makeInPlaceCopy=function(){var t=this.anchor.getCurrentLocation({element:this}),e=this.anchor.getOrientation(this),n=this.anchor.getCssClass(),o={bind:function(){},compute:function(){return[t[0],t[1]]},getCurrentLocation:function(){return[t[0],t[1]]},getOrientation:function(){return e},getCssClass:function(){return n}};return r({dropOptions:i.dropOptions,anchor:o,source:this.element,paintStyle:this.getPaintStyle(),endpoint:i.hideOnDrag?"Blank":this.endpoint,_transient:!0,scope:this.scope,reference:this})},this.connectorSelector=function(){return this.connections[0]},this.setStyle=this.setPaintStyle,this.paint=function(t){var e=(t=t||{}).timestamp,n=!(!1===t.recalc);if(!e||this.timestamp!==e){var i=o.updateOffset({elId:this.elementId,timestamp:e}),s=t.offset?t.offset.o:i.o;if(null!=s){var r=t.anchorPoint,a=t.connectorPaintStyle;if(null==r){var l=t.dimensions||i.s,u={xy:[s.left,s.top],wh:l,element:this,timestamp:e};if(n&&this.anchor.isDynamic&&this.connections.length>0){var c=function(t,e){var n=0;if(null!=e)for(var i=0;i<t.connections.length;i++)if(t.connections[i].sourceId===e||t.connections[i].targetId===e){n=i;break}return t.connections[n]}(this,t.elementWithPrecedence),h=c.endpoints[0]===this?1:0,d=0===h?c.sourceId:c.targetId,p=o.getCachedData(d),f=p.o,g=p.s;u.index=0===h?1:0,u.connection=c,u.txy=[f.left,f.top],u.twh=g,u.tElement=c.endpoints[h],u.tRotation=o.getRotation(d)}else this.connections.length>0&&(u.connection=this.connections[0]);u.rotation=o.getRotation(this.elementId),r=this.anchor.compute(u)}for(var m in this.endpoint.compute(r,this.anchor.getOrientation(this),this._jsPlumb.paintStyleInUse,a||this.paintStyleInUse),this.endpoint.paint(this._jsPlumb.paintStyleInUse,this.anchor),this.timestamp=e,this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&(this._jsPlumb.overlayPlacements[m]=v.draw(this.endpoint,this._jsPlumb.paintStyleInUse),v.paint(this._jsPlumb.overlayPlacements[m]))}}}},this.getTypeDescriptor=function(){return"endpoint"},this.isVisible=function(){return this._jsPlumb.visible},this.repaint=this.paint;var c=!1;this.initDraggable=function(){if(!c&&t.isDragSupported(this.element)){var n,a={id:null,element:null},l=null,u=!1,h=null,d=function(t,e,n){var i=!1;return{drag:function(){if(i)return i=!1,!0;if(e.element){var o=n.getUIPosition(arguments,n.getZoom());null!=o&&n.setPosition(e.element,o),n.repaint(e.element,o),t.paint({anchorPoint:t.anchor.getCurrentLocation({element:t})})}},stopDrag:function(){i=!0}}}(this,a,o),p=i.dragOptions||{},f=t.dragEvents.start,g=t.dragEvents.stop,m=t.dragEvents.drag,v=t.dragEvents.beforeStart,y=function(e){l=this.connectorSelector();var c=!0;this.isEnabled()||(c=!1),null!=l||this.isSource||this.isTemporarySource||(c=!1),!this.isSource||!this.isFull()||null!=l&&this.dragAllowedWhenFull||(c=!1),null==l||l.isDetachable(this)||(this.isFull()?c=!1:l=null);var p=o.checkCondition(null==l?"beforeDrag":"beforeStartDetach",{endpoint:this,source:this.element,sourceId:this.elementId,connection:l});if(!1===p?c=!1:"object"==typeof p?t.extend(p,n||{}):p=n||{},!1===c)return o.stopDrag&&o.stopDrag(this.canvas),d.stopDrag(),!1;for(var f=0;f<this.connections.length;f++)this.connections[f].setHover(!1);this.addClass("endpointDrag"),o.setConnectionBeingDragged(!0),l&&!this.isFull()&&this.isSource&&(l=null),o.updateOffset({elId:this.elementId});var g=this._jsPlumb.instance.getOffset(this.canvas),m=this.canvas,v=this._jsPlumb.instance.getSize(this.canvas);!function(t,e,n,i){var o=e.createElement("div",{position:"absolute"});e.appendElement(o);var s=e.getId(o);e.setPosition(o,n),o.style.width=i[0]+"px",o.style.height=i[1]+"px",e.manage(s,o,!0),t.id=s,t.element=o}(a,o,g,v),o.setAttributes(this.canvas,{dragId:a.id,elId:this.elementId});var y=this.dragProxy||this.endpoint;if(null==this.dragProxy&&null!=this.connectionType){var b=this._jsPlumb.instance.deriveEndpointAndAnchorSpec(this.connectionType);b.endpoints[1]&&(y=b.endpoints[1])}var P=this._jsPlumb.instance.makeAnchor("Center");P.isFloating=!0,this._jsPlumb.floatingEndpoint=function(e,n,i,o,s,r,a,l){return a({paintStyle:e,endpoint:i,anchor:new t.FloatingAnchor({reference:n,referenceCanvas:o,jsPlumbInstance:r}),source:s,scope:l})}(this.getPaintStyle(),P,y,this.canvas,a.element,o,r,this.scope);var x=this._jsPlumb.floatingEndpoint.anchor;if(null==l)this.setHover(!1,!1),(l=s({sourceEndpoint:this,targetEndpoint:this._jsPlumb.floatingEndpoint,source:this.element,target:a.element,anchors:[this.anchor,this._jsPlumb.floatingEndpoint.anchor],paintStyle:i.connectorStyle,hoverPaintStyle:i.connectorHoverStyle,connector:i.connector,overlays:i.connectorOverlays,type:this.connectionType,cssClass:this.connectorClass,hoverClass:this.connectorHoverClass,scope:i.scope,data:p})).pending=!0,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.anchor=x,o.fire("connectionDrag",l),o.router.newConnection(l);else{u=!0,l.setHover(!1);var C=l.endpoints[0].id===this.id?0:1;this.detachFromConnection(l,null,!0);var _=o.getDragScope(m);o.setAttribute(this.canvas,"originalScope",_),o.fire("connectionDrag",l),0===C?(h=[l.source,l.sourceId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,0)):(h=[l.target,l.targetId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,1)),l.suspendedEndpoint=l.endpoints[C],l.suspendedElement=l.endpoints[C].getElement(),l.suspendedElementId=l.endpoints[C].elementId,l.suspendedElementType=0===C?"source":"target",l.suspendedEndpoint.setHover(!1),this._jsPlumb.floatingEndpoint.referenceEndpoint=l.suspendedEndpoint,l.endpoints[C]=this._jsPlumb.floatingEndpoint,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass)}o.registerFloatingConnection(a,l,this._jsPlumb.floatingEndpoint),o.currentlyDragging=!0}.bind(this),b=function(){if(o.setConnectionBeingDragged(!1),l&&null!=l.endpoints){var t=o.getDropEvent(arguments),e=o.getFloatingAnchorIndex(l);if(l.endpoints[0===e?1:0].anchor.locked=!1,l.removeClass(o.draggingClass),this._jsPlumb&&(l.deleteConnectionNow||l.endpoints[e]===this._jsPlumb.floatingEndpoint)&&u&&l.suspendedEndpoint){0===e?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=h[0],l.sourceId=h[1]):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=h[0],l.targetId=h[1]);var n=this._jsPlumb.floatingEndpoint;o.setDragScope(h[2],h[3]),l.endpoints[e]=l.suspendedEndpoint,l.isReattach()||l._forceReattach||l._forceDetach||!o.deleteConnection(l,{originalEvent:t})?(l.setHover(!1),l._forceDetach=null,l._forceReattach=null,this._jsPlumb.floatingEndpoint.detachFromConnection(l),l.suspendedEndpoint.addConnection(l),1===e?o.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,e):o.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,e),o.repaint(h[1])):o.deleteObject({endpoint:n})}this.deleteAfterDragStop?o.deleteObject({endpoint:this}):this._jsPlumb&&this.paint({recalc:!1}),o.fire("connectionDragStop",l,t),l.pending&&o.fire("connectionAborted",l,t),o.currentlyDragging=!1,l.suspendedElement=null,l.suspendedEndpoint=null,l=null}a&&a.element&&o.remove(a.element,!1,!1),this._jsPlumb&&(this.canvas.style.visibility="visible",this.anchor.locked=!1,this._jsPlumb.floatingEndpoint=null)}.bind(this);(p=t.extend({},p)).scope=this.scope||p.scope,p[v]=e.wrap(p[v],function(t){n=t.e.payload||{}},!1),p[f]=e.wrap(p[f],y,!1),p[m]=e.wrap(p[m],d.drag),p[g]=e.wrap(p[g],b),p.multipleDrop=!1,p.canDrag=function(){return this.isSource||this.isTemporarySource||this.connections.length>0&&!1!==this.connectionsDetachable}.bind(this),o.initDraggable(this.canvas,p,"internal"),this.canvas._jsPlumbRelatedElement=this.element,c=!0}};var h=i.endpoint||this._jsPlumb.instance.Defaults.Endpoint||t.Defaults.Endpoint;this.setEndpoint(h,!0);var d=i.anchor?i.anchor:i.anchors?i.anchors:o.Defaults.Anchor||"Top";this.setAnchor(d,!0);var p=["default",i.type||""].join(" ");this.addType(p,i.data,!0),this.canvas=this.endpoint.canvas,this.canvas._jsPlumb=this,this.initDraggable();var f=function(n,s,r,a){if(t.isDropSupported(this.element)){var l=i.dropOptions||o.Defaults.DropOptions||t.Defaults.DropOptions;(l=t.extend({},l)).scope=l.scope||this.scope;var u=t.dragEvents.drop,c=t.dragEvents.over,h=t.dragEvents.out,d=this,p=o.EndpointDropHandler({getEndpoint:function(){return d},jsPlumb:o,enabled:function(){return null==r||r.isEnabled()},isFull:function(){return r.isFull()},element:this.element,elementId:this.elementId,isSource:this.isSource,isTarget:this.isTarget,addClass:function(t){d.addClass(t)},removeClass:function(t){d.removeClass(t)},isDropAllowed:function(){return d.isDropAllowed.apply(d,arguments)},reference:a,isRedrop:function(t,e){return t.suspendedEndpoint&&e.reference&&t.suspendedEndpoint.id===e.reference.id}});l[u]=e.wrap(l[u],p,!0),l[c]=e.wrap(l[c],function(){var e=t.getDragObject(arguments),n=o.getAttribute(t.getElement(e),"dragId"),i=o.getFloatingConnectionFor(n);if(null!=i){var s=o.getFloatingAnchorIndex(i);if(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id){var r=o.checkCondition("checkDropAllowed",{sourceEndpoint:i.endpoints[s],targetEndpoint:this,connection:i});this[(r?"add":"remove")+"Class"](o.endpointDropAllowedClass),this[(r?"remove":"add")+"Class"](o.endpointDropForbiddenClass),i.endpoints[s].anchor.over(this.anchor,this)}}}.bind(this)),l[h]=e.wrap(l[h],function(){var e=t.getDragObject(arguments),n=null==e?null:o.getAttribute(t.getElement(e),"dragId"),i=n?o.getFloatingConnectionFor(n):null;if(null!=i){var s=o.getFloatingAnchorIndex(i);(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id)&&(this.removeClass(o.endpointDropAllowedClass),this.removeClass(o.endpointDropForbiddenClass),i.endpoints[s].anchor.out())}}.bind(this)),o.initDroppable(n,l,"internal",s)}}.bind(this);return this.anchor.isFloating||f(this.canvas,!(i._transient||this.anchor.isFloating),this,i.reference),this},e.extend(t.Endpoint,t.OverlayCapableJsPlumbUIComponent,{setVisible:function(t,e,n){if(this._jsPlumb.visible=t,this.canvas&&(this.canvas.style.display=t?"block":"none"),this[t?"showOverlays":"hideOverlays"](),!e)for(var i=0;i<this.connections.length;i++)if(this.connections[i].setVisible(t),!n){var o=this===this.connections[i].endpoints[0]?1:0;1===this.connections[i].endpoints[o].connections.length&&this.connections[i].endpoints[o].setVisible(t,!0,!0)}},getAttachedElements:function(){return this.connections},applyType:function(e,i){this.setPaintStyle(e.endpointStyle||e.paintStyle,i),this.setHoverPaintStyle(e.endpointHoverStyle||e.hoverPaintStyle,i),null!=e.maxConnections&&(this._jsPlumb.maxConnections=e.maxConnections),e.scope&&(this.scope=e.scope),t.extend(this,e,n),null!=e.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,e.cssClass),t.OverlayCapableJsPlumbUIComponent.applyType(this,e)},isEnabled:function(){return this._jsPlumb.enabled},setEnabled:function(t){this._jsPlumb.enabled=t},cleanup:function(){var e=this._jsPlumb.instance.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");t.removeClass(this.element,e),this.anchor=null,this.endpoint.cleanup(!0),this.endpoint.destroy(),this.endpoint=null,this._jsPlumb.instance.destroyDraggable(this.canvas,"internal"),this._jsPlumb.instance.destroyDroppable(this.canvas,"internal")},setHover:function(t){this.endpoint&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&this.endpoint.setHover(t)},isFull:function(){return 0===this._jsPlumb.maxConnections||!(this.isFloating()||this._jsPlumb.maxConnections<0||this.connections.length<this._jsPlumb.maxConnections)},isFloating:function(){return null!=this.anchor&&this.anchor.isFloating},isConnectedTo:function(t){var e=!1;if(t)for(var n=0;n<this.connections.length;n++)if(this.connections[n].endpoints[1]===t||this.connections[n].endpoints[0]===t){e=!0;break}return e},getConnectionCost:function(){return this._jsPlumb.connectionCost},setConnectionCost:function(t){this._jsPlumb.connectionCost=t},areConnectionsDirected:function(){return this._jsPlumb.connectionsDirected},setConnectionsDirected:function(t){this._jsPlumb.connectionsDirected=t},setElementId:function(t){this.elementId=t,this.anchor.elementId=t},setReferenceElement:function(e){this.element=t.getElement(e)},setDragAllowedWhenFull:function(t){this.dragAllowedWhenFull=t},equals:function(t){return this.anchor.equals(t.anchor)},getUuid:function(){return this._jsPlumb.uuid},computeAnchor:function(t){return this.anchor.compute(t)}}),this.jsPlumbInstance.prototype.EndpointDropHandler=function(t){return function(n){var i=t.jsPlumb;t.removeClass(i.endpointDropAllowedClass),t.removeClass(i.endpointDropForbiddenClass);var o=i.getDropEvent(arguments),s=i.getDragObject(arguments),r=i.getAttribute(s,"dragId"),a=(i.getAttribute(s,"elId"),i.getAttribute(s,"originalScope")),l=i.getFloatingConnectionFor(r);if(null!=l){var u=null!=l.suspendedEndpoint;if(!u||null!=l.suspendedEndpoint._jsPlumb){var c=t.getEndpoint(l);if(null!=c){if(t.isRedrop(l,t))return l._forceReattach=!0,l.setHover(!1),void(t.maybeCleanup&&t.maybeCleanup(c));var h=i.getFloatingAnchorIndex(l);if(0===h&&!t.isSource||1===h&&!t.isTarget)t.maybeCleanup&&t.maybeCleanup(c);else{t.onDrop&&t.onDrop(l),a&&i.setDragScope(s,a);var d=t.isFull(n);if(d&&c.fire("maxConnections",{endpoint:this,connection:l,maxConnections:c._jsPlumb.maxConnections},o),!d&&t.enabled()){var p=!0;0===h?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=t.element,l.sourceId=i.getId(t.element)):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=t.element,l.targetId=i.getId(t.element)),u&&l.suspendedEndpoint.id!==c.id&&(l.isDetachAllowed(l)&&l.endpoints[h].isDetachAllowed(l)&&l.suspendedEndpoint.isDetachAllowed(l)&&i.checkCondition("beforeDetach",l)||(p=!1));var f=function(n){l.endpoints[h].detachFromConnection(l),l.suspendedEndpoint&&l.suspendedEndpoint.detachFromConnection(l),l.endpoints[h]=c,c.addConnection(l);var s=c.getParameters();for(var r in s)l.setParameter(r,s[r]);if(u){var a=l.suspendedEndpoint.elementId;i.fireMoveEvent({index:h,originalSourceId:0===h?a:l.sourceId,newSourceId:0===h?c.elementId:l.sourceId,originalTargetId:1===h?a:l.targetId,newTargetId:1===h?c.elementId:l.targetId,originalSourceEndpoint:0===h?l.suspendedEndpoint:l.endpoints[0],newSourceEndpoint:0===h?c:l.endpoints[0],originalTargetEndpoint:1===h?l.suspendedEndpoint:l.endpoints[1],newTargetEndpoint:1===h?c:l.endpoints[1],connection:l},o)}else s.draggable&&i.initDraggable(this.element,t.dragOptions,"internal",i);(1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),l.endpoints[0].finalEndpoint)&&(l.endpoints[0].detachFromConnection(l),l.endpoints[0]=l.endpoints[0].finalEndpoint,l.endpoints[0].addConnection(l));e.isObject(n)&&l.mergeData(n),i.finaliseConnection(l,null,o,!1),l.setHover(!1),i.revalidate(l.endpoints[0].element)}.bind(this);if(p=p&&t.isDropAllowed(l.sourceId,l.targetId,l.scope,l,c))return f(p),!0;l.suspendedEndpoint&&(l.endpoints[h]=l.suspendedEndpoint,l.setHover(!1),l._forceDetach=!0,0===h?(l.source=l.suspendedEndpoint.element,l.sourceId=l.suspendedEndpoint.elementId):(l.target=l.suspendedEndpoint.element,l.targetId=l.suspendedEndpoint.elementId),l.suspendedEndpoint.addConnection(l),1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),i.repaint(l.sourceId),l._forceDetach=!1)}t.maybeCleanup&&t.maybeCleanup(c),i.currentlyDragging=!1}}}}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=function(t,i,o,s,r){if(e.Connectors[i]=e.Connectors[i]||{},null==e.Connectors[i][o]){if(null==e.Connectors[o]){if(t.Defaults.DoNotThrowErrors)return null;throw new TypeError("jsPlumb: unknown connector type '"+o+"'")}e.Connectors[i][o]=function(){e.Connectors[o].apply(this,arguments),e.ConnectorRenderers[i].apply(this,arguments)},n.extend(e.Connectors[i][o],[e.Connectors[o],e.ConnectorRenderers[i]])}return new e.Connectors[i][o](s,r)},o=function(t,e,n){return t?n.makeAnchor(t,e,n):null},s=function(t,e,i,o){null!=e&&(e._jsPlumbConnections=e._jsPlumbConnections||{},o?delete e._jsPlumbConnections[t.id]:e._jsPlumbConnections[t.id]=!0,n.isEmpty(e._jsPlumbConnections)?i.removeClass(e,i.connectedClass):i.addClass(e,i.connectedClass))};e.Connection=function(t){var i=t.newEndpoint;this.id=t.id,this.connector=null,this.idPrefix="_jsplumb_c_",this.defaultLabelLocation=.5,this.defaultOverlayKeys=["Overlays","ConnectionOverlays"],this.previousConnection=t.previousConnection,this.source=e.getElement(t.source),this.target=e.getElement(t.target),e.OverlayCapableJsPlumbUIComponent.apply(this,arguments),t.sourceEndpoint?(this.source=t.sourceEndpoint.getElement(),this.sourceId=t.sourceEndpoint.elementId):this.sourceId=this._jsPlumb.instance.getId(this.source),t.targetEndpoint?(this.target=t.targetEndpoint.getElement(),this.targetId=t.targetEndpoint.elementId):this.targetId=this._jsPlumb.instance.getId(this.target),this.scope=t.scope,this.endpoints=[],this.endpointStyles=[];var o=this._jsPlumb.instance;o.manage(this.sourceId,this.source),o.manage(this.targetId,this.target),this._jsPlumb.visible=!0,this._jsPlumb.params={cssClass:t.cssClass,container:t.container,"pointer-events":t["pointer-events"],editorParams:t.editorParams,overlays:t.overlays},this._jsPlumb.lastPaintedAt=null,this.bind("mouseover",function(){this.setHover(!0)}.bind(this)),this.bind("mouseout",function(){this.setHover(!1)}.bind(this)),this.makeEndpoint=function(e,n,s,r,a){return s=s||this._jsPlumb.instance.getId(n),this.prepareEndpoint(o,i,this,r,e?0:1,t,n,s,a)},t.type&&(t.endpoints=t.endpoints||this._jsPlumb.instance.deriveEndpointAndAnchorSpec(t.type).endpoints);var s=this.makeEndpoint(!0,this.source,this.sourceId,t.sourceEndpoint),r=this.makeEndpoint(!1,this.target,this.targetId,t.targetEndpoint);s&&n.addToList(t.endpointsByElement,this.sourceId,s),r&&n.addToList(t.endpointsByElement,this.targetId,r),this.scope||(this.scope=this.endpoints[0].scope),null!=t.deleteEndpointsOnEmpty&&(this.endpoints[0].setDeleteOnEmpty(t.deleteEndpointsOnEmpty),this.endpoints[1].setDeleteOnEmpty(t.deleteEndpointsOnEmpty));var a=o.Defaults.ConnectionsDetachable;!1===t.detachable&&(a=!1),!1===this.endpoints[0].connectionsDetachable&&(a=!1),!1===this.endpoints[1].connectionsDetachable&&(a=!1);var l=t.reattach||this.endpoints[0].reattachConnections||this.endpoints[1].reattachConnections||o.Defaults.ReattachConnections;this.appendToDefaultType({detachable:a,reattach:l,paintStyle:this.endpoints[0].connectorStyle||this.endpoints[1].connectorStyle||t.paintStyle||o.Defaults.PaintStyle||e.Defaults.PaintStyle,hoverPaintStyle:this.endpoints[0].connectorHoverStyle||this.endpoints[1].connectorHoverStyle||t.hoverPaintStyle||o.Defaults.HoverPaintStyle||e.Defaults.HoverPaintStyle});var u=o.getSuspendedAt();if(!o.isSuspendDrawing()){var c=o.getCachedData(this.sourceId),h=c.o,d=c.s,p=o.getCachedData(this.targetId),f=p.o,g=p.s,m=u||jsPlumbUtil.uuid(),v=this.endpoints[0].anchor.compute({xy:[h.left,h.top],wh:d,element:this.endpoints[0],elementId:this.endpoints[0].elementId,txy:[f.left,f.top],twh:g,tElement:this.endpoints[1],timestamp:m,rotation:o.getRotation(this.endpoints[0].elementId)});this.endpoints[0].paint({anchorLoc:v,timestamp:m}),v=this.endpoints[1].anchor.compute({xy:[f.left,f.top],wh:g,element:this.endpoints[1],elementId:this.endpoints[1].elementId,txy:[h.left,h.top],twh:d,tElement:this.endpoints[0],timestamp:m,rotation:o.getRotation(this.endpoints[1].elementId)}),this.endpoints[1].paint({anchorLoc:v,timestamp:m})}this.getTypeDescriptor=function(){return"connection"},this.getAttachedElements=function(){return this.endpoints},this.isDetachable=function(t){return!1!==this._jsPlumb.detachable&&(null!=t?!0===t.connectionsDetachable:!0===this._jsPlumb.detachable)},this.setDetachable=function(t){this._jsPlumb.detachable=!0===t},this.isReattach=function(){return!0===this._jsPlumb.reattach||!0===this.endpoints[0].reattachConnections||!0===this.endpoints[1].reattachConnections},this.setReattach=function(t){this._jsPlumb.reattach=!0===t},this._jsPlumb.cost=t.cost||this.endpoints[0].getConnectionCost(),this._jsPlumb.directed=t.directed,null==t.directed&&(this._jsPlumb.directed=this.endpoints[0].areConnectionsDirected());var y=e.extend({},this.endpoints[1].getParameters());e.extend(y,this.endpoints[0].getParameters()),e.extend(y,this.getParameters()),this.setParameters(y),this.setConnector(this.endpoints[0].connector||this.endpoints[1].connector||t.connector||o.Defaults.Connector||e.Defaults.Connector,!0);var b=null!=t.data&&n.isObject(t.data)?t.data:{};this.getData=function(){return b},this.setData=function(t){b=t||{}},this.mergeData=function(t){b=e.extend(b,t)};var P=["default",this.endpoints[0].connectionType,this.endpoints[1].connectionType,t.type].join(" ");/[^\s]/.test(P)&&this.addType(P,t.data,!0),this.updateConnectedClass()},n.extend(e.Connection,e.OverlayCapableJsPlumbUIComponent,{applyType:function(t,n,i){var o=null;null!=t.connector&&(null==(o=this.getCachedTypeItem("connector",i.connector))&&(o=this.prepareConnector(t.connector,i.connector),this.cacheTypeItem("connector",o,i.connector)),this.setPreparedConnector(o)),null!=t.detachable&&this.setDetachable(t.detachable),null!=t.reattach&&this.setReattach(t.reattach),t.scope&&(this.scope=t.scope),null!=t.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,t.cssClass);var s=null;t.anchor?null==(s=this.getCachedTypeItem("anchors",i.anchor))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchor),this._jsPlumb.instance.makeAnchor(t.anchor)],this.cacheTypeItem("anchors",s,i.anchor)):t.anchors&&null==(s=this.getCachedTypeItem("anchors",i.anchors))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchors[0]),this._jsPlumb.instance.makeAnchor(t.anchors[1])],this.cacheTypeItem("anchors",s,i.anchors)),null!=s&&(this.endpoints[0].anchor=s[0],this.endpoints[1].anchor=s[1],this.endpoints[1].anchor.isDynamic&&this._jsPlumb.instance.repaint(this.endpoints[1].elementId)),e.OverlayCapableJsPlumbUIComponent.applyType(this,t)},addClass:function(t,e){e&&(this.endpoints[0].addClass(t),this.endpoints[1].addClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.addClass(t)),this.connector&&this.connector.addClass(t)},removeClass:function(t,e){e&&(this.endpoints[0].removeClass(t),this.endpoints[1].removeClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.removeClass(t)),this.connector&&this.connector.removeClass(t)},isVisible:function(){return this._jsPlumb.visible},setVisible:function(t){this._jsPlumb.visible=t,this.connector&&this.connector.setVisible(t),this.repaint()},cleanup:function(){this.updateConnectedClass(!0),this.endpoints=null,this.source=null,this.target=null,null!=this.connector&&(this.connector.cleanup(!0),this.connector.destroy(!0)),this.connector=null},updateConnectedClass:function(t){this._jsPlumb&&(s(this,this.source,this._jsPlumb.instance,t),s(this,this.target,this._jsPlumb.instance,t))},setHover:function(e){this.connector&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&(this.connector.setHover(e),t.jsPlumb[e?"addClass":"removeClass"](this.source,this._jsPlumb.instance.hoverSourceClass),t.jsPlumb[e?"addClass":"removeClass"](this.target,this._jsPlumb.instance.hoverTargetClass))},getUuids:function(){return[this.endpoints[0].getUuid(),this.endpoints[1].getUuid()]},getCost:function(){return this._jsPlumb?this._jsPlumb.cost:-1/0},setCost:function(t){this._jsPlumb.cost=t},isDirected:function(){return this._jsPlumb.directed},getConnector:function(){return this.connector},prepareConnector:function(t,e){var o,s={_jsPlumb:this._jsPlumb.instance,cssClass:this._jsPlumb.params.cssClass,container:this._jsPlumb.params.container,"pointer-events":this._jsPlumb.params["pointer-events"]},r=this._jsPlumb.instance.getRenderMode();return n.isString(t)?o=i(this._jsPlumb.instance,r,t,s,this):n.isArray(t)&&(o=1===t.length?i(this._jsPlumb.instance,r,t[0],s,this):i(this._jsPlumb.instance,r,t[0],n.merge(t[1],s),this)),null!=e&&(o.typeId=e),o},setPreparedConnector:function(t,e,n,i){if(this.connector!==t){var o,s="";if(null!=this.connector&&(s=(o=this.connector).getClass(),this.connector.cleanup(),this.connector.destroy()),this.connector=t,i&&this.cacheTypeItem("connector",t,i),this.canvas=this.connector.canvas,this.bgCanvas=this.connector.bgCanvas,this.connector.reattach(this._jsPlumb.instance),this.addClass(s),this.canvas&&(this.canvas._jsPlumb=this),this.bgCanvas&&(this.bgCanvas._jsPlumb=this),null!=o)for(var r=this.getOverlays(),a=0;a<r.length;a++)r[a].transfer&&r[a].transfer(this.connector);n||this.setListenerComponent(this.connector),e||this.repaint()}},setConnector:function(t,e,n,i){var o=this.prepareConnector(t,i);this.setPreparedConnector(o,e,n,i)},paint:function(t){if(!this._jsPlumb.instance.isSuspendDrawing()&&this._jsPlumb.visible){var e=(t=t||{}).timestamp,n=this.targetId,i=this.sourceId;if(null==e||e!==this._jsPlumb.lastPaintedAt){var o=this._jsPlumb.instance.updateOffset({elId:i}).o,s=this._jsPlumb.instance.updateOffset({elId:n}).o,r=this.endpoints[0],a=this.endpoints[1],l=r.anchor.getCurrentLocation({xy:[o.left,o.top],wh:[o.width,o.height],element:r,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.sourceId)}),u=a.anchor.getCurrentLocation({xy:[s.left,s.top],wh:[s.width,s.height],element:a,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.targetId)});this.connector.resetBounds(),this.connector.compute({sourcePos:l,targetPos:u,sourceOrientation:r.anchor.getOrientation(r),targetOrientation:a.anchor.getOrientation(a),sourceEndpoint:this.endpoints[0],targetEndpoint:this.endpoints[1],"stroke-width":this._jsPlumb.paintStyleInUse.strokeWidth,sourceInfo:o,targetInfo:s});var c={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0};for(var h in this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(h)){var d=this._jsPlumb.overlays[h];d.isVisible()&&(this._jsPlumb.overlayPlacements[h]=d.draw(this.connector,this._jsPlumb.paintStyleInUse,this.getAbsoluteOverlayPosition(d)),c.minX=Math.min(c.minX,this._jsPlumb.overlayPlacements[h].minX),c.maxX=Math.max(c.maxX,this._jsPlumb.overlayPlacements[h].maxX),c.minY=Math.min(c.minY,this._jsPlumb.overlayPlacements[h].minY),c.maxY=Math.max(c.maxY,this._jsPlumb.overlayPlacements[h].maxY))}var p=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||1)/2,f=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||0),g={xmin:Math.min(this.connector.bounds.minX-(p+f),c.minX),ymin:Math.min(this.connector.bounds.minY-(p+f),c.minY),xmax:Math.max(this.connector.bounds.maxX+(p+f),c.maxX),ymax:Math.max(this.connector.bounds.maxY+(p+f),c.maxY)};for(var m in this.connector.paintExtents=g,this.connector.paint(this._jsPlumb.paintStyleInUse,null,g),this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&v.paint(this._jsPlumb.overlayPlacements[m],g)}}this._jsPlumb.lastPaintedAt=e}},repaint:function(t){var e=jsPlumb.extend(t||{},{});e.elId=this.sourceId,this.paint(e)},prepareEndpoint:function(t,n,i,s,r,a,l,u,c){var h;if(s)i.endpoints[r]=s,s.addConnection(i);else{a.endpoints||(a.endpoints=[null,null]);var d=c||a.endpoints[r]||a.endpoint||t.Defaults.Endpoints[r]||e.Defaults.Endpoints[r]||t.Defaults.Endpoint||e.Defaults.Endpoint;a.endpointStyles||(a.endpointStyles=[null,null]),a.endpointHoverStyles||(a.endpointHoverStyles=[null,null]);var p=a.endpointStyles[r]||a.endpointStyle||t.Defaults.EndpointStyles[r]||e.Defaults.EndpointStyles[r]||t.Defaults.EndpointStyle||e.Defaults.EndpointStyle;null==p.fill&&null!=a.paintStyle&&(p.fill=a.paintStyle.stroke),null==p.outlineStroke&&null!=a.paintStyle&&(p.outlineStroke=a.paintStyle.outlineStroke),null==p.outlineWidth&&null!=a.paintStyle&&(p.outlineWidth=a.paintStyle.outlineWidth);var f=a.endpointHoverStyles[r]||a.endpointHoverStyle||t.Defaults.EndpointHoverStyles[r]||e.Defaults.EndpointHoverStyles[r]||t.Defaults.EndpointHoverStyle||e.Defaults.EndpointHoverStyle;null!=a.hoverPaintStyle&&(null==f&&(f={}),null==f.fill&&(f.fill=a.hoverPaintStyle.stroke));var g=a.anchors?a.anchors[r]:a.anchor?a.anchor:o(t.Defaults.Anchors[r],u,t)||o(e.Defaults.Anchors[r],u,t)||o(t.Defaults.Anchor,u,t)||o(e.Defaults.Anchor,u,t);h=n({paintStyle:p,hoverPaintStyle:f,endpoint:d,connections:[i],uuid:a.uuids?a.uuids[r]:null,anchor:g,source:l,scope:a.scope,reattach:a.reattach||t.Defaults.ReattachConnections,detachable:a.detachable||t.Defaults.ConnectionsDetachable}),null==s&&h.setDeleteOnEmpty(!0),i.endpoints[r]=h,!1===a.drawEndpoints&&h.setVisible(!1,!0,!0)}return h},replaceEndpoint:function(t,e){var n=this.endpoints[t],i=n.elementId,o=this._jsPlumb.instance.getEndpoints(i),s=o.indexOf(n),r=this.makeEndpoint(0===t,n.element,i,null,e);this.endpoints[t]=r,o.splice(s,1,r),this._jsPlumb.instance.deleteObject({endpoint:n,deleteAttachedObjects:!1}),this._jsPlumb.instance.fire("endpointReplaced",{previous:n,current:r}),this._jsPlumb.instance.router.sourceOrTargetChanged(this.endpoints[1].elementId,this.endpoints[1].elementId,this,this.endpoints[1].element,1)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumbUtil,e=this.jsPlumb;e.AnchorManager=function(n){var i={},o={},s={},r={},a=this,l={},u=n.jsPlumbInstance,c={},h=function(t,e){return e[0][0]-t[0][0]},d=function(t,e){return(t[0][0]<0?-Math.PI-t[0][0]:Math.PI-t[0][0])-(e[0][0]<0?-Math.PI-e[0][0]:Math.PI-e[0][0])},p={top:d,right:h,bottom:h,left:d},f=function(t,e){var n=u.getCachedData(t),i=n.s,r=n.o,a=function(e,n,i,r,a,l,c){if(r.length>0)for(var h=function(t,e,n,i,o,s,r,a){for(var l=[],u=e[o?0:1]/(i.length+1),c=0;c<i.length;c++){var h=(c+1)*u,d=s*e[o?1:0];r&&(h=e[o?0:1]-h);var p=o?h:d,f=n.left+p,g=p/e[0],m=o?d:h,v=n.top+m,y=m/e[1];if(0!==a){var b=jsPlumbUtil.rotatePoint([f,v],[n.centerx,n.centery],a);f=b[0],v=b[1]}l.push([f,v,g,y,i[c][1],i[c][2]])}return l}(0,n,i,(y=p[e],r.sort(y)),a,l,"right"===e||"top"===e,u.getRotation(t)),d=function(t,e){o[t.id]=[e[0],e[1],e[2],e[3]],s[t.id]=c},f=0;f<h.length;f++){var g=h[f][4],m=g.endpoints[0].elementId===t,v=g.endpoints[1].elementId===t;m&&d(g.endpoints[0],h[f]),v&&d(g.endpoints[1],h[f])}var y};a("bottom",i,r,e.bottom,!0,1,[0,1]),a("top",i,r,e.top,!0,0,[0,-1]),a("left",i,r,e.left,!1,0,[-1,0]),a("right",i,r,e.right,!1,1,[1,0])};this.reset=function(){i={},r={},l={}},this.addFloatingConnection=function(t,e){c[t]=e},this.newConnection=function(n){var i=n.sourceId,o=n.targetId,s=n.endpoints,a=!0,l=function(l,u,c,h,d){i===o&&c.isContinuous&&(n._jsPlumb.instance.removeElement(s[1].canvas),a=!1),t.addToList(r,h,[d,u,c.constructor===e.DynamicAnchor])};l(0,s[0],s[0].anchor,o,n),a&&l(0,s[1],s[1].anchor,i,n)};var g=function(e){!function(e,n){if(e){var i=function(t){return t[4]===n};t.removeWithFunction(e.top,i),t.removeWithFunction(e.left,i),t.removeWithFunction(e.bottom,i),t.removeWithFunction(e.right,i)}}(l[e.elementId],e.id)};this.connectionDetached=function(e,n){var i=e.connection||e,o=e.sourceId,s=e.targetId,l=i.endpoints,u=function(e,n,i,o,s){t.removeWithFunction(r[o],function(t){return t[0].id===s.id})};u(0,l[1],l[1].anchor,o,i),u(0,l[0],l[0].anchor,s,i),i.floatingId&&(u(i.floatingIndex,i.floatingEndpoint,i.floatingEndpoint.anchor,i.floatingId,i),g(i.floatingEndpoint)),g(i.endpoints[0]),g(i.endpoints[1]),n||(a.redraw(i.sourceId),i.targetId!==i.sourceId&&a.redraw(i.targetId))},this.addEndpoint=function(e,n){t.addToList(i,n,e)},this.changeId=function(t,e){r[e]=r[t],i[e]=i[t],delete r[t],delete i[t]},this.getConnectionsFor=function(t){return r[t]||[]},this.getEndpointsFor=function(t){return i[t]||[]},this.deleteEndpoint=function(e){t.removeWithFunction(i[e.elementId],function(t){return t.id===e.id}),g(e)},this.elementRemoved=function(t){delete c[t],delete i[t],i[t]=[]};var m=function(e,i,o,s,r,a,l,u,c,h,d,p){var f,g,m=-1,v=s.endpoints[l],y=v.id,b=[1,0][l],P=[[i,o],s,r,a,y],x=e[c],C=v._continuousAnchorEdge?e[v._continuousAnchorEdge]:null;if(C){var _=t.findWithFunction(C,function(t){return t[4]===y});if(-1!==_)for(C.splice(_,1),f=0;f<C.length;f++)g=C[f][1],t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,C[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,C[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id})}for(f=0;f<x.length;f++)g=x[f][1],1===n.idx&&x[f][3]===a&&-1===m&&(m=f),t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,x[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,x[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id});var j=u?-1!==m?m:0:x.length;x.splice(j,0,P),v._continuousAnchorEdge=c};this.sourceOrTargetChanged=function(n,i,o,s,a){if(0===a){if(n!==i){o.sourceId=i,o.source=s,t.removeWithFunction(r[n],function(t){return t[0].id===o.id});var l=t.findWithFunction(r[o.targetId],function(t){return t[0].id===o.id});l>-1&&(r[o.targetId][l][0]=o,r[o.targetId][l][1]=o.endpoints[0],r[o.targetId][l][2]=o.endpoints[0].anchor.constructor===e.DynamicAnchor),t.addToList(r,i,[o,o.endpoints[1],o.endpoints[1].anchor.constructor===e.DynamicAnchor]),o.endpoints[1].anchor.isContinuous&&(o.source===o.target?o._jsPlumb.instance.removeElement(o.endpoints[1].canvas):null==o.endpoints[1].canvas.parentNode&&o._jsPlumb.instance.appendElement(o.endpoints[1].canvas)),o.updateConnectedClass()}}else if(1===a){var u=o.endpoints[0].elementId;o.target=s,o.targetId=i;var c=t.findWithFunction(r[u],function(t){return t[0].id===o.id}),h=t.findWithFunction(r[n],function(t){return t[0].id===o.id});-1!==c&&(r[u][c][0]=o,r[u][c][1]=o.endpoints[1],r[u][c][2]=o.endpoints[1].anchor.constructor===e.DynamicAnchor),h>-1&&(r[n].splice(h,1),t.addToList(r,i,[o,o.endpoints[0],o.endpoints[0].anchor.constructor===e.DynamicAnchor])),o.updateConnectedClass()}},this.rehomeEndpoint=function(t,e,n){var o=i[e]||[],s=u.getId(n);if(s!==e){var r=o.indexOf(t);if(r>-1){var l=o.splice(r,1)[0];a.add(l,s)}}for(var c=0;c<t.connections.length;c++)t.connections[c].sourceId===e?a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,0):t.connections[c].targetId===e&&a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,1)},this.redraw=function(n,o,s,a,h,d){var p=[],g=[],v=[];if(!u.isSuspendDrawing()){var y=i[n]||[],b=r[n]||[];s=s||jsPlumbUtil.uuid(),a=a||{left:0,top:0},o&&(o={left:o.left+a.left,top:o.top+a.top});for(var P=u.updateOffset({elId:n,offset:o,recalc:!1,timestamp:s}),x={},C=0;C<b.length;C++){var _=b[C][0],j=_.sourceId,E=_.targetId,S=_.endpoints[0].anchor.isContinuous,w=_.endpoints[1].anchor.isContinuous;if(S||w){var D=j+"_"+E,A=x[D],I=_.sourceId===n?1:0,k=u.getRotation(E),O=u.getRotation(j);S&&!l[j]&&(l[j]={top:[],right:[],bottom:[],left:[]}),w&&!l[E]&&(l[E]={top:[],right:[],bottom:[],left:[]}),n!==E&&u.updateOffset({elId:E,timestamp:s}),n!==j&&u.updateOffset({elId:j,timestamp:s});var M=u.getCachedData(E),T=u.getCachedData(j);E===j&&(S||w)?(m(l[j],-Math.PI/2,0,_,!1,E,0,!1,"top",0,p,g),m(l[E],-Math.PI/2,0,_,!1,j,1,!1,"top",0,p,g)):(A||(A=this.calculateOrientation(j,E,T.o,M.o,_.endpoints[0].anchor,_.endpoints[1].anchor,_,O,k),x[D]=A),S&&m(l[j],A.theta,0,_,!1,E,0,!1,A.a[0],0,p,g),w&&m(l[E],A.theta2,-1,_,!0,j,1,!0,A.a[1],0,p,g)),S&&t.addWithFunction(v,j,function(t){return t===j}),w&&t.addWithFunction(v,E,function(t){return t===E}),t.addWithFunction(p,_,function(t){return t.id===_.id}),(S&&0===I||w&&1===I)&&t.addWithFunction(g,_.endpoints[I],function(t){return t.id===_.endpoints[I].id})}}for(C=0;C<y.length;C++)0===y[C].connections.length&&y[C].anchor.isContinuous&&(l[n]||(l[n]={top:[],right:[],bottom:[],left:[]}),m(l[n],-Math.PI/2,0,{endpoints:[y[C],y[C]],paint:function(){}},!1,n,0,!1,y[C].anchor.getDefaultFace(),0,p,g),t.addWithFunction(v,n,function(t){return t===n}));for(C=0;C<v.length;C++)f(v[C],l[v[C]]);for(C=0;C<y.length;C++)y[C].paint({timestamp:s,offset:P,dimensions:P.s,recalc:!0!==d});for(C=0;C<g.length;C++){var F=u.getCachedData(g[C].elementId);g[C].paint({timestamp:null,offset:F,dimensions:F.s})}for(C=0;C<b.length;C++){var L=b[C][1];if(L.anchor.constructor===e.DynamicAnchor){L.paint({elementWithPrecedence:n,timestamp:s}),t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id});for(var N=0;N<L.connections.length;N++)L.connections[N]!==b[C][0]&&t.addWithFunction(p,L.connections[N],function(t){return t.id===L.connections[N].id})}else t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id})}var R=c[n];for(R&&R.paint({timestamp:s,recalc:!1,elId:n}),C=0;C<p.length;C++)p[C].paint({elId:n,timestamp:null,recalc:!1,clearEdits:h})}return{c:p,e:g}};var v=function(e){t.EventGenerator.apply(this),this.type="Continuous",this.isDynamic=!0,this.isContinuous=!0;for(var n=e.faces||["top","right","bottom","left"],i=!(!1===e.clockwise),r={},a={top:"bottom",right:"left",left:"right",bottom:"top"},l={top:"right",right:"bottom",left:"top",bottom:"left"},u={top:"left",right:"top",left:"bottom",bottom:"right"},c=i?l:u,h=i?u:l,d=e.cssClass||"",p=null,f=null,g=["left","right"],m=["top","bottom"],v=null,y=0;y<n.length;y++)r[n[y]]=!0;this.getDefaultFace=function(){return 0===n.length?"top":n[0]},this.isRelocatable=function(){return!0},this.isSnapOnRelocate=function(){return!0},this.verifyEdge=function(t){return r[t]?t:r[a[t]]?a[t]:r[c[t]]?c[t]:r[h[t]]?h[t]:t},this.isEdgeSupported=function(t){return null==v?null==f?!0===r[t]:f===t:-1!==v.indexOf(t)},this.setCurrentFace=function(t,e){p=t,e&&null!=f&&(f=p)},this.getCurrentFace=function(){return p},this.getSupportedFaces=function(){var t=[];for(var e in r)r[e]&&t.push(e);return t},this.lock=function(){f=p},this.unlock=function(){f=null},this.isLocked=function(){return null!=f},this.lockCurrentAxis=function(){null!=p&&(v="left"===p||"right"===p?g:m)},this.unlockCurrentAxis=function(){v=null},this.compute=function(t){return o[t.element.id]||[0,0]},this.getCurrentLocation=function(t){return o[t.element.id]||[0,0]},this.getOrientation=function(t){return s[t.id]||[0,0]},this.getCssClass=function(){return d}};u.continuousAnchorFactory={get:function(t){return new v(t)},clear:function(t){delete o[t]}}},e.AnchorManager.prototype.calculateOrientation=function(t,e,n,i,o,s,r,a,l){var u=["left","top","right","bottom"];if(t===e)return{orientation:"identity",a:["top","top"]};var c=Math.atan2(i.centery-n.centery,i.centerx-n.centerx),h=Math.atan2(n.centery-i.centery,n.centerx-i.centerx),d=[],p={};!function(t,e){for(var n=0;n<t.length;n++)if(p[t[n]]={left:[e[n][0].left,e[n][0].centery],right:[e[n][0].right,e[n][0].centery],top:[e[n][0].centerx,e[n][0].top],bottom:[e[n][0].centerx,e[n][0].bottom]},0!==e[n][1])for(var i in p[t[n]])p[t[n]][i]=jsPlumbUtil.rotatePoint(p[t[n]][i],[e[n][0].centerx,e[n][0].centery],e[n][1])}(["source","target"],[[n,a],[i,l]]);for(var f=0;f<u.length;f++)for(var g=0;g<u.length;g++)d.push({source:u[f],target:u[g],dist:Biltong.lineLength(p.source[u[f]],p.target[u[g]])});d.sort(function(t,e){return t.dist<e.dist?-1:t.dist>e.dist?1:0});for(var m=d[0].source,v=d[0].target,y=0;y<d.length&&(m=o.isContinuous&&o.locked?o.getCurrentFace():!o.isContinuous||o.isEdgeSupported(d[y].source)?d[y].source:null,v=s.isContinuous&&s.locked?s.getCurrentFace():!s.isContinuous||s.isEdgeSupported(d[y].target)?d[y].target:null,null==m||null==v);y++);return o.isContinuous&&o.setCurrentFace(m),s.isContinuous&&s.setCurrentFace(v),{a:[m,v],theta:c,theta2:h}},e.Anchor=function(e){this.x=e.x||0,this.y=e.y||0,this.elementId=e.elementId,this.cssClass=e.cssClass||"",this.orientation=e.orientation||[0,0],this.lastReturnValue=null,this.offsets=e.offsets||[0,0],this.timestamp=null,this._unrotatedOrientation=[this.orientation[0],this.orientation[1]],this.relocatable=!1!==e.relocatable,this.snapOnRelocate=!1!==e.snapOnRelocate,this.locked=!1,t.EventGenerator.apply(this),this.compute=function(t){var e=t.xy,n=t.wh,i=t.timestamp;if(i&&i===this.timestamp)return this.lastReturnValue;var o=[e[0]+this.x*n[0]+this.offsets[0],e[1]+this.y*n[1]+this.offsets[1],this.x,this.y],s=t.rotation;if(null!=s&&0!==s){var r=jsPlumbUtil.rotatePoint(o,[e[0]+n[0]/2,e[1]+n[1]/2],s);this.orientation[0]=Math.round(this._unrotatedOrientation[0]*r[2]-this._unrotatedOrientation[1]*r[3]),this.orientation[1]=Math.round(this._unrotatedOrientation[1]*r[2]+this._unrotatedOrientation[0]*r[3]),this.lastReturnValue=[r[0],r[1],this.x,this.y]}else this.orientation[0]=this._unrotatedOrientation[0],this.orientation[1]=this._unrotatedOrientation[1],this.lastReturnValue=o;return this.timestamp=i,this.lastReturnValue},this.getCurrentLocation=function(t){return t=t||{},null==this.lastReturnValue||null!=t.timestamp&&this.timestamp!==t.timestamp?this.compute(t):this.lastReturnValue},this.setPosition=function(t,e,n,i,o){this.locked&&!o||(this.x=t,this.y=e,this.orientation=[n,i],this.lastReturnValue=null)}},t.extend(e.Anchor,t.EventGenerator,{equals:function(t){if(!t)return!1;var e=t.getOrientation(),n=this.getOrientation();return this.x===t.x&&this.y===t.y&&this.offsets[0]===t.offsets[0]&&this.offsets[1]===t.offsets[1]&&n[0]===e[0]&&n[1]===e[1]},getOrientation:function(){return this.orientation},getCssClass:function(){return this.cssClass}}),e.FloatingAnchor=function(t){e.Anchor.apply(this,arguments);var n=t.reference,i=t.referenceCanvas,o=e.getSize(i),s=null,r=null;this.orientation=null,this.x=0,this.y=0,this.isFloating=!0,this.compute=function(t){var e=t.xy,n=[e[0]+o[0]/2,e[1]+o[1]/2];return r=n,n},this.getOrientation=function(t){if(s)return s;var e=n.getOrientation(t);return[0*Math.abs(e[0])*-1,0*Math.abs(e[1])*-1]},this.over=function(t,e){s=t.getOrientation(e)},this.out=function(){s=null},this.getCurrentLocation=function(t){return null==r?this.compute(t):r}},t.extend(e.FloatingAnchor,e.Anchor);e.DynamicAnchor=function(t){e.Anchor.apply(this,arguments),this.isDynamic=!0,this.anchors=[],this.elementId=t.elementId,this.jsPlumbInstance=t.jsPlumbInstance;for(var n=0;n<t.anchors.length;n++)this.anchors[n]=(i=t.anchors[n],o=this.jsPlumbInstance,s=this.elementId,i.constructor===e.Anchor?i:o.makeAnchor(i,s,o));var i,o,s;this.getAnchors=function(){return this.anchors};var r=this.anchors.length>0?this.anchors[0]:null,a=r,l=function(t,e,n,i,o,s,r){var a=i[0]+t.x*o[0],l=i[1]+t.y*o[1],u=i[0]+o[0]/2,c=i[1]+o[1]/2;if(null!=s&&0!==s){var h=jsPlumbUtil.rotatePoint([a,l],[u,c],s);a=h[0],l=h[1]}return Math.sqrt(Math.pow(e-a,2)+Math.pow(n-l,2))+Math.sqrt(Math.pow(u-a,2)+Math.pow(c-l,2))},u=t.selector||function(t,e,n,i,o,s,r){for(var a=n[0]+i[0]/2,u=n[1]+i[1]/2,c=-1,h=1/0,d=0;d<r.length;d++){var p=l(r[d],a,u,t,e,o);p<h&&(c=d+0,h=p)}return r[c]};this.compute=function(t){var e=t.xy,n=t.wh,i=t.txy,o=t.twh,s=t.rotation,l=t.tRotation;return this.timestamp=t.timestamp,this.locked||null==i||null==o?(this.lastReturnValue=r.compute(t),this.lastReturnValue):(t.timestamp=null,r=u(e,n,i,o,s,l,this.anchors),this.x=r.x,this.y=r.y,r!==a&&this.fire("anchorChanged",r),a=r,this.lastReturnValue=r.compute(t),this.lastReturnValue)},this.getCurrentLocation=function(t){return null!=r?r.getCurrentLocation(t):null},this.getOrientation=function(t){return null!=r?r.getOrientation(t):[0,0]},this.over=function(t,e){null!=r&&r.over(t,e)},this.out=function(){null!=r&&r.out()},this.setAnchor=function(t){r=t},this.getCssClass=function(){return r&&r.getCssClass()||""},this.setAnchorCoordinates=function(t){var e=jsPlumbUtil.findWithFunction(this.anchors,function(e){return e.x===t[0]&&e.y===t[1]});return-1!==e&&(this.setAnchor(this.anchors[e]),!0)}},t.extend(e.DynamicAnchor,e.Anchor);var n=function(t,n,i,o,s,r){e.Anchors[s]=function(e){var a=e.jsPlumbInstance.makeAnchor([t,n,i,o,0,0],e.elementId,e.jsPlumbInstance);return a.type=s,r&&r(a,e),a}};n(.5,0,0,-1,"TopCenter"),n(.5,1,0,1,"BottomCenter"),n(0,.5,-1,0,"LeftMiddle"),n(1,.5,1,0,"RightMiddle"),n(.5,0,0,-1,"Top"),n(.5,1,0,1,"Bottom"),n(0,.5,-1,0,"Left"),n(1,.5,1,0,"Right"),n(.5,.5,0,0,"Center"),n(1,0,0,-1,"TopRight"),n(1,1,0,1,"BottomRight"),n(0,0,0,-1,"TopLeft"),n(0,1,0,1,"BottomLeft"),e.Defaults.DynamicAnchors=function(t){return t.jsPlumbInstance.makeAnchors(["TopCenter","RightMiddle","BottomCenter","LeftMiddle"],t.elementId,t.jsPlumbInstance)},e.Anchors.AutoDefault=function(t){var n=t.jsPlumbInstance.makeDynamicAnchor(e.Defaults.DynamicAnchors(t));return n.type="AutoDefault",n};var i=function(t,n){e.Anchors[t]=function(e){var i=e.jsPlumbInstance.makeAnchor(["Continuous",{faces:n}],e.elementId,e.jsPlumbInstance);return i.type=t,i}};e.Anchors.Continuous=function(t){return t.jsPlumbInstance.continuousAnchorFactory.get(t)},i("ContinuousLeft",["left"]),i("ContinuousTop",["top"]),i("ContinuousBottom",["bottom"]),i("ContinuousRight",["right"]),n(0,0,0,0,"Assign",function(t,e){var n=e.position||"Fixed";t.positionFinder=n.constructor===String?e.jsPlumbInstance.AnchorPositionFinders[n]:n,t.constructorParams=e}),this.jsPlumbInstance.prototype.AnchorPositionFinders={Fixed:function(t,e,n){return[(t.left-e.left)/n[0],(t.top-e.top)/n[1]]},Grid:function(t,e,n,i){var o=t.left-e.left,s=t.top-e.top,r=n[0]/i.grid[0],a=n[1]/i.grid[1],l=Math.floor(o/r),u=Math.floor(s/a);return[(l*r+r/2)/n[0],(u*a+a/2)/n[1]]}},e.Anchors.Perimeter=function(t){var e=(t=t||{}).anchorCount||60,n=t.shape;if(!n)throw new Error("no shape supplied to Perimeter Anchor type");var i=function(){for(var t=2*Math.PI/e,n=0,i=[],o=0;o<e;o++){var s=.5+.5*Math.sin(n),r=.5+.5*Math.cos(n);i.push([s,r,0,0]),n+=t}return i},o=function(t){for(var n=e/t.length,i=[],o=function(t,o,s,r,a,l,u){for(var c=(s-t)/(n=e*a),h=(r-o)/n,d=0;d<n;d++)i.push([t+c*d,o+h*d,null==l?0:l,null==u?0:u])},s=0;s<t.length;s++)o.apply(null,t[s]);return i},s=function(t){for(var e=[],n=0;n<t.length;n++)e.push([t[n][0],t[n][1],t[n][2],t[n][3],1/t.length,t[n][4],t[n][5]]);return o(e)},r=function(){return s([[0,0,1,0,0,-1],[1,0,1,1,1,0],[1,1,0,1,0,1],[0,1,0,0,-1,0]])},a={Circle:i,Ellipse:i,Diamond:function(){return s([[.5,0,1,.5],[1,.5,.5,1],[.5,1,0,.5],[0,.5,.5,0]])},Rectangle:r,Square:r,Triangle:function(){return s([[.5,0,1,1],[1,1,0,1],[0,1,.5,0]])},Path:function(t){for(var e=t.points,n=[],i=0,s=0;s<e.length-1;s++){var r=Math.sqrt(Math.pow(e[s][2]-e[s][0])+Math.pow(e[s][3]-e[s][1]));i+=r,n.push([e[s][0],e[s][1],e[s+1][0],e[s+1][1],r])}for(var a=0;a<n.length;a++)n[a][4]=n[a][4]/i;return o(n)}};if(!a[n])throw new Error("Shape ["+n+"] is unknown by Perimeter Anchor type");var l=a[n](t);t.rotation&&(l=function(t,e){for(var n=[],i=e/180*Math.PI,o=0;o<t.length;o++){var s=t[o][0]-.5,r=t[o][1]-.5;n.push([s*Math.cos(i)-r*Math.sin(i)+.5,s*Math.sin(i)+r*Math.cos(i)+.5,t[o][2],t[o][3]])}return n}(l,t.rotation));var u=t.jsPlumbInstance.makeDynamicAnchor(l);return u.type="Perimeter",u}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil;var t=this.jsPlumb;t.DefaultRouter=function(e){this.jsPlumbInstance=e,this.anchorManager=new t.AnchorManager({jsPlumbInstance:e}),this.sourceOrTargetChanged=function(t,e,n,i,o){this.anchorManager.sourceOrTargetChanged(t,e,n,i,o)},this.reset=function(){this.anchorManager.reset()},this.changeId=function(t,e){this.anchorManager.changeId(t,e)},this.elementRemoved=function(t){this.anchorManager.elementRemoved(t)},this.newConnection=function(t){this.anchorManager.newConnection(t)},this.connectionDetached=function(t,e){this.anchorManager.connectionDetached(t,e)},this.redraw=function(t,e,n,i,o,s){return this.anchorManager.redraw(t,e,n,i,o,s)},this.deleteEndpoint=function(t){this.anchorManager.deleteEndpoint(t)},this.rehomeEndpoint=function(t,e,n){this.anchorManager.rehomeEndpoint(t,e,n)},this.addEndpoint=function(t,e){this.anchorManager.addEndpoint(t,e)}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Biltong;e.Segments={AbstractSegment:function(t){this.params=t,this.findClosestPointOnPath=function(t,e){return{d:1/0,x:null,y:null,l:null}},this.getBounds=function(){return{minX:Math.min(t.x1,t.x2),minY:Math.min(t.y1,t.y2),maxX:Math.max(t.x1,t.x2),maxY:Math.max(t.y1,t.y2)}},this.lineIntersection=function(t,e,n,i){return[]},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.y)}},Straight:function(t){var n,o,s,r,a,l,u;e.Segments.AbstractSegment.apply(this,arguments);this.type="Straight",this.getLength=function(){return n},this.getGradient=function(){return o},this.getCoordinates=function(){return{x1:r,y1:l,x2:a,y2:u}},this.setCoordinates=function(t){r=t.x1,l=t.y1,a=t.x2,u=t.y2,n=Math.sqrt(Math.pow(a-r,2)+Math.pow(u-l,2)),o=i.gradient({x:r,y:l},{x:a,y:u}),s=-1/o},this.setCoordinates({x1:t.x1,y1:t.y1,x2:t.x2,y2:t.y2}),this.getBounds=function(){return{minX:Math.min(r,a),minY:Math.min(l,u),maxX:Math.max(r,a),maxY:Math.max(l,u)}},this.pointOnPath=function(t,e){if(0!==t||e){if(1!==t||e){var o=e?t>0?t:n+t:t*n;return i.pointOnLine({x:r,y:l},{x:a,y:u},o)}return{x:a,y:u}}return{x:r,y:l}},this.gradientAtPoint=function(t){return o},this.pointAlongPathFrom=function(t,e,n){var o=this.pointOnPath(t,n),s=e<=0?{x:r,y:l}:{x:a,y:u};return e<=0&&Math.abs(e)>1&&(e*=-1),i.pointOnLine(o,s,e)};var c=function(t,e,n){return n>=Math.min(t,e)&&n<=Math.max(t,e)},h=function(t,e,n){return Math.abs(n-t)<Math.abs(n-e)?t:e};this.findClosestPointOnPath=function(t,e){var d={d:1/0,x:null,y:null,l:null,x1:r,x2:a,y1:l,y2:u};if(0===o)d.y=l,d.x=c(r,a,t)?t:h(r,a,t);else if(o===1/0||o===-1/0)d.x=r,d.y=c(l,u,e)?e:h(l,u,e);else{var p=l-o*r,f=(e-s*t-p)/(o-s),g=o*f+p;d.x=c(r,a,f)?f:h(r,a,f),d.y=c(l,u,g)?g:h(l,u,g)}var m=i.lineLength([d.x,d.y],[r,l]);return d.d=i.lineLength([t,e],[d.x,d.y]),d.l=m/n,d};var d=function(t,e,n){return n>e?e<=t&&t<=n:e>=t&&t>=n};this.lineIntersection=function(t,e,n,s){var c=Math.abs(i.gradient({x:t,y:e},{x:n,y:s})),h=Math.abs(o),p=h===1/0?r:l-h*r,f=[],g=c===1/0?t:e-c*t;if(c!==h)if(c===1/0&&0===h)d(t,r,a)&&d(l,e,s)&&(f=[t,l]);else if(0===c&&h===1/0)d(e,l,u)&&d(r,t,n)&&(f=[r,e]);else{var m,v;c===1/0?d(m=t,r,a)&&d(v=h*t+p,e,s)&&(f=[m,v]):0===c?d(v=e,l,u)&&d(m=(e-p)/h,t,n)&&(f=[m,v]):(v=h*(m=(g-p)/(h-c))+p,d(m,r,a)&&d(v,l,u)&&(f=[m,v]))}return f},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.h)}},Arc:function(t){e.Segments.AbstractSegment.apply(this,arguments);var n=function(e,n){return i.theta([t.cx,t.cy],[e,n])},o=2*Math.PI;this.radius=t.r,this.anticlockwise=t.ac,this.type="Arc",t.startAngle&&t.endAngle?(this.startAngle=t.startAngle,this.endAngle=t.endAngle,this.x1=t.cx+this.radius*Math.cos(t.startAngle),this.y1=t.cy+this.radius*Math.sin(t.startAngle),this.x2=t.cx+this.radius*Math.cos(t.endAngle),this.y2=t.cy+this.radius*Math.sin(t.endAngle)):(this.startAngle=n(t.x1,t.y1),this.endAngle=n(t.x2,t.y2),this.x1=t.x1,this.y1=t.y1,this.x2=t.x2,this.y2=t.y2),this.endAngle<0&&(this.endAngle+=o),this.startAngle<0&&(this.startAngle+=o);var s=this.endAngle<this.startAngle?this.endAngle+o:this.endAngle;this.sweep=Math.abs(s-this.startAngle),this.anticlockwise&&(this.sweep=o-this.sweep);var r=2*Math.PI*this.radius,a=this.sweep/o,l=r*a;this.getLength=function(){return l},this.getBounds=function(){return{minX:t.cx-t.r,maxX:t.cx+t.r,minY:t.cy-t.r,maxY:t.cy+t.r}};var u=function(t){var e=Math.floor(t),n=Math.ceil(t);return t-e<1e-10?e:n-t<1e-10?n:t};this.pointOnPath=function(e,n){if(0===e)return{x:this.x1,y:this.y1,theta:this.startAngle};if(1===e)return{x:this.x2,y:this.y2,theta:this.endAngle};n&&(e/=l);var i=function(t,e){if(t.anticlockwise){var n=t.startAngle<t.endAngle?t.startAngle+o:t.startAngle;return n-Math.abs(n-t.endAngle)*e}var i=t.endAngle<t.startAngle?t.endAngle+o:t.endAngle,s=Math.abs(i-t.startAngle);return t.startAngle+s*e}(this,e),s=t.cx+t.r*Math.cos(i),r=t.cy+t.r*Math.sin(i);return{x:u(s),y:u(r),theta:i}},this.gradientAtPoint=function(e,n){var o=this.pointOnPath(e,n),s=i.normal([t.cx,t.cy],[o.x,o.y]);return this.anticlockwise||s!==1/0&&s!==-1/0||(s*=-1),s},this.pointAlongPathFrom=function(e,n,i){var o=this.pointOnPath(e,i),s=n/r*2*Math.PI,a=this.anticlockwise?-1:1,l=o.theta+a*s;return{x:t.cx+this.radius*Math.cos(l),y:t.cy+this.radius*Math.sin(l)}}},Bezier:function(n){this.curve=[{x:n.x1,y:n.y1},{x:n.cp1x,y:n.cp1y},{x:n.cp2x,y:n.cp2y},{x:n.x2,y:n.y2}];var i=function(t){var e={x:0,y:0};if(0===t)return this.curve[0];var n=this.curve.length-1;if(1===t)return this.curve[n];var i=this.curve,o=1-t;if(0===n)return this.curve[0];if(1===n)return{x:o*i[0].x+t*i[1].x,y:o*i[0].y+t*i[1].y};if(n<4){var s,r,a,l=o*o,u=t*t,c=0;return 2===n?(i=[i[0],i[1],i[2],e],s=l,r=o*t*2,a=u):3===n&&(s=l*o,r=l*t*3,a=o*u*3,c=t*u),{x:s*i[0].x+r*i[1].x+a*i[2].x+c*i[3].x,y:s*i[0].y+r*i[1].y+a*i[2].y+c*i[3].y}}return e}.bind(this),o=function(){var t;(t=this.curve)[0].x===t[1].x&&t[0].y===t[1].y&&(this.length=0);var e,n,o=function(t){var e=[];t--;for(var n=0;n<=t;n++)e.push(i(n/t));return e}(16);this.length=0;for(var s=0;s<15;s++){var r=o[s],a=o[s+1];this.length+=(e=r,n=a,Math.sqrt(Math.pow(e.x-n.x,2)+Math.pow(e.y-n.y,2)))}}.bind(this);e.Segments.AbstractSegment.apply(this,arguments);this.bounds={minX:Math.min(n.x1,n.x2,n.cp1x,n.cp2x),minY:Math.min(n.y1,n.y2,n.cp1y,n.cp2y),maxX:Math.max(n.x1,n.x2,n.cp1x,n.cp2x),maxY:Math.max(n.y1,n.y2,n.cp1y,n.cp2y)},this.type="Bezier",o();var s=function(e,n,i){return i&&(n=t.jsBezier.locationAlongCurveFrom(e,n>0?0:1,n)),n};this.pointOnPath=function(e,n){return e=s(this.curve,e,n),t.jsBezier.pointOnCurve(this.curve,e)},this.gradientAtPoint=function(e,n){return e=s(this.curve,e,n),t.jsBezier.gradientAtPoint(this.curve,e)},this.pointAlongPathFrom=function(e,n,i){return e=s(this.curve,e,i),t.jsBezier.pointAlongCurveFrom(this.curve,e,n)},this.getLength=function(){return this.length},this.getBounds=function(){return this.bounds},this.findClosestPointOnPath=function(e,n){var i=t.jsBezier.nearestPointOnCurve({x:e,y:n},this.curve);return{d:Math.sqrt(Math.pow(i.point.x-e,2)+Math.pow(i.point.y-n,2)),x:i.point.x,y:i.point.y,l:1-i.location,s:this}},this.lineIntersection=function(e,n,i,o){return t.jsBezier.lineIntersection(e,n,i,o,this.curve)}}},e.SegmentRenderer={getPath:function(t,e){return{Straight:function(e){var n=t.getCoordinates();return(e?"M "+n.x1+" "+n.y1+" ":"")+"L "+n.x2+" "+n.y2},Bezier:function(e){var n=t.params;return(e?"M "+n.x2+" "+n.y2+" ":"")+"C "+n.cp2x+" "+n.cp2y+" "+n.cp1x+" "+n.cp1y+" "+n.x1+" "+n.y1},Arc:function(e){var n=t.params,i=t.sweep>Math.PI?1:0,o=t.anticlockwise?0:1;return(e?"M"+t.x1+" "+t.y1+" ":"")+"A "+t.radius+" "+n.r+" 0 "+i+","+o+" "+t.x2+" "+t.y2}}[t.type](e)}};var o=function(){this.resetBounds=function(){this.bounds={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0}},this.resetBounds()};e.Connectors.AbstractConnector=function(t){o.apply(this,arguments);var s=[],r=0,a=[],l=[],u=t.stub||0,c=n.isArray(u)?u[0]:u,h=n.isArray(u)?u[1]:u,d=t.gap||0,p=n.isArray(d)?d[0]:d,f=n.isArray(d)?d[1]:d,g=null,m=null;this.getPathData=function(){for(var t="",n=0;n<s.length;n++)t+=e.SegmentRenderer.getPath(s[n],0===n),t+=" ";return t},this.findSegmentForPoint=function(t,e){for(var n={d:1/0,s:null,x:null,y:null,l:null},i=0;i<s.length;i++){var o=s[i].findClosestPointOnPath(t,e);o.d<n.d&&(n.d=o.d,n.l=o.l,n.x=o.x,n.y=o.y,n.s=s[i],n.x1=o.x1,n.x2=o.x2,n.y1=o.y1,n.y2=o.y2,n.index=i,n.connectorLocation=a[i][0]+o.l*(a[i][1]-a[i][0]))}return n},this.lineIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].lineIntersection(t,e,n,i));return o},this.boxIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].boxIntersection(t,e,n,i));return o},this.boundingBoxIntersection=function(t){for(var e=[],n=0;n<s.length;n++)e.push.apply(e,s[n].boundingBoxIntersection(t));return e};var v=function(t,e){var n,i,o;if(e&&(t=t>0?t/r:(r+t)/r),1===t)n=s.length-1,o=1;else if(0===t)o=0,n=0;else if(t>=.5){for(n=0,o=0,i=a.length-1;i>-1;i--)if(a[i][1]>=t&&a[i][0]<=t){n=i,o=(t-a[i][0])/l[i];break}}else for(n=a.length-1,o=1,i=0;i<a.length;i++)if(a[i][1]>=t){n=i,o=(t-a[i][0])/l[i];break}return{segment:s[n],proportion:o,index:n}};this.setSegments=function(t){g=[],r=0;for(var e=0;e<t.length;e++)g.push(t[e]),r+=t[e].getLength()},this.getLength=function(){return r};var y=function(t){this.strokeWidth=t.strokeWidth;var e=i.quadrant(t.sourcePos,t.targetPos),n=t.targetPos[0]<t.sourcePos[0],o=t.targetPos[1]<t.sourcePos[1],s=t.strokeWidth||1,r=t.sourceEndpoint.anchor.getOrientation(t.sourceEndpoint),a=t.targetEndpoint.anchor.getOrientation(t.targetEndpoint),l=n?t.targetPos[0]:t.sourcePos[0],u=o?t.targetPos[1]:t.sourcePos[1],d=Math.abs(t.targetPos[0]-t.sourcePos[0]),g=Math.abs(t.targetPos[1]-t.sourcePos[1]);if(0===r[0]&&0===r[1]||0===a[0]&&0===a[1]){var m=d>g?0:1,v=[1,0][m];a=[],(r=[])[m]=t.sourcePos[m]>t.targetPos[m]?-1:1,a[m]=t.sourcePos[m]>t.targetPos[m]?1:-1,r[v]=0,a[v]=0}var y=n?d+p*r[0]:p*r[0],b=o?g+p*r[1]:p*r[1],P=n?f*a[0]:d+f*a[0],x=o?f*a[1]:g+f*a[1],C=r[0]*a[0]+r[1]*a[1],_={sx:y,sy:b,tx:P,ty:x,lw:s,xSpan:Math.abs(P-y),ySpan:Math.abs(x-b),mx:(y+P)/2,my:(b+x)/2,so:r,to:a,x:l,y:u,w:d,h:g,segment:e,startStubX:y+r[0]*c,startStubY:b+r[1]*c,endStubX:P+a[0]*h,endStubY:x+a[1]*h,isXGreaterThanStubTimes2:Math.abs(y-P)>c+h,isYGreaterThanStubTimes2:Math.abs(b-x)>c+h,opposite:-1===C,perpendicular:0===C,orthogonal:1===C,sourceAxis:0===r[0]?"y":"x",points:[l,u,d,g,y,b,P,x],stubs:[c,h]};return _.anchorOrientation=_.opposite?"opposite":_.orthogonal?"orthogonal":"perpendicular",_};return this.getSegments=function(){return s},this.updateBounds=function(t){var e=t.getBounds();this.bounds.minX=Math.min(this.bounds.minX,e.minX),this.bounds.maxX=Math.max(this.bounds.maxX,e.maxX),this.bounds.minY=Math.min(this.bounds.minY,e.minY),this.bounds.maxY=Math.max(this.bounds.maxY,e.maxY)},this.pointOnPath=function(t,e){var n=v(t,e);return n.segment&&n.segment.pointOnPath(n.proportion,!1)||[0,0]},this.gradientAtPoint=function(t,e){var n=v(t,e);return n.segment&&n.segment.gradientAtPoint(n.proportion,!1)||0},this.pointAlongPathFrom=function(t,e,n){var i=v(t,n);return i.segment&&i.segment.pointAlongPathFrom(i.proportion,e,!1)||[0,0]},this.compute=function(t){m=y.call(this,t),r=s.length=a.length=l.length=0,this._compute(m,t),this.x=m.points[0],this.y=m.points[1],this.w=m.points[2],this.h=m.points[3],this.segment=m.segment,function(){for(var t=0,e=0;e<s.length;e++){var n=s[e].getLength();l[e]=n/r,a[e]=[t,t+=n/r]}}()},{addSegment:function(t,n,i){if(i.x1!==i.x2||i.y1!==i.y2){var o=new e.Segments[n](i);s.push(o),r+=o.getLength(),t.updateBounds(o)}},prepareCompute:y,sourceStub:c,targetStub:h,maxStub:Math.max(c,h),sourceGap:p,targetGap:f,maxGap:Math.max(p,f)}},n.extend(e.Connectors.AbstractConnector,o),e.Endpoints.AbstractEndpoint=function(t){return o.apply(this,arguments),{compute:this.compute=function(t,e,n,i){var o=this._compute.apply(this,arguments);return this.x=o[0],this.y=o[1],this.w=o[2],this.h=o[3],this.bounds.minX=this.x,this.bounds.minY=this.y,this.bounds.maxX=this.x+this.w,this.bounds.maxY=this.y+this.h,o},cssClass:t.cssClass}},n.extend(e.Endpoints.AbstractEndpoint,o),e.Endpoints.Dot=function(t){this.type="Dot";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.radius=t.radius||10,this.defaultOffset=.5*this.radius,this.defaultInnerRadius=this.radius/3,this._compute=function(t,e,n,i){this.radius=n.radius||this.radius;var o=t[0]-this.radius,s=t[1]-this.radius,r=2*this.radius,a=2*this.radius;if(n.stroke){var l=n.strokeWidth||1;o-=l,s-=l,r+=2*l,a+=2*l}return[o,s,r,a,this.radius]}},n.extend(e.Endpoints.Dot,e.Endpoints.AbstractEndpoint),e.Endpoints.Rectangle=function(t){this.type="Rectangle";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.width=t.width||20,this.height=t.height||20,this._compute=function(t,e,n,i){var o=n.width||this.width,s=n.height||this.height;return[t[0]-o/2,t[1]-s/2,o,s]}},n.extend(e.Endpoints.Rectangle,e.Endpoints.AbstractEndpoint);var s=function(t){e.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.displayElements=[]};n.extend(s,e.jsPlumbUIComponent,{getDisplayElements:function(){return this._jsPlumb.displayElements},appendDisplayElement:function(t){this._jsPlumb.displayElements.push(t)}}),e.Endpoints.Image=function(i){this.type="Image",s.apply(this,arguments),e.Endpoints.AbstractEndpoint.apply(this,arguments);var o=i.onload,r=i.src||i.url,a=i.cssClass?" "+i.cssClass:"";this._jsPlumb.img=new Image,this._jsPlumb.ready=!1,this._jsPlumb.initialized=!1,this._jsPlumb.deleted=!1,this._jsPlumb.widthToUse=i.width,this._jsPlumb.heightToUse=i.height,this._jsPlumb.endpoint=i.endpoint,this._jsPlumb.img.onload=function(){null!=this._jsPlumb&&(this._jsPlumb.ready=!0,this._jsPlumb.widthToUse=this._jsPlumb.widthToUse||this._jsPlumb.img.width,this._jsPlumb.heightToUse=this._jsPlumb.heightToUse||this._jsPlumb.img.height,o&&o(this))}.bind(this),this._jsPlumb.endpoint.setImage=function(t,e){var n=t.constructor===String?t:t.src;o=e,this._jsPlumb.img.src=n,null!=this.canvas&&this.canvas.setAttribute("src",this._jsPlumb.img.src)}.bind(this),this._jsPlumb.endpoint.setImage(r,o),this._compute=function(t,e,n,i){return this.anchorPoint=t,this._jsPlumb.ready?[t[0]-this._jsPlumb.widthToUse/2,t[1]-this._jsPlumb.heightToUse/2,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse]:[0,0,0,0]},this.canvas=e.createElement("img",{position:"absolute",margin:0,padding:0,outline:0},this._jsPlumb.instance.endpointClass+a),this._jsPlumb.widthToUse&&this.canvas.setAttribute("width",this._jsPlumb.widthToUse),this._jsPlumb.heightToUse&&this.canvas.setAttribute("height",this._jsPlumb.heightToUse),this._jsPlumb.instance.appendElement(this.canvas),this.actuallyPaint=function(t,e,i){if(!this._jsPlumb.deleted){this._jsPlumb.initialized||(this.canvas.setAttribute("src",this._jsPlumb.img.src),this.appendDisplayElement(this.canvas),this._jsPlumb.initialized=!0);var o=this.anchorPoint[0]-this._jsPlumb.widthToUse/2,s=this.anchorPoint[1]-this._jsPlumb.heightToUse/2;n.sizeElement(this.canvas,o,s,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse)}},this.paint=function(e,n){null!=this._jsPlumb&&(this._jsPlumb.ready?this.actuallyPaint(e,n):t.setTimeout(function(){this.paint(e,n)}.bind(this),200))}},n.extend(e.Endpoints.Image,[s,e.Endpoints.AbstractEndpoint],{cleanup:function(t){t&&(this._jsPlumb.deleted=!0,this.canvas&&this.canvas.parentNode.removeChild(this.canvas),this.canvas=null)}}),e.Endpoints.Blank=function(t){e.Endpoints.AbstractEndpoint.apply(this,arguments);this.type="Blank",s.apply(this,arguments),this._compute=function(t,e,n,i){return[t[0],t[1],10,0]};var i=t.cssClass?" "+t.cssClass:"";this.canvas=e.createElement("div",{display:"block",width:"1px",height:"1px",background:"transparent",position:"absolute"},this._jsPlumb.instance.endpointClass+i),this._jsPlumb.instance.appendElement(this.canvas),this.paint=function(t,e){n.sizeElement(this.canvas,this.x,this.y,this.w,this.h)}},n.extend(e.Endpoints.Blank,[e.Endpoints.AbstractEndpoint,s],{cleanup:function(){this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas)}}),e.Endpoints.Triangle=function(t){this.type="Triangle",e.Endpoints.AbstractEndpoint.apply(this,arguments);var n=this;(t=t||{}).width=t.width||55,t.height=t.height||55,this.width=t.width,this.height=t.height,this._compute=function(t,e,i,o){var s=i.width||n.width,r=i.height||n.height;return[t[0]-s/2,t[1]-r/2,s,r]}};var r=e.Overlays.AbstractOverlay=function(t){this.visible=!0,this.isAppendedAtTopLevel=!0,this.component=t.component,this.loc=null==t.location?.5:t.location,this.endpointLoc=null==t.endpointLocation?[.5,.5]:t.endpointLocation,this.visible=!1!==t.visible};r.prototype={cleanup:function(t){t&&(this.component=null,this.canvas=null,this.endpointLoc=null)},reattach:function(t,e){},setVisible:function(t){this.visible=t,this.component.repaint()},isVisible:function(){return this.visible},hide:function(){this.setVisible(!1)},show:function(){this.setVisible(!0)},incrementLocation:function(t){this.loc+=t,this.component.repaint()},setLocation:function(t){this.loc=t,this.component.repaint()},getLocation:function(){return this.loc},updateFrom:function(){}},e.Overlays.Arrow=function(t){this.type="Arrow",r.apply(this,arguments),this.isAppendedAtTopLevel=!1,t=t||{};var o=this;this.length=t.length||20,this.width=t.width||20,this.id=t.id,this.direction=(t.direction||1)<0?-1:1;var s=t.paintStyle||{"stroke-width":1},a=t.foldback||.623;this.computeMaxSize=function(){return 1.5*o.width},this.elementCreated=function(n,i){if(this.path=n,t.events)for(var o in t.events)e.on(n,o,t.events[o])},this.draw=function(t,e){var o,r,l,u;if(t.pointAlongPathFrom){if(n.isString(this.loc)||this.loc>1||this.loc<0){var c=parseInt(this.loc,10),h=this.loc<0?1:0;o=t.pointAlongPathFrom(h,c,!1),r=t.pointAlongPathFrom(h,c-this.direction*this.length/2,!1),l=i.pointOnLine(o,r,this.length)}else if(1===this.loc){if(o=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,-this.length),l=i.pointOnLine(o,r,this.length),-1===this.direction){var d=l;l=o,o=d}}else if(0===this.loc){if(l=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,this.length),o=i.pointOnLine(l,r,this.length),-1===this.direction){var p=l;l=o,o=p}}else o=t.pointAlongPathFrom(this.loc,this.direction*this.length/2),r=t.pointOnPath(this.loc),l=i.pointOnLine(o,r,this.length);var f={hxy:o,tail:u=i.perpendicularLineTo(o,l,this.width),cxy:i.pointOnLine(o,l,a*this.length)},g=s.stroke||e.stroke,m=s.fill||e.stroke;return{component:t,d:f,"stroke-width":s.strokeWidth||e.strokeWidth,stroke:g,fill:m,minX:Math.min(o.x,u[0].x,u[1].x),maxX:Math.max(o.x,u[0].x,u[1].x),minY:Math.min(o.y,u[0].y,u[1].y),maxY:Math.max(o.y,u[0].y,u[1].y)}}return{component:t,minX:0,maxX:0,minY:0,maxY:0}}},n.extend(e.Overlays.Arrow,r,{updateFrom:function(t){this.length=t.length||this.length,this.width=t.width||this.width,this.direction=null!=t.direction?t.direction:this.direction,this.foldback=t.foldback||this.foldback},cleanup:function(){this.path&&this.path.parentNode&&this.path.parentNode.removeChild(this.path)}}),e.Overlays.PlainArrow=function(t){t=t||{};var n=e.extend(t,{foldback:1});e.Overlays.Arrow.call(this,n),this.type="PlainArrow"},n.extend(e.Overlays.PlainArrow,e.Overlays.Arrow),e.Overlays.Diamond=function(t){var n=(t=t||{}).length||40,i=e.extend(t,{length:n/2,foldback:2});e.Overlays.Arrow.call(this,i),this.type="Diamond"},n.extend(e.Overlays.Diamond,e.Overlays.Arrow);var a=function(t,e){return(null==t._jsPlumb.cachedDimensions||e)&&(t._jsPlumb.cachedDimensions=t.getDimensions()),t._jsPlumb.cachedDimensions},l=function(t){e.jsPlumbUIComponent.apply(this,arguments),r.apply(this,arguments);var i=this.fire;this.fire=function(){i.apply(this,arguments),this.component&&this.component.fire.apply(this.component,arguments)},this.detached=!1,this.id=t.id,this._jsPlumb.div=null,this._jsPlumb.initialised=!1,this._jsPlumb.component=t.component,this._jsPlumb.cachedDimensions=null,this._jsPlumb.create=t.create,this._jsPlumb.initiallyInvisible=!1===t.visible,this.getElement=function(){if(null==this._jsPlumb.div){var n=this._jsPlumb.div=e.getElement(this._jsPlumb.create(this._jsPlumb.component));n.style.position="absolute",jsPlumb.addClass(n,this._jsPlumb.instance.overlayClass+" "+(this.cssClass?this.cssClass:t.cssClass?t.cssClass:"")),this._jsPlumb.instance.appendElement(n),this._jsPlumb.instance.getId(n),this.canvas=n;var i="translate(-50%, -50%)";n.style.webkitTransform=i,n.style.mozTransform=i,n.style.msTransform=i,n.style.oTransform=i,n.style.transform=i,n._jsPlumb=this,!1===t.visible&&(n.style.display="none")}return this._jsPlumb.div},this.draw=function(t,e,i){var o=a(this);if(null!=o&&2===o.length){var s={x:0,y:0};if(i)s={x:i[0],y:i[1]};else if(t.pointOnPath){var r=this.loc,l=!1;(n.isString(this.loc)||this.loc<0||this.loc>1)&&(r=parseInt(this.loc,10),l=!0),s=t.pointOnPath(r,l)}else{var u=this.loc.constructor===Array?this.loc:this.endpointLoc;s={x:u[0]*t.w,y:u[1]*t.h}}var c=s.x-o[0]/2,h=s.y-o[1]/2;return{component:t,d:{minx:c,miny:h,td:o,cxy:s},minX:c,maxX:c+o[0],minY:h,maxY:h+o[1]}}return{minX:0,maxX:0,minY:0,maxY:0}}};n.extend(l,[e.jsPlumbUIComponent,r],{getDimensions:function(){return[1,1]},setVisible:function(t){this._jsPlumb.div&&(this._jsPlumb.div.style.display=t?"block":"none",t&&this._jsPlumb.initiallyInvisible&&(a(this,!0),this.component.repaint(),this._jsPlumb.initiallyInvisible=!1))},clearCachedDimensions:function(){this._jsPlumb.cachedDimensions=null},cleanup:function(t){t?null!=this._jsPlumb.div&&(this._jsPlumb.div._jsPlumb=null,this._jsPlumb.instance.removeElement(this._jsPlumb.div)):(this._jsPlumb&&this._jsPlumb.div&&this._jsPlumb.div.parentNode&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div),this.detached=!0)},reattach:function(t,e){null!=this._jsPlumb.div&&t.getContainer().appendChild(this._jsPlumb.div),this.detached=!1},computeMaxSize:function(){var t=a(this);return Math.max(t[0],t[1])},paint:function(t,e){this._jsPlumb.initialised||(this.getElement(),t.component.appendDisplayElement(this._jsPlumb.div),this._jsPlumb.initialised=!0,this.detached&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div)),this._jsPlumb.div.style.left=t.component.x+t.d.minx+"px",this._jsPlumb.div.style.top=t.component.y+t.d.miny+"px"}}),e.Overlays.Custom=function(t){this.type="Custom",l.apply(this,arguments)},n.extend(e.Overlays.Custom,l),e.Overlays.GuideLines=function(){var t=this;t.length=50,t.strokeWidth=5,this.type="GuideLines",r.apply(this,arguments),e.jsPlumbUIComponent.apply(this,arguments),this.draw=function(e,n){var o=e.pointAlongPathFrom(t.loc,t.length/2),s=e.pointOnPath(t.loc),r=i.pointOnLine(o,s,t.length),a=i.perpendicularLineTo(o,r,40),l=i.perpendicularLineTo(r,o,20);return{connector:e,head:o,tail:r,headLine:l,tailLine:a,minX:Math.min(o.x,r.x,l[0].x,l[1].x),minY:Math.min(o.y,r.y,l[0].y,l[1].y),maxX:Math.max(o.x,r.x,l[0].x,l[1].x),maxY:Math.max(o.y,r.y,l[0].y,l[1].y)}}},e.Overlays.Label=function(t){this.labelStyle=t.labelStyle,this.cssClass=null!=this.labelStyle?this.labelStyle.cssClass:null;var n=e.extend({create:function(){return e.createElement("div")}},t);if(e.Overlays.Custom.call(this,n),this.type="Label",this.label=t.label||"",this.labelText=null,this.labelStyle){var i=this.getElement();if(this.labelStyle.font=this.labelStyle.font||"12px sans-serif",i.style.font=this.labelStyle.font,i.style.color=this.labelStyle.color||"black",this.labelStyle.fill&&(i.style.background=this.labelStyle.fill),this.labelStyle.borderWidth>0){var o=this.labelStyle.borderStyle?this.labelStyle.borderStyle:"black";i.style.border=this.labelStyle.borderWidth+"px solid "+o}this.labelStyle.padding&&(i.style.padding=this.labelStyle.padding)}},n.extend(e.Overlays.Label,e.Overlays.Custom,{cleanup:function(t){t&&(this.div=null,this.label=null,this.labelText=null,this.cssClass=null,this.labelStyle=null)},getLabel:function(){return this.label},setLabel:function(t){this.label=t,this.labelText=null,this.clearCachedDimensions(),this.update(),this.component.repaint()},getDimensions:function(){return this.update(),l.prototype.getDimensions.apply(this,arguments)},update:function(){if("function"==typeof this.label){var t=this.label(this);this.getElement().innerHTML=t.replace(/\r\n/g,"<br/>")}else null==this.labelText&&(this.labelText=this.label,this.getElement().innerHTML=this.labelText.replace(/\r\n/g,"<br/>"))},updateFrom:function(t){null!=t.label&&this.setLabel(t.label)}})}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumbUtil,n=t.jsPlumbInstance,i="stop",o="revert",s="_jsPlumbGroup",r="show",a="hide",l=function(t){var n={},i={},o={},l=this;function u(e,n){for(var i=t.getContainer();;){if(null==e||e===i)return!1;if(e===n)return!0;e=e.parentNode}}function c(e,n){for(var i=e.getEl().querySelectorAll(".jtk-managed"),o=0;o<i.length;o++)t[n?r:a](i[o],!0)}t.bind("connection",function(n){var s=t.getGroupFor(n.source),r=t.getGroupFor(n.target);null!=s&&null!=r&&s===r?(i[n.connection.id]=s,o[n.connection.id]=s):(null!=s&&(e.suggest(s.connections.source,n.connection),i[n.connection.id]=s),null!=r&&(e.suggest(r.connections.target,n.connection),o[n.connection.id]=r))}),t.bind("internal.connectionDetached",function(t){!function(t){delete t.proxies;var n,s=i[t.id];null!=s&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete i[t.id]),null!=(s=o[t.id])&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete o[t.id])}(t.connection)}),t.bind("connectionMoved",function(t){var e=(0===t.index?i:o)[t.connection.id];if(e){var n=e.connections[0===t.index?"source":"target"],s=n.indexOf(t.connection);-1!==s&&n.splice(s,1)}}),this.addGroup=function(e){t.addClass(e.getEl(),"jtk-group-expanded"),n[e.id]=e,e.manager=this,p(e),t.fire("group:add",{group:e})},this.addToGroup=function(e,n,i){if(e=this.getGroup(e)){var o=e.getEl();if(n._isJsPlumbGroup)return;var s=n._jsPlumbGroup;if(s!==e){t.removeFromDragSelection(n);var r=t.getOffset(n,!0),a=e.collapsed?t.getOffset(o,!0):t.getOffset(e.getDragArea(),!0);null!=s&&(s.remove(n,!1,i,!1,e),l.updateConnectionsForGroup(s)),e.add(n,i);var u=function(t,n){var i=0===n?1:0;t.each(function(t){t.setVisible(!1),t.endpoints[i].element._jsPlumbGroup===e?(t.endpoints[i].setVisible(!1),d(t,i,e)):(t.endpoints[n].setVisible(!1),h(t,n,e))})};e.collapsed&&(u(t.select({source:n}),0),u(t.select({target:n}),1));var c=t.getId(n);t.dragManager.setParent(n,c,o,t.getId(o),r);var p={left:r.left-a.left,top:r.top-a.top};if(t.setPosition(n,p),t.dragManager.revalidateParent(n,c,r),l.updateConnectionsForGroup(e),t.revalidate(c),!i){var f={group:e,el:n,pos:p};s&&(f.sourceGroup=s),t.fire("group:addMember",f)}}}},this.removeFromGroup=function(t,e,n){if(t=this.getGroup(t)){if(t.collapsed){var i=function(n,i){for(var o=0;o<n.length;o++){var s=n[o];if(s.proxies)for(var r=0;r<s.proxies.length;r++)if(null!=s.proxies[r]){var a=s.proxies[r].originalEp.element;(a===e||u(a,e))&&d(s,i,t)}}};i(t.connections.source.slice(),0),i(t.connections.target.slice(),1)}t.remove(e,null,n)}},this.getGroup=function(t){var i=t;if(e.isString(t)&&null==(i=n[t]))throw new TypeError("No such group ["+t+"]");return i},this.getGroups=function(){var t=[];for(var e in n)t.push(n[e]);return t},this.removeGroup=function(e,i,o,s){e=this.getGroup(e),this.expandGroup(e,!0);var r=e[i?"removeAll":"orphanAll"](o,s);return t.remove(e.getEl()),delete n[e.id],delete t._groups[e.id],t.fire("group:remove",{group:e}),r},this.removeAllGroups=function(t,e,i){for(var o in n)this.removeGroup(n[o],t,e,i)};var h=function(e,n,i){var o=e.endpoints[0===n?1:0].element;if(!o[s]||o[s].shouldProxy()||!o[s].collapsed){var r=i.getEl(),a=t.getId(r);t.proxyConnection(e,n,r,a,function(t,e){return i.getEndpoint(t,e)},function(t,e){return i.getAnchor(t,e)})}};this.collapseGroup=function(e){if(null!=(e=this.getGroup(e))&&!e.collapsed){var n=e.getEl();if(c(e,!1),e.shouldProxy()){var i=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];h(o,n,e)}};i(e.connections.source,0),i(e.connections.target,1)}e.collapsed=!0,t.removeClass(n,"jtk-group-expanded"),t.addClass(n,"jtk-group-collapsed"),t.revalidate(n),t.fire("group:collapse",{group:e})}};var d=function(e,n,i){t.unproxyConnection(e,n,t.getId(i.getEl()))};function p(e){for(var n=e.getMembers().slice(),s=[],r=0;r<n.length;r++)Array.prototype.push.apply(s,n[r].querySelectorAll(".jtk-managed"));Array.prototype.push.apply(n,s);var a=t.getConnections({source:n,scope:"*"},!0),l=t.getConnections({target:n,scope:"*"},!0),u={};e.connections.source.length=0,e.connections.target.length=0;var c=function(n){for(var s=0;s<n.length;s++)if(!u[n[s].id]){u[n[s].id]=!0;var r=t.getGroupFor(n[s].source),a=t.getGroupFor(n[s].target);r===e?(a!==e&&e.connections.source.push(n[s]),i[n[s].id]=e):a===e&&(e.connections.target.push(n[s]),o[n[s].id]=e)}};c(a),c(l)}this.expandGroup=function(e,n){if(null!=(e=this.getGroup(e))&&e.collapsed){var i=e.getEl();if(c(e,!0),e.shouldProxy()){var o=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];d(o,n,e)}};o(e.connections.source,0),o(e.connections.target,1)}e.collapsed=!1,t.addClass(i,"jtk-group-expanded"),t.removeClass(i,"jtk-group-collapsed"),t.revalidate(i),this.repaintGroup(e),n||t.fire("group:expand",{group:e})}},this.repaintGroup=function(e){for(var n=(e=this.getGroup(e)).getMembers(),i=0;i<n.length;i++)t.revalidate(n[i])},this.updateConnectionsForGroup=p,this.refreshAllGroups=function(){for(var e in n)p(n[e]),t.dragManager.updateOffsets(t.getId(n[e].getEl()))}},u=function(n,r){var a=this,l=r.el;this.getEl=function(){return l},this.id=r.id||e.uuid(),l._isJsPlumbGroup=!0;var u=this.getDragArea=function(){var t=n.getSelector(l,"[jtk-group-content]");return t&&t.length>0?t[0]:l},c=!0===r.ghost,h=c||!0===r.constrain,d=!1!==r.revert,p=!0===r.orphan,f=!0===r.prune,g=!0===r.dropOverride,m=!1!==r.proxied,v=[];if(this.connections={source:[],target:[],internal:[]},this.getAnchor=function(t,e){return r.anchor||"Continuous"},this.getEndpoint=function(t,e){return r.endpoint||["Dot",{radius:10}]},this.collapsed=!1,!1!==r.draggable){var y={drag:function(){for(var t=0;t<v.length;t++)n.draw(v[t])},stop:function(t){n.fire("groupDragStop",jsPlumb.extend(t,{group:a}))},scope:"_jsPlumbGroupDrag"};r.dragOptions&&t.jsPlumb.extend(y,r.dragOptions),n.draggable(r.el,y)}!1!==r.droppable&&n.droppable(r.el,{drop:function(t){var e=t.drag.el;if(!e._isJsPlumbGroup){var i=e._jsPlumbGroup;if(i!==a){if(null!=i&&i.overrideDrop(e,a))return;n.getGroupManager().addToGroup(a,e,!1)}}}});var b=function(t,e){for(var n=null==t.nodeType?t:[t],i=0;i<n.length;i++)e(n[i])};function P(t,e){var i=function(t){return t.offsetParent}(t),o=n.getSize(i),s=n.getSize(t),r=e[0],a=r+s[0],l=e[1],u=l+s[1];return a>0&&r<o[0]&&u>0&&l<o[1]}function x(t){var e=n.getId(t),i=n.getOffset(t);return t.parentNode.removeChild(t),n.getContainer().appendChild(t),n.setPosition(t,i),j(t),n.dragManager.clearParent(t,e),[e,i]}function C(t){var e=[];function i(t,e,i){var o=null;if(!P(t,[e,i])){var s=t._jsPlumbGroup;f?n.remove(t):o=x(t),s.remove(t)}return o}for(var o=0;o<t.selection.length;o++)e.push(i(t.selection[o][0],t.selection[o][1].left,t.selection[o][1].top));return 1===e.length?e[0]:e}function _(t){var e=n.getId(t);n.revalidate(t),n.dragManager.revalidateParent(t,e)}function j(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.off(i,C),f||p||!d||(t._katavorioDrag.off(o,_),t._katavorioDrag.setRevert(null)))}function E(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.on(i,C),h&&t._katavorioDrag.setConstrain(!0),c&&t._katavorioDrag.setUseGhostProxy(!0),f||p||!d||(t._katavorioDrag.on(o,_),t._katavorioDrag.setRevert(function(t,e){return!P(t,e)})))}this.overrideDrop=function(t,e){return g&&(d||f||p)},this.add=function(t,e){var i=u();b(t,function(t){if(null!=t._jsPlumbGroup){if(t._jsPlumbGroup===a)return;t._jsPlumbGroup.remove(t,!0,e,!1)}t._jsPlumbGroup=a,v.push(t),n.isAlreadyDraggable(t)&&E(t),t.parentNode!==i&&i.appendChild(t)}),n.getGroupManager().updateConnectionsForGroup(a)},this.remove=function(t,i,o,s,r){b(t,function(t){if(t._jsPlumbGroup===a){if(delete t._jsPlumbGroup,e.removeWithFunction(v,function(e){return e===t}),i)try{a.getDragArea().removeChild(t)}catch(t){jsPlumbUtil.log("Could not remove element from Group "+t)}if(j(t),!o){var s={group:a,el:t};r&&(s.targetGroup=r),n.fire("group:removeMember",s)}}}),s||n.getGroupManager().updateConnectionsForGroup(a)},this.removeAll=function(t,e){for(var i=0,o=v.length;i<o;i++){var s=v[0];a.remove(s,t,e,!0),n.remove(s,!0)}v.length=0,n.getGroupManager().updateConnectionsForGroup(a)},this.orphanAll=function(){for(var t={},e=0;e<v.length;e++){var n=x(v[e]);t[n[0]]=n[1]}return v.length=0,t},this.getMembers=function(){return v},l[s]=this,n.bind("elementDraggable",function(t){t.el._jsPlumbGroup===this&&E(t.el)}.bind(this)),this.shouldProxy=function(){return m},n.getGroupManager().addGroup(this)};n.prototype.addGroup=function(t){var e=this;if(e._groups=e._groups||{},null!=e._groups[t.id])throw new TypeError("cannot create Group ["+t.id+"]; a Group with that ID exists");if(null!=t.el[s])throw new TypeError("cannot create Group ["+t.id+"]; the given element is already a Group");var n=new u(e,t);return e._groups[n.id]=n,t.collapsed&&this.collapseGroup(n),n},n.prototype.addToGroup=function(t,e,n){var i=function(e){var i=this.getId(e);this.manage(i,e),this.getGroupManager().addToGroup(t,e,n)}.bind(this);if(Array.isArray(e))for(var o=0;o<e.length;o++)i(e[o]);else i(e)},n.prototype.removeFromGroup=function(t,e,n){this.getGroupManager().removeFromGroup(t,e,n),this.getContainer().appendChild(e)},n.prototype.removeGroup=function(t,e,n,i){return this.getGroupManager().removeGroup(t,e,n,i)},n.prototype.removeAllGroups=function(t,e,n){this.getGroupManager().removeAllGroups(t,e,n)},n.prototype.getGroup=function(t){return this.getGroupManager().getGroup(t)},n.prototype.getGroups=function(){return this.getGroupManager().getGroups()},n.prototype.expandGroup=function(t){this.getGroupManager().expandGroup(t)},n.prototype.collapseGroup=function(t){this.getGroupManager().collapseGroup(t)},n.prototype.repaintGroup=function(t){this.getGroupManager().repaintGroup(t)},n.prototype.toggleGroup=function(t){null!=(t=this.getGroupManager().getGroup(t))&&this.getGroupManager()[t.collapsed?"expandGroup":"collapseGroup"](t)},n.prototype.getGroupManager=function(){var t=this._groupManager;return null==t&&(t=this._groupManager=new l(this)),t},n.prototype.removeGroupManager=function(){delete this._groupManager},n.prototype.getGroupFor=function(t){if(t=this.getElement(t)){for(var e=this.getContainer(),n=!1,i=null;!n;)null==t||t===e?n=!0:t[s]?(i=t[s],n=!0):t=t.parentNode;return i}}}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.Flowchart=function(e){this.type="Flowchart",(e=e||{}).stub=null==e.stub?30:e.stub;var n,i=t.Connectors.AbstractConnector.apply(this,arguments),o=null==e.midpoint||isNaN(e.midpoint)?.5:e.midpoint,s=!0===e.alwaysRespectStubs,r=null,a=null,l=null!=e.cornerRadius?e.cornerRadius:0,u=(e.loopbackRadius,function(t){return t<0?-1:0===t?0:1}),c=function(t){return[u(t[2]-t[0]),u(t[3]-t[1])]},h=function(t,e,n,i){if(r!==e||a!==n){var o=null==r?i.sx:r,s=null==a?i.sy:a,l=o===e?"v":"h";r=e,a=n,t.push([o,s,e,n,l])}},d=function(t){return Math.sqrt(Math.pow(t[0]-t[2],2)+Math.pow(t[1]-t[3],2))},p=function(t){var e=[];return e.push.apply(e,t),e};this.midpoint=o,this._compute=function(t,e){n=[],r=null,a=null;var u=function(){return[t.startStubX,t.startStubY,t.endStubX,t.endStubY]},f={perpendicular:u,orthogonal:u,opposite:function(e){var n=t,i="x"===e?0:1;return!s&&{x:function(){return 1===n.so[i]&&(n.startStubX>n.endStubX&&n.tx>n.startStubX||n.sx>n.endStubX&&n.tx>n.sx)||-1===n.so[i]&&(n.startStubX<n.endStubX&&n.tx<n.startStubX||n.sx<n.endStubX&&n.tx<n.sx)},y:function(){return 1===n.so[i]&&(n.startStubY>n.endStubY&&n.ty>n.startStubY||n.sy>n.endStubY&&n.ty>n.sy)||-1===n.so[i]&&(n.startStubY<n.endStubY&&n.ty<n.startStubY||n.sy<n.endStubY&&n.ty<n.sy)}}[e]()?{x:[(t.sx+t.tx)/2,t.startStubY,(t.sx+t.tx)/2,t.endStubY],y:[t.startStubX,(t.sy+t.ty)/2,t.endStubX,(t.sy+t.ty)/2]}[e]:[t.startStubX,t.startStubY,t.endStubX,t.endStubY]}}[t.anchorOrientation](t.sourceAxis),g="x"===t.sourceAxis?0:1,m="x"===t.sourceAxis?1:0,v=f[g],y=f[m],b=f[g+2],P=f[m+2];h(n,f[0],f[1],t);var x=t.startStubX+(t.endStubX-t.startStubX)*o,C=t.startStubY+(t.endStubY-t.startStubY)*o,_={x:[0,1],y:[1,0]},j={perpendicular:function(e){var n=t,i={x:[[n.startStubX,n.endStubX],null,[n.endStubX,n.startStubX]],y:[[n.startStubY,n.endStubY],null,[n.endStubY,n.startStubY]]},o={x:[[x,n.startStubY],[x,n.endStubY]],y:[[n.startStubX,C],[n.endStubX,C]]},s={x:[[n.endStubX,n.startStubY]],y:[[n.startStubX,n.endStubY]]},r={x:[[n.startStubX,n.endStubY],[n.endStubX,n.endStubY]],y:[[n.endStubX,n.startStubY],[n.endStubX,n.endStubY]]},a={x:[[n.startStubX,C],[n.endStubX,C],[n.endStubX,n.endStubY]],y:[[x,n.startStubY],[x,n.endStubY],[n.endStubX,n.endStubY]]},l={x:[n.startStubY,n.endStubY],y:[n.startStubX,n.endStubX]},u=_[e][0],c=_[e][1],h=n.so[u]+1,d=n.to[c]+1,p=-1===n.to[c]&&l[e][1]<l[e][0]||1===n.to[c]&&l[e][1]>l[e][0],f=i[e][h][0],g=i[e][h][1],m={x:[[[1,2,3,4],null,[2,1,4,3]],null,[[4,3,2,1],null,[3,4,1,2]]],y:[[[3,2,1,4],null,[2,3,4,1]],null,[[4,1,2,3],null,[1,4,3,2]]]}[e][h][d];return n.segment===m[3]||n.segment===m[2]&&p?o[e]:n.segment===m[2]&&g<f?s[e]:n.segment===m[2]&&g>=f||n.segment===m[1]&&!p?a[e]:n.segment===m[0]||n.segment===m[1]&&p?r[e]:void 0},orthogonal:function(e,n,i,o,s){var r=t,a={x:-1===r.so[0]?Math.min(n,o):Math.max(n,o),y:-1===r.so[1]?Math.min(n,o):Math.max(n,o)}[e];return{x:[[a,i],[a,s],[o,s]],y:[[i,a],[s,a],[s,o]]}[e]},opposite:function(n,o,s,r){var a=t,l={x:"y",y:"x"}[n],u={x:"height",y:"width"}[n],c=a["is"+n.toUpperCase()+"GreaterThanStubTimes2"];if(e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=s+(1-e.sourceEndpoint.anchor[l])*e.sourceInfo[u]+i.maxStub;return{x:[[o,h],[r,h]],y:[[h,o],[h,r]]}[n]}return!c||1===a.so[g]&&o>r||-1===a.so[g]&&o<r?{x:[[o,C],[r,C]],y:[[x,o],[x,r]]}[n]:1===a.so[g]&&o<r||-1===a.so[g]&&o>r?{x:[[x,a.sy],[x,a.ty]],y:[[a.sx,C],[a.tx,C]]}[n]:void 0}}[t.anchorOrientation](t.sourceAxis,v,y,b,P);if(j)for(var E=0;E<j.length;E++)h(n,j[E][0],j[E][1],t);h(n,f[2],f[3],t),h(n,t.tx,t.ty,t),function(t,e,n){for(var o,s,r,a=null,u=0;u<e.length-1;u++){if(a=a||p(e[u]),o=p(e[u+1]),s=c(a),r=c(o),l>0&&a[4]!==o[4]){var h=Math.min(d(a),d(o)),f=Math.min(l,h/2);a[2]-=s[0]*f,a[3]-=s[1]*f,o[0]+=r[0]*f,o[1]+=r[1]*f;var g=s[1]===r[0]&&1===r[0]||s[1]===r[0]&&0===r[0]&&s[0]!==r[1]||s[1]===r[0]&&-1===r[0],m=(o[1]>a[3]?1:-1)==(o[0]>a[2]?1:-1),v=m&&g||!m&&!g?o[0]:a[2],y=m&&g||!m&&!g?a[3]:o[1];i.addSegment(t,"Straight",{x1:a[0],y1:a[1],x2:a[2],y2:a[3]}),i.addSegment(t,"Arc",{r:f,x1:a[2],y1:a[3],x2:o[0],y2:o[1],cx:v,cy:y,ac:g})}else{var b=a[2]===a[0]?0:a[2]>a[0]?n.lw/2:-n.lw/2,P=a[3]===a[1]?0:a[3]>a[1]?n.lw/2:-n.lw/2;i.addSegment(t,"Straight",{x1:a[0]-b,y1:a[1]-P,x2:a[2]+b,y2:a[3]+P})}a=o}null!=o&&i.addSegment(t,"Straight",{x1:o[0],y1:o[1],x2:o[2],y2:o[3]})}(this,n,t)}},e.extend(t.Connectors.Flowchart,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.AbstractBezierConnector=function(e){var n,i=!1!==(e=e||{}).showLoopback,o=(e.curviness,e.margin||5),s=(e.proximityLimit,e.orientation&&"clockwise"===e.orientation),r=e.loopbackRadius||25;return this._compute=function(t,e){var a=e.sourcePos,l=e.targetPos,u=Math.abs(a[0]-l[0]),c=Math.abs(a[1]-l[1]);if(i&&e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=e.sourcePos[0],d=e.sourcePos[1]-o,p=h,f=d-r,g=p-r,m=f-r;u=2*r,c=2*r,t.points[0]=g,t.points[1]=m,t.points[2]=u,t.points[3]=c,n.addSegment(this,"Arc",{loopback:!0,x1:h-g+4,y1:d-m,startAngle:0,endAngle:2*Math.PI,r:r,ac:!s,x2:h-g-4,y2:d-m,cx:p-g,cy:f-m})}else this._computeBezier(t,e,a,l,u,c)},n=t.Connectors.AbstractConnector.apply(this,arguments)},e.extend(t.Connectors.AbstractBezierConnector,t.Connectors.AbstractConnector);var n=function(e){e=e||{},this.type="Bezier";var n=t.Connectors.AbstractBezierConnector.apply(this,arguments),i=e.curviness||150;this.getCurviness=function(){return i},this._findControlPoint=function(t,e,n,o,s,r,a){var l=[];return r[0]!==a[0]||r[1]===a[1]?(0===a[0]?l.push(n[0]<e[0]?t[0]+10:t[0]-10):l.push(t[0]+i*a[0]),0===a[1]?l.push(n[1]<e[1]?t[1]+10:t[1]-10):l.push(t[1]+i*r[1])):(0===r[0]?l.push(e[0]<n[0]?t[0]+10:t[0]-10):l.push(t[0]-i*r[0]),0===r[1]?l.push(e[1]<n[1]?t[1]+10:t[1]-10):l.push(t[1]+i*a[1])),l},this._computeBezier=function(t,e,i,o,s,r){var a,l,u=i[0]<o[0]?s:0,c=i[1]<o[1]?r:0,h=i[0]<o[0]?0:s,d=i[1]<o[1]?0:r;a=this._findControlPoint([u,c],i,o,e.sourceEndpoint,e.targetEndpoint,t.so,t.to),l=this._findControlPoint([h,d],o,i,e.targetEndpoint,e.sourceEndpoint,t.to,t.so),n.addSegment(this,"Bezier",{x1:u,y1:c,x2:h,y2:d,cp1x:a[0],cp1y:a[1],cp2x:l[0],cp2y:l[1]})}};t.Connectors.Bezier=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){e=e||{},this.type="StateMachine";var n,i=t.Connectors.AbstractBezierConnector.apply(this,arguments),o=e.curviness||10,s=e.margin||5,r=e.proximityLimit||80;e.orientation&&e.orientation;this._computeBezier=function(t,e,a,l,u,c){var h=e.sourcePos[0]<e.targetPos[0]?0:u,d=e.sourcePos[1]<e.targetPos[1]?0:c,p=e.sourcePos[0]<e.targetPos[0]?u:0,f=e.sourcePos[1]<e.targetPos[1]?c:0;0===e.sourcePos[2]&&(h-=s),1===e.sourcePos[2]&&(h+=s),0===e.sourcePos[3]&&(d-=s),1===e.sourcePos[3]&&(d+=s),0===e.targetPos[2]&&(p-=s),1===e.targetPos[2]&&(p+=s),0===e.targetPos[3]&&(f-=s),1===e.targetPos[3]&&(f+=s);var g,m,v,y,b,P,x,C,_=(h+p)/2,j=(d+f)/2,E=(P=d,C=f,(b=h)<=(x=p)&&C<=P?1:b<=x&&P<=C?2:x<=b&&C>=P?3:4),S=Math.sqrt(Math.pow(p-h,2)+Math.pow(f-d,2));g=(n=function(t,e,n,i,o,s,r,a,l){return a<=l?[t,e]:1===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:2===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:3===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:4===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:void 0}(_,j,E,e.sourcePos,e.targetPos,o,o,S,r))[0],m=n[0],v=n[1],y=n[1],i.addSegment(this,"Bezier",{x1:p,y1:f,x2:h,y2:d,cp1x:g,cp1y:v,cp2x:m,cp2y:y})}};t.Connectors.StateMachine=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){this.type="Straight";var n=t.Connectors.AbstractConnector.apply(this,arguments);this._compute=function(t,e){n.addSegment(this,"Straight",{x1:t.sx,y1:t.sy,x2:t.startStubX,y2:t.startStubY}),n.addSegment(this,"Straight",{x1:t.startStubX,y1:t.startStubY,x2:t.endStubX,y2:t.endStubY}),n.addSegment(this,"Straight",{x1:t.endStubX,y1:t.endStubY,x2:t.tx,y2:t.ty})}};t.Connectors.Straight=n,e.extend(n,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n={"stroke-linejoin":"stroke-linejoin","stroke-dashoffset":"stroke-dashoffset","stroke-linecap":"stroke-linecap"},i="http://www.w3.org/2000/svg",o=function(t,e){for(var n in e)t.setAttribute(n,""+e[n])},s=function(e,n){return(n=n||{}).version="1.1",n.xmlns=i,t.createElementNS(i,e,null,null,n)},r=function(t){return"position:absolute;left:"+t[0]+"px;top:"+t[1]+"px"},a=function(t){for(var e=t.querySelectorAll(" defs,linearGradient,radialGradient"),n=0;n<e.length;n++)e[n].parentNode.removeChild(e[n])},l=function(t,e,i,o,r){if(e.setAttribute("fill",i.fill?i.fill:"none"),e.setAttribute("stroke",i.stroke?i.stroke:"none"),i.gradient?function(t,e,n,i,o){var r,l="jsplumb_gradient_"+o._jsPlumb.instance.idstamp();a(t),r=n.gradient.offset?s("radialGradient",{id:l}):s("linearGradient",{id:l,gradientUnits:"userSpaceOnUse"});var u=s("defs");t.appendChild(u),u.appendChild(r);for(var c=0;c<n.gradient.stops.length;c++){var h=1===o.segment||2===o.segment?c:n.gradient.stops.length-1-c,d=n.gradient.stops[h][1],p=s("stop",{offset:Math.floor(100*n.gradient.stops[c][0])+"%","stop-color":d});r.appendChild(p)}var f=n.stroke?"stroke":"fill";e.setAttribute(f,"url(#"+l+")")}(t,e,i,0,r):(a(t),e.setAttribute("style","")),i.strokeWidth&&e.setAttribute("stroke-width",i.strokeWidth),i.dashstyle&&i.strokeWidth&&!i["stroke-dasharray"]){var l=-1===i.dashstyle.indexOf(",")?" ":",",u=i.dashstyle.split(l),c="";u.forEach(function(t){c+=Math.floor(t*i.strokeWidth)+l}),e.setAttribute("stroke-dasharray",c)}else i["stroke-dasharray"]&&e.setAttribute("stroke-dasharray",i["stroke-dasharray"]);for(var h in n)i[h]&&e.setAttribute(n[h],i[h])},u=function(t,e,n){t.childNodes.length>n?t.insertBefore(e,t.childNodes[n]):t.appendChild(e)};e.svg={node:s,attr:o,pos:r};var c=function(n){var i=n.pointerEventsSpec||"all",a={};t.jsPlumbUIComponent.apply(this,n.originalArgs),this.canvas=null,this.path=null,this.svg=null,this.bgCanvas=null;var l=n.cssClass+" "+(n.originalArgs[0].cssClass||""),u={style:"",width:0,height:0,"pointer-events":i,position:"absolute"};this.svg=s("svg",u),n.useDivWrapper?(this.canvas=t.createElement("div",{position:"absolute"}),e.sizeElement(this.canvas,0,0,1,1),this.canvas.className=l):(o(this.svg,{class:l}),this.canvas=this.svg),n._jsPlumb.appendElement(this.canvas,n.originalArgs[0].parent),n.useDivWrapper&&this.canvas.appendChild(this.svg);var c=[this.canvas];return this.getDisplayElements=function(){return c},this.appendDisplayElement=function(t){c.push(t)},this.paint=function(t,i,s){if(null!=t){var l,u=[this.x,this.y],c=[this.w,this.h];null!=s&&(s.xmin<0&&(u[0]+=s.xmin),s.ymin<0&&(u[1]+=s.ymin),c[0]=s.xmax+(s.xmin<0?-s.xmin:0),c[1]=s.ymax+(s.ymin<0?-s.ymin:0)),n.useDivWrapper?(e.sizeElement(this.canvas,u[0],u[1],c[0]>0?c[0]:1,c[1]>0?c[1]:1),u[0]=0,u[1]=0,l=r([0,0])):l=r([u[0],u[1]]),a.paint.apply(this,arguments),o(this.svg,{style:l,width:c[0]||1,height:c[1]||1})}},{renderer:a}};e.extend(c,t.jsPlumbUIComponent,{cleanup:function(t){t||null==this.typeId?(this.canvas&&(this.canvas._jsPlumb=null),this.svg&&(this.svg._jsPlumb=null),this.bgCanvas&&(this.bgCanvas._jsPlumb=null),this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.svg=null,this.canvas=null,this.path=null,this.group=null,this._jsPlumb=null):(this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.bgCanvas.parentNode.removeChild(this.bgCanvas))},reattach:function(t){var e=t.getContainer();this.canvas&&null==this.canvas.parentNode&&e.appendChild(this.canvas),this.bgCanvas&&null==this.bgCanvas.parentNode&&e.appendChild(this.bgCanvas)},setVisible:function(t){this.canvas&&(this.canvas.style.display=t?"block":"none")}}),t.ConnectorRenderers.svg=function(e){var n=this;c.apply(this,[{cssClass:e._jsPlumb.connectorClass,originalArgs:arguments,pointerEventsSpec:"none",_jsPlumb:e._jsPlumb}]).renderer.paint=function(i,r,a){var c=n.getSegments(),h=[0,0];if(a.xmin<0&&(h[0]=-a.xmin),a.ymin<0&&(h[1]=-a.ymin),c.length>0){var d={d:n.getPathData(),transform:"translate("+h[0]+","+h[1]+")","pointer-events":e["pointer-events"]||"visibleStroke"},p=null;n.x,n.y,n.w,n.h;if(i.outlineStroke){var f=i.outlineWidth||1,g=i.strokeWidth+2*f;delete(p=t.extend({},i)).gradient,p.stroke=i.outlineStroke,p.strokeWidth=g,null==n.bgPath?(n.bgPath=s("path",d),t.addClass(n.bgPath,t.connectorOutlineClass),u(n.svg,n.bgPath,0)):o(n.bgPath,d),l(n.svg,n.bgPath,p,0,n)}null==n.path?(n.path=s("path",d),u(n.svg,n.path,i.outlineStroke?1:0)):o(n.path,d),l(n.svg,n.path,i,0,n)}}},e.extend(t.ConnectorRenderers.svg,c);var h=t.SvgEndpoint=function(e){c.apply(this,[{cssClass:e._jsPlumb.endpointClass,originalArgs:arguments,pointerEventsSpec:"all",useDivWrapper:!0,_jsPlumb:e._jsPlumb}]).renderer.paint=function(e){var n=t.extend({},e);n.outlineStroke&&(n.stroke=n.outlineStroke),null==this.node?(this.node=this.makeNode(n),this.svg.appendChild(this.node)):null!=this.updateNode&&this.updateNode(this.node),l(this.svg,this.node,n,(this.x,this.y,this.w,this.h),this),r(this.node,(this.x,this.y))}.bind(this)};e.extend(h,c),t.Endpoints.svg.Dot=function(){t.Endpoints.Dot.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("circle",{cx:this.w/2,cy:this.h/2,r:this.radius})},this.updateNode=function(t){o(t,{cx:this.w/2,cy:this.h/2,r:this.radius})}},e.extend(t.Endpoints.svg.Dot,[t.Endpoints.Dot,h]),t.Endpoints.svg.Rectangle=function(){t.Endpoints.Rectangle.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("rect",{width:this.w,height:this.h})},this.updateNode=function(t){o(t,{width:this.w,height:this.h})}},e.extend(t.Endpoints.svg.Rectangle,[t.Endpoints.Rectangle,h]),t.Endpoints.svg.Image=t.Endpoints.Image,t.Endpoints.svg.Blank=t.Endpoints.Blank,t.Overlays.svg.Label=t.Overlays.Label,t.Overlays.svg.Custom=t.Overlays.Custom;var d=function(e,n){e.apply(this,n),t.jsPlumbUIComponent.apply(this,n),this.isAppendedAtTopLevel=!1,this.path=null,this.paint=function(t,e){if(t.component.svg&&e){null==this.path&&(this.path=s("path",{"pointer-events":"all"}),t.component.svg.appendChild(this.path),this.elementCreated&&this.elementCreated(this.path,t.component),this.canvas=t.component.svg);var r=n&&1===n.length&&n[0].cssClass||"",a=[0,0];e.xmin<0&&(a[0]=-e.xmin),e.ymin<0&&(a[1]=-e.ymin),o(this.path,{d:i(t.d),class:r,stroke:t.stroke?t.stroke:null,fill:t.fill?t.fill:null,transform:"translate("+a[0]+","+a[1]+")"})}};var i=function(t){return isNaN(t.cxy.x)||isNaN(t.cxy.y)?"":"M"+t.hxy.x+","+t.hxy.y+" L"+t.tail[0].x+","+t.tail[0].y+" L"+t.cxy.x+","+t.cxy.y+" L"+t.tail[1].x+","+t.tail[1].y+" L"+t.hxy.x+","+t.hxy.y};this.transfer=function(t){t.canvas&&this.path&&this.path.parentNode&&(this.path.parentNode.removeChild(this.path),t.canvas.appendChild(this.path))}},p={cleanup:function(t){null!=this.path&&(t?this._jsPlumb.instance.removeElement(this.path):this.path.parentNode&&this.path.parentNode.removeChild(this.path))},reattach:function(t,e){this.path&&e.canvas&&e.canvas.appendChild(this.path)},setVisible:function(t){null!=this.path&&(this.path.style.display=t?"block":"none")}};e.extend(d,[t.jsPlumbUIComponent,t.Overlays.AbstractOverlay]),t.Overlays.svg.Arrow=function(){d.apply(this,[t.Overlays.Arrow,arguments])},e.extend(t.Overlays.svg.Arrow,[t.Overlays.Arrow,d],p),t.Overlays.svg.PlainArrow=function(){d.apply(this,[t.Overlays.PlainArrow,arguments])},e.extend(t.Overlays.svg.PlainArrow,[t.Overlays.PlainArrow,d],p),t.Overlays.svg.Diamond=function(){d.apply(this,[t.Overlays.Diamond,arguments])},e.extend(t.Overlays.svg.Diamond,[t.Overlays.Diamond,d],p),t.Overlays.svg.GuideLines=function(){var e,n,i=null,r=this;t.Overlays.GuideLines.apply(this,arguments),this.paint=function(t,l){null==i&&(i=s("path"),t.connector.svg.appendChild(i),r.attachListeners(i,t.connector),r.attachListeners(i,r),e=s("path"),t.connector.svg.appendChild(e),r.attachListeners(e,t.connector),r.attachListeners(e,r),n=s("path"),t.connector.svg.appendChild(n),r.attachListeners(n,t.connector),r.attachListeners(n,r));var u=[0,0];l.xmin<0&&(u[0]=-l.xmin),l.ymin<0&&(u[1]=-l.ymin),o(i,{d:a(t.head,t.tail),stroke:"red",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(e,{d:a(t.tailLine[0],t.tailLine[1]),stroke:"blue",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(n,{d:a(t.headLine[0],t.headLine[1]),stroke:"green",fill:null,transform:"translate("+u[0]+","+u[1]+")"})};var a=function(t,e){return"M "+t.x+","+t.y+" L"+e.x+","+e.y}},e.extend(t.Overlays.svg.GuideLines,t.Overlays.GuideLines)}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Katavorio,o=t.Biltong,s=function(t,n){var s="_katavorio_"+(n=n||"main"),r=t[s],a=t.getEventManager();return r||((r=new i({bind:a.on,unbind:a.off,getSize:e.getSize,getConstrainingRectangle:function(t){return[t.parentNode.scrollWidth,t.parentNode.scrollHeight]},getPosition:function(e,n){var i=t.getOffset(e,n,e._katavorioDrag?e.offsetParent:null);return[i.left,i.top]},setPosition:function(t,e){t.style.left=e[0]+"px",t.style.top=e[1]+"px"},addClass:e.addClass,removeClass:e.removeClass,intersects:o.intersects,indexOf:function(t,e){return t.indexOf(e)},scope:t.getDefaultScope(),css:{noSelect:t.dragSelectClass,droppable:"jtk-droppable",draggable:"jtk-draggable",drag:"jtk-drag",selected:"jtk-drag-selected",active:"jtk-drag-active",hover:"jtk-drag-hover",ghostProxy:"jtk-ghost-proxy"}})).setZoom(t.getZoom()),t[s]=r,t.bind("zoom",r.setZoom)),r},r=function(t,e){if(null==e)return[0,0];var n=h(e),i=c(n,0);return[i[t+"X"],i[t+"Y"]]},a=r.bind(this,"page"),l=r.bind(this,"screen"),u=r.bind(this,"client"),c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d=function(t){var e={},n=[],i={},o={},s={};this.register=function(r){var a,l=t.getId(r);e[l]||(e[l]=r,n.push(r),i[l]={});var u=function(e){if(e)for(var n=0;n<e.childNodes.length;n++)if(3!==e.childNodes[n].nodeType&&8!==e.childNodes[n].nodeType){var c=jsPlumb.getElement(e.childNodes[n]),h=t.getId(e.childNodes[n],null,!0);if(h&&o[h]&&o[h]>0){a||(a=t.getOffset(r));var d=t.getOffset(c);i[l][h]={id:h,offset:{left:d.left-a.left,top:d.top-a.top}},s[h]=l}u(e.childNodes[n])}};u(r)},this.updateOffsets=function(e,n){if(null!=e){n=n||{};var o,r=jsPlumb.getElement(e),a=t.getId(r),l=i[a];if(l)for(var u in l)if(l.hasOwnProperty(u)){var c=jsPlumb.getElement(u),h=n[u]||t.getOffset(c);if(null==c.offsetParent&&null!=i[a][u])continue;o||(o=t.getOffset(r)),i[a][u]={id:u,offset:{left:h.left-o.left,top:h.top-o.top}},s[u]=a}}},this.endpointAdded=function(n,r){r=r||t.getId(n);var a=document.body,l=n.parentNode;for(o[r]=o[r]?o[r]+1:1;null!=l&&l!==a;){var u=t.getId(l,null,!0);if(u&&e[u]){var c=t.getOffset(l);if(null==i[u][r]){var h=t.getOffset(n);i[u][r]={id:r,offset:{left:h.left-c.left,top:h.top-c.top}},s[r]=u}break}l=l.parentNode}},this.endpointDeleted=function(t){if(o[t.elementId]&&(o[t.elementId]--,o[t.elementId]<=0))for(var e in i)i.hasOwnProperty(e)&&i[e]&&(delete i[e][t.elementId],delete s[t.elementId])},this.changeId=function(t,e){i[e]=i[t],i[t]={},s[e]=s[t],s[t]=null},this.getElementsForDraggable=function(t){return i[t]},this.elementRemoved=function(t){var e=s[t];e&&(i[e]&&delete i[e][t],delete s[t])},this.reset=function(){e={},n=[],i={},o={}},this.dragEnded=function(e){if(null!=e.offsetParent){var n=t.getId(e),i=s[n];i&&this.updateOffsets(i)}},this.setParent=function(e,n,o,r,a){var l=s[n];i[r]||(i[r]={});var u=t.getOffset(o),c=a||t.getOffset(e);l&&i[l]&&delete i[l][n],i[r][n]={id:n,offset:{left:c.left-u.left,top:c.top-u.top}},s[n]=r},this.clearParent=function(t,e){var n=s[e];n&&(delete i[n][e],delete s[e])},this.revalidateParent=function(e,n,i){var o=s[n];if(o){var r={};r[n]=i,this.updateOffsets(o,r),t.revalidate(o)}},this.getDragAncestor=function(e){var n=jsPlumb.getElement(e),i=t.getId(n),o=s[i];return o?jsPlumb.getElement(o):null}},p=function(t,e,i){e=n.fastTrim(e),void 0!==t.className.baseVal?t.className.baseVal=e:t.className=e;try{var o=t.classList;if(null!=o){for(;o.length>0;)o.remove(o.item(0));for(var s=0;s<i.length;s++)i[s]&&o.add(i[s])}}catch(t){n.log("JSPLUMB: cannot set class list",t)}},f=function(t){return void 0===t.className.baseVal?t.className:t.className.baseVal},g=function(t,e,i){e=null==e?[]:n.isArray(e)?e:e.split(/\s+/),i=null==i?[]:n.isArray(i)?i:i.split(/\s+/);var o=f(t).split(/\s+/),s=function(t,e){for(var n=0;n<e.length;n++)if(t)-1===o.indexOf(e[n])&&o.push(e[n]);else{var i=o.indexOf(e[n]);-1!==i&&o.splice(i,1)}};s(!0,e),s(!1,i),p(t,o.join(" "),o)};t.jsPlumb.extend(t.jsPlumbInstance.prototype,{headless:!1,pageLocation:a,screenLocation:l,clientLocation:u,getDragManager:function(){return null==this.dragManager&&(this.dragManager=new d(this)),this.dragManager},recalculateOffsets:function(t){this.getDragManager().updateOffsets(t)},createElement:function(t,e,n,i){return this.createElementNS(null,t,e,n,i)},createElementNS:function(t,e,n,i,o){var s,r=null==t?document.createElement(e):document.createElementNS(t,e);for(s in n=n||{})r.style[s]=n[s];for(s in i&&(r.className=i),o=o||{})r.setAttribute(s,""+o[s]);return r},getAttribute:function(t,e){return null!=t.getAttribute?t.getAttribute(e):null},setAttribute:function(t,e,n){null!=t.setAttribute&&t.setAttribute(e,n)},setAttributes:function(t,e){for(var n in e)e.hasOwnProperty(n)&&t.setAttribute(n,e[n])},appendToRoot:function(t){document.body.appendChild(t)},getRenderModes:function(){return["svg"]},getClass:f,addClass:function(t,e){jsPlumb.each(t,function(t){g(t,e)})},hasClass:function(t,e){return(t=jsPlumb.getElement(t)).classList?t.classList.contains(e):-1!==f(t).indexOf(e)},removeClass:function(t,e){jsPlumb.each(t,function(t){g(t,null,e)})},toggleClass:function(t,e){jsPlumb.hasClass(t,e)?jsPlumb.removeClass(t,e):jsPlumb.addClass(t,e)},updateClasses:function(t,e,n){jsPlumb.each(t,function(t){g(t,e,n)})},setClass:function(t,e){null!=e&&jsPlumb.each(t,function(t){p(t,e,e.split(/\s+/))})},setPosition:function(t,e){t.style.left=e.left+"px",t.style.top=e.top+"px"},getPosition:function(t){var e=function(e){var n=t.style[e];return n?n.substring(0,n.length-2):0};return{left:e("left"),top:e("top")}},getStyle:function(t,e){return void 0!==window.getComputedStyle?getComputedStyle(t,null).getPropertyValue(e):t.currentStyle[e]},getSelector:function(t,e){return 1===arguments.length?null!=t.nodeType?t:document.querySelectorAll(t):t.querySelectorAll(e)},getOffset:function(t,e,n){t=jsPlumb.getElement(t),n=n||this.getContainer();for(var i={left:t.offsetLeft,top:t.offsetTop},o=e||null!=n&&t!==n&&t.offsetParent!==n?t.offsetParent:null,s=function(t){null!=t&&t!==document.body&&(t.scrollTop>0||t.scrollLeft>0)&&(i.left-=t.scrollLeft,i.top-=t.scrollTop)}.bind(this);null!=o;)i.left+=o.offsetLeft,i.top+=o.offsetTop,s(o),o=e?o.offsetParent:o.offsetParent===n?null:o.offsetParent;if(null!=n&&!e&&(n.scrollTop>0||n.scrollLeft>0)){var r=null!=t.offsetParent?this.getStyle(t.offsetParent,"position"):"static",a=this.getStyle(t,"position");"absolute"!==a&&"fixed"!==a&&"absolute"!==r&&"fixed"!==r&&(i.left-=n.scrollLeft,i.top-=n.scrollTop)}return i},getPositionOnElement:function(t,e,n){var i=void 0!==e.getBoundingClientRect?e.getBoundingClientRect():{left:0,top:0,width:0,height:0},o=document.body,s=document.documentElement,r=window.pageYOffset||s.scrollTop||o.scrollTop,a=window.pageXOffset||s.scrollLeft||o.scrollLeft,l=s.clientTop||o.clientTop||0,u=s.clientLeft||o.clientLeft||0,c=i.top+r-l+0*n,h=i.left+a-u+0*n,d=jsPlumb.pageLocation(t),p=i.width||e.offsetWidth*n,f=i.height||e.offsetHeight*n;return[(d[0]-h)/p,(d[1]-c)/f]},getAbsolutePosition:function(t){var e=function(e){var n=t.style[e];if(n)return parseFloat(n.substring(0,n.length-2))};return[e("left"),e("top")]},setAbsolutePosition:function(t,e,n,i){n?this.animate(t,{left:"+="+(e[0]-n[0]),top:"+="+(e[1]-n[1])},i):(t.style.left=e[0]+"px",t.style.top=e[1]+"px")},getSize:function(t){return[t.offsetWidth,t.offsetHeight]},getWidth:function(t){return t.offsetWidth},getHeight:function(t){return t.offsetHeight},getRenderMode:function(){return"svg"},draggable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this._initDraggableIfNecessary(i.el,!0,e,i.id,!0)}.bind(this)),this},snapToGrid:function(t,e,n){var i=[],o=function(t){var o=this.info(t);if(null!=o.el&&o.el._katavorioDrag){var s=o.el._katavorioDrag.snap(e,n);this.revalidate(o.el),i.push([o.el,s])}}.bind(this);if(1===arguments.length||3===arguments.length)o(t,e,n);else{var s=this.getManagedElements();for(var r in s)o(r,arguments[0],arguments[1])}return i},initDraggable:function(t,e,n){s(this,n).draggable(t,e),t._jsPlumbDragOptions=e},destroyDraggable:function(t,e){s(this,e).destroyDraggable(t),t._jsPlumbDragOptions=null,t._jsPlumbRelatedElement=null},unbindDraggable:function(t,e,n,i){s(this,i).destroyDraggable(t,e,n)},setDraggable:function(t,e){return jsPlumb.each(t,function(t){this.isDragSupported(t)&&(this._draggableStates[this.getAttribute(t,"id")]=e,this.setElementDraggable(t,e))}.bind(this))},_draggableStates:{},toggleDraggable:function(t){var e;return jsPlumb.each(t,function(t){var n=this.getAttribute(t,"id");return e=!(e=null!=this._draggableStates[n]&&this._draggableStates[n]),this._draggableStates[n]=e,this.setDraggable(t,e),e}.bind(this)),e},_initDraggableIfNecessary:function(t,e,i,o,s){if(!jsPlumb.headless&&(null!=e&&e&&jsPlumb.isDragSupported(t,this))){var r=i||this.Defaults.DragOptions;if(r=jsPlumb.extend({},r),jsPlumb.isAlreadyDraggable(t,this))i.force&&this.initDraggable(t,r);else{var a=jsPlumb.dragEvents.drag,l=jsPlumb.dragEvents.stop,u=jsPlumb.dragEvents.start;this.manage(o,t),r[u]=n.wrap(r[u],function(t){var e=t.el._jsPlumbDragOptions,n=!0;return e.canDrag&&(n=e.canDrag()),n&&(this.setHoverSuspended(!0),this.select({source:t.el}).addClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:t.el}).addClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),this.setConnectionBeingDragged(!0)),n}.bind(this)),r[a]=n.wrap(r[a],function(t){var e=this.getUIPosition(arguments,this.getZoom());if(null!=e){var n=t.el._jsPlumbDragOptions;this.draw(t.el,e,null,!0),n._dragging&&this.addClass(t.el,"jtk-dragged"),n._dragging=!0}}.bind(this)),r[l]=n.wrap(r[l],function(t){for(var e,n=t.selection,i=function(n){var i;null!=n[1]&&(e=this.getUIPosition([{el:n[2].el,pos:[n[1].left,n[1].top]}]),i=this.draw(n[2].el,e)),null!=n[0]._jsPlumbDragOptions&&delete n[0]._jsPlumbDragOptions._dragging,this.removeClass(n[0],"jtk-dragged"),this.select({source:n[2].el}).removeClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:n[2].el}).removeClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),t.e._drawResult=t.e._drawResult||{c:[],e:[],a:[]},Array.prototype.push.apply(t.e._drawResult.c,i.c),Array.prototype.push.apply(t.e._drawResult.e,i.e),Array.prototype.push.apply(t.e._drawResult.a,i.a),this.getDragManager().dragEnded(n[2].el)}.bind(this),o=0;o<n.length;o++)i(n[o]);this.setHoverSuspended(!1),this.setConnectionBeingDragged(!1)}.bind(this));var c=this.getId(t);this._draggableStates[c]=!0;var h=this._draggableStates[c];r.disabled=null!=h&&!h,this.initDraggable(t,r),this.getDragManager().register(t),s&&this.fire("elementDraggable",{el:t,options:r})}}},animationSupported:!0,getElement:function(t){return null==t?null:"string"==typeof(t="string"==typeof t?t:null==t.tagName&&null!=t.length&&null==t.enctype?t[0]:t)?document.getElementById(t):t},removeElement:function(t){s(this).elementRemoved(t),this.getEventManager().remove(t)},doAnimate:function(t,i,o){o=o||{};var s=this.getOffset(t),r=function(t,e){var i=function(i){if(null!=e[i]){if(n.isString(e[i])){var o=e[i].match(/-=/)?-1:1,s=e[i].substring(2);return t[i]+o*s}return e[i]}return t[i]};return[i("left"),i("top")]}(s,i),a=r[0]-s.left,l=r[1]-s.top,u=o.duration||250,c=u/15,h=15/u*a,d=15/u*l,p=0,f=setInterval(function(){e.setPosition(t,{left:s.left+h*(p+1),top:s.top+d*(p+1)}),null!=o.step&&o.step(p,Math.ceil(c)),++p>=c&&(window.clearInterval(f),null!=o.complete&&o.complete())},15)},destroyDroppable:function(t,e){s(this,e).destroyDroppable(t)},unbindDroppable:function(t,e,n,i){s(this,i).destroyDroppable(t,e,n)},droppable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],(e=e||{}).allowLoopback=!1,Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this.initDroppable(i.el,e)}.bind(this)),this},initDroppable:function(t,e,n){s(this,n).droppable(t,e)},isAlreadyDraggable:function(t){return null!=t._katavorioDrag},isDragSupported:function(t,e){return!0},isDropSupported:function(t,e){return!0},isElementDraggable:function(t){return(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.isEnabled()},getDragObject:function(t){return t[0].drag.getDragElement()},getDragScope:function(t){return t._katavorioDrag&&t._katavorioDrag.scopes.join(" ")||""},getDropEvent:function(t){return t[0].e},getUIPosition:function(t,e){var n=t[0].el;if(null==n.offsetParent)return null;var i=t[0].finalPos||t[0].pos,o={left:i[0],top:i[1]};if(n._katavorioDrag&&n.offsetParent!==this.getContainer()){var s=this.getOffset(n.offsetParent);o.left+=s.left,o.top+=s.top}return o},setDragFilter:function(t,e,n){t._katavorioDrag&&t._katavorioDrag.setFilter(e,n)},setElementDraggable:function(t,n){(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.setEnabled(n)},setDragScope:function(t,e){t._katavorioDrag&&t._katavorioDrag.k.setDragScope(t,e)},setDropScope:function(t,e){t._katavorioDrop&&t._katavorioDrop.length>0&&t._katavorioDrop[0].k.setDropScope(t,e)},addToPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.addToPosse.apply(o,t)})},setPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.setPosse.apply(o,t)})},removeFromPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.removeFromPosse.apply(o,t)})},removeFromAllPosses:function(t){var n=s(this);e.each(t,function(t){n.removeFromAllPosses(e.getElement(t))})},setPosseState:function(t,n,i){var o=s(this);e.each(t,function(t){o.setPosseState(e.getElement(t),n,i)})},dragEvents:{start:"start",stop:"stop",drag:"drag",step:"step",over:"over",out:"out",drop:"drop",complete:"complete",beforeStart:"beforeStart"},animEvents:{step:"step",complete:"complete"},stopDrag:function(t){t._katavorioDrag&&t._katavorioDrag.abort()},addToDragSelection:function(t){var e=this.getElement(t);null==e||!e._isJsPlumbGroup&&null!=e._jsPlumbGroup||s(this).select(t)},removeFromDragSelection:function(t){s(this).deselect(t)},getDragSelection:function(){return s(this).getSelection()},clearDragSelection:function(){s(this).deselectAll()},trigger:function(t,e,n,i){this.getEventManager().trigger(t,e,n,i)},doReset:function(){for(var t in this)0===t.indexOf("_katavorio_")&&this[t].reset()},getEventManager:function(){return(n=(e=this)._mottle)||(n=e._mottle=new t.Mottle),n;var e,n},on:function(t,e,n){return this.getEventManager().on.apply(this,arguments),this},off:function(t,e,n){return this.getEventManager().off.apply(this,arguments),this}});var m,v;m=e.init,(v=function(){/complete|loaded|interactive/.test(document.readyState)&&void 0!==document.body&&null!=document.body?m():setTimeout(v,9)})()}.call("undefined"!=typeof window?window:s)}(r={exports:{}},r.exports),r.exports),l=(a.jsBezier,a.Biltong,a.Mottle,a.Katavorio,a.jsPlumbUtil,a.jsPlumb);var u=function(t,e,n,i,o,s,r,a,l,u){"boolean"!=typeof r&&(l=a,a=r,r=!1);var c,h="function"==typeof n?n.options:n;if(t&&t.render&&(h.render=t.render,h.staticRenderFns=t.staticRenderFns,h._compiled=!0,o&&(h.functional=!0)),i&&(h._scopeId=i),s?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),e&&e.call(this,l(t)),t&&t._registeredComponents&&t._registeredComponents.add(s)},h._ssrRegister=c):e&&(c=r?function(){e.call(this,u(this.$root.$options.shadowRoot))}:function(t){e.call(this,a(t))}),c)if(h.functional){var d=h.render;h.render=function(t,e){return c.call(e),d(t,e)}}else{var p=h.beforeCreate;h.beforeCreate=p?[].concat(p,c):[c]}return n},c="undefined"!=typeof navigator&&/msie [6-9]\\b/.test(navigator.userAgent.toLowerCase());var h=document.head||document.getElementsByTagName("head")[0],d={};var p=function(t){return function(t,e){return function(t,e){var n=c?e.media||"default":t,i=d[n]||(d[n]={ids:new Set,styles:[]});if(!i.ids.has(t)){i.ids.add(t);var o=e.source;if(e.map&&(o+="\n/*# sourceURL="+e.map.sources[0]+" */",o+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(e.map))))+" */"),i.element||(i.element=document.createElement("style"),i.element.type="text/css",e.media&&i.element.setAttribute("media",e.media),h.appendChild(i.element)),"styleSheet"in i.element)i.styles.push(o),i.element.styleSheet.cssText=i.styles.filter(Boolean).join("\n");else{var s=i.ids.size-1,r=document.createTextNode(o),a=i.element.childNodes;a[s]&&i.element.removeChild(a[s]),a.length?i.element.insertBefore(r,a[s]):i.element.appendChild(r)}}}(t,e)}},f=u({render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("div",{staticClass:"palette-panel"},[t._t("palette",function(){return[t._m(0)]})],2)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("ul",{staticClass:"palette-group"},[e("li",[e("div",{staticClass:"palette-default-item startpoint",attrs:{"data-type":"startpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item endpoint",attrs:{"data-type":"endpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item tasknode",attrs:{"data-type":"tasknode"}})]),e("li",[e("div",{staticClass:"palette-default-item gateway",attrs:{"data-type":"gateway"}})])])}]},function(t){t&&t("data-v-09b6e314_0",{source:".palette-group{margin:0;padding:0;background:#fcfcfc;text-align:center;list-style:none}.palette-group>li{padding:14px 0}.palette-default-item{display:inline-block;width:40px;height:40px;font-size:12px;color:#888;border:1px solid #999;border-radius:2px;cursor:pointer;user-select:none}.palette-default-item:hover{box-shadow:0 0 8px rgba(50,50,50,.3)}.startpoint{border-radius:50%;border:4px solid #6a6c8a}.endpoint{border-radius:50%;background:#6a6c8a}.tasknode{height:30px;border:2px solid #33d0c6}.gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}",map:void 0,media:void 0})},{name:"PalettePanel",props:["selector"],data:function(){return{}}},void 0,!1,void 0,p,void 0),g=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"tool-panel"},t._l(t.tools,function(e,i){return n("div",{key:i,class:["tool-item",e.cls,{actived:"frameSelect"===e.type&&t.isFrameSelecting}],on:{click:function(n){return t.onToolClick(e)}}},[t._v("\n        "+t._s(e.name)+"\n    ")])}),0)},staticRenderFns:[]},function(t){t&&t("data-v-2c518942_0",{source:".tool-item{display:inline-block;margin-right:10px;user-select:none;cursor:pointer}.tool-item:last-child{margin-right:0}.tool-item.actived{color:#3a84ff}",map:void 0,media:void 0})},{name:"ToolPanel",props:["tools","isFrameSelecting"],data:function(){return{}},methods:{onToolClick:function(t){this.$emit("onToolClick",t)}}},void 0,!1,void 0,p,void 0),m=u({render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"bk-flow-location",on:{mousedown:this.onMouseDown,mouseup:this.onMouseUp}},["startpoint"===this.node.type?e("div",{staticClass:"circle-node startpoint"}):"endpoint"===this.node.type?e("div",{staticClass:"circle-node endpoint"}):"tasknode"===this.node.type?e("div",{staticClass:"tasknode"}):"gateway"===this.node.type?e("div",{staticClass:"gateway"}):e("div",{staticClass:"node-default"})])},staticRenderFns:[]},function(t){t&&t("data-v-0604134d_0",{source:".bk-flow-location .circle-node{width:30px;height:30px;border-radius:50%;text-align:center}.bk-flow-location .startpoint{border:4px solid #6a6c8a}.bk-flow-location .endpoint{background:#6a6c8a}.bk-flow-location .tasknode{width:80px;height:50px;border:2px solid #33d0c6}.bk-flow-location .gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}.bk-flow-location .node-default{width:120px;height:80px;line-height:80px;border:1px solid #ccc;border-radius:2px;text-align:center}.bk-flow-location .node-default.selected{border:1px solid #3a84ff}",map:void 0,media:void 0})},{name:"NodeTemplate",props:{node:{type:Object,default:function(){return{}}}},data:function(){return{moveFlag:{x:0,y:0,moved:!1}}},methods:{onMouseDown:function(t){this.moveFlag={x:t.pageX,y:t.pageY,moved:!1},this.$el.addEventListener("mousemove",this.mouseMoveHandler)},onMouseUp:function(t){var e=t.pageX,n=t.pageY;this.moveFlag.x=e,this.moveFlag.y=n,this.moveFlag.moved?(console.log("drag event"),this.moveFlag.moved=!1):console.log("click event"),this.$el.removeEventListener("mousemove",this.mouseMoveHandler)},mouseMoveHandler:function(t){var e=t.pageX,n=t.pageY;(Math.abs(e-this.moveFlag.x)>2||Math.abs(n-this.moveFlag.y)>2)&&(this.moveFlag.moved=!0)}}},void 0,!1,void 0,p,void 0);function v(t){return"touches"in t?t.touches[0]:t}var y={grid:[5,5]},b={connector:["Bezier",{curviness:30}],paintStyle:{strokeWidth:2,stroke:"#567567",outlineStroke:"tranparent",outlineWidth:6},hoverPaintStyle:{fill:"transparent",stroke:"#3a84ff"}},P={endpoint:"Dot",connector:["Flowchart",{stub:[1,6],alwaysRespectStub:!0,gap:8,cornerRadius:2}],connectorOverlays:[["PlainArrow",{width:8,length:6,location:1,id:"arrow"}]],paintStyle:{fill:"#3a84ff",radius:5},anchor:["Left","Right","Top","Bottom"],isSource:!0,isTarget:!0};function x(){for(var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e="",n=0;n<7;n++)e+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return t+e}var C={showPalette:{type:Boolean,default:!0},showTool:{type:Boolean,default:!0},tools:{type:Array,default:function(){return[{type:"zoomIn",name:"放大",cls:"tool-item"},{type:"zoomOut",name:"缩小",cls:"tool-item"},{type:"resetPosition",name:"重置",cls:"tool-item"}]}},editable:{type:Boolean,default:!0},selector:{type:String,default:"palette-default-item"},data:{type:Object,default:function(){return{nodes:[],lines:[]}}},nodeOptions:{type:Object,default:function(){return e({},y)}},connectorOptions:{type:Object,default:function(){return e({},b)}},endpointOptions:{type:Object,default:function(){return e({},P)}}},_={mousedown:"ontouchstart"in document.documentElement?"touchstart":"mousedown",mousemove:"ontouchmove"in document.documentElement?"touchmove":"mousemove",mouseup:"ontouchend"in document.documentElement?"touchend":"mouseup"},j=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{class:["jsflow",{editable:t.editable}]},[n("div",{staticClass:"canvas-area"},[t.showTool?n("div",{staticClass:"tool-panel-wrap"},[t._t("toolPanel",function(){return[n("tool-panel",{attrs:{tools:t.tools,"is-frame-selecting":t.isFrameSelecting},on:{onToolClick:t.onToolClick}})]})],2):t._e(),t.showPalette?n("div",{ref:"palettePanel",staticClass:"palette-panel-wrap"},[t._t("palettePanel",function(){return[n("palette-panel",{attrs:{selector:t.selector}})]})],2):t._e(),n("div",{ref:"canvasFlowWrap",staticClass:"canvas-flow-wrap",style:t.canvasWrapStyle,on:t._d({},[t.mousedown,t.onCanvasMouseDown,t.mouseup,t.onCanvasMouseUp])},[n("div",{ref:"canvasFlow",staticClass:"canvas-flow",attrs:{id:"canvas-flow"}},[t._l(t.nodes,function(e){return n("div",{key:e.id},[n("div",{staticClass:"jsflow-node canvas-node",attrs:{id:e.id},on:{mouseenter:function(n){return t.toggleHighLight(e,!0)},mouseleave:function(n){return t.toggleHighLight(e,!1)}}},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:e}})]},{node:e})],2)])}),n("div",{staticClass:"reference-line-vertical"}),n("div",{staticClass:"reference-line-horizontal"})],2),t.isFrameSelecting?n("div",{staticClass:"canvas-frame-selector",style:t.frameSelectorStyle}):t._e()]),t.showAddingNode?n("div",{staticClass:"jsflow-node adding-node",style:t.setNodeInitialPos(t.addingNodeConfig)},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:t.addingNodeConfig}})]},{node:t.addingNodeConfig})],2):t._e()])])},staticRenderFns:[]},function(t){t&&t("data-v-5d6d430f_0",{source:".jsflow{height:100%;border:1px solid #ccc}.jsflow .canvas-area{position:relative;height:100%}.jsflow .tool-panel-wrap{position:absolute;top:20px;left:70px;padding:10px 20px;background:#c4c6cc;opacity:.65;border-radius:4px;z-index:4}.jsflow .palette-panel-wrap{float:left;width:60px;height:100%;border-right:1px solid #ccc}.jsflow .canvas-flow-wrap{position:relative;height:100%;overflow:hidden}.jsflow .canvas-flow{position:relative;min-width:100%;min-height:100%}.jsflow .canvas-frame-selector{position:absolute;border:1px solid #3a84ff;background:rgba(58,132,255,.15)}.jsflow .jsflow-node{position:absolute;user-select:none}.jsflow .jtk-endpoint{z-index:1;cursor:pointer}.jsflow .adding-node{opacity:.8}.jsflow .jtk-endpoint.jtk-dragging{z-index:0}.jsflow .jtk-connector{cursor:pointer}.jsflow .reference-line-vertical{display:none;position:absolute;top:-100000px;bottom:-100000px;left:0;width:2px;background:rgba(30,144,255,.8);z-index:1}.jsflow .reference-line-horizontal{display:none;position:absolute;left:-100000px;right:-100000px;top:0;height:2px;background:rgba(30,144,255,.8);z-index:1}",map:void 0,media:void 0})},{name:"JsFlow",components:{PalettePanel:f,ToolPanel:g,NodeTemplate:m},model:{prop:"data",event:"change"},props:C,data:function(){var t=this.data;return e({nodes:t.nodes,lines:t.lines,canvasGrabbing:!1,isFrameSelecting:!1,frameMoving:null,mouseDownPos:{},canvasPos:{x:0,y:0},canvasOffset:{x:0,y:0},frameSelectorPos:{x:0,y:0},frameSelectorRect:{width:0,height:0},selectedNodes:[],showAddingNode:!1,addingNodeConfig:{},addingNodeRect:{},canvasRect:{},paletteRect:{},zoom:1,moveTimer:null},_)},computed:{canvasWrapStyle:function(){return{cursor:this.isFrameSelecting?"crosshair":this.canvasGrabbing?"-webkit-grabbing":"-webkit-grab"}},frameSelectorStyle:function(){return{left:"".concat(this.frameSelectorPos.x,"px"),top:"".concat(this.frameSelectorPos.y,"px"),width:"".concat(this.frameSelectorRect.width,"px"),height:"".concat(this.frameSelectorRect.height,"px")}}},watch:{"data.nodes":{handler:function(t){this.nodes=t},deep:!0},editable:function(t){var e=this.$el.querySelectorAll(".canvas-node");this.toggleNodeDraggable(e,t)}},mounted:function(){this.initCanvas(),this.registerEvent(),this.renderData(),this.$refs.palettePanel&&(this.paletteRect=this.$refs.palettePanel.getBoundingClientRect(),this.registerPaletteEvent())},beforeDestroy:function(){this.$refs.palettePanel&&this.$refs.palettePanel.removeEventListener(this.mousedown,this.nodeCreateHandler),this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler)},methods:{initCanvas:function(){var t={},n=e(e({},this.endpointOptions),this.connectorOptions);for(var i in n){var o=i[0].toUpperCase();t["".concat(o).concat(i.slice(1))]=n[i]}this.instance=l.getInstance(e({Container:"canvas-flow"},t))},registerEvent:function(){var t=this;this.instance.bind("beforeDrag",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrag||t.$listeners.onBeforeDrag(e))}),this.instance.bind("connectionDrag",function(e){"function"==typeof t.$listeners.onConnectionDrag&&t.$emit("onConnectionDrag",e)}),this.instance.bind("beforeDrop",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrop||t.$listeners.onBeforeDrop(e))}),this.instance.bind("connection",function(e){"function"==typeof t.$listeners.onConnection&&t.$emit("onConnection",e)}),this.instance.bind("connectionDragStop",function(e,n){if(!e.target||!e.target.classList.contains("jsflow-node")){var i=t.getNodeByEvent(n.target);if(i){var o=t.nodes.find(function(t){return i.id===t.id});if("function"==typeof t.$listeners.onConnectionDragStop){var s={id:e.source.id,arrow:e.endpoints[0].anchor.type||e.endpoints[0].anchor.cssClass};t.$emit("onConnectionDragOnNode",s,o.id,n)}}"function"==typeof t.$listeners.onConnectionDragStop&&t.$emit("onConnectionDragStop",e)}}),this.instance.bind("beforeDetach",function(e){return"function"!=typeof t.$listeners.onBeforeDetach||t.$listeners.onBeforeDetach(e)}),this.instance.bind("connectionDetached",function(e,n){var i=t.lines.filter(function(t){return t.source.id!==e.sourceId&&t.target.id!==e.targetId});t.lines=i,"function"==typeof t.$listeners.onConnectionDetached&&t.$emit("onConnectionDetached",e)}),this.instance.bind("connectionMoved",function(e,n){"function"==typeof t.$listeners.onConnectionMoved&&t.$emit("onConnectionMoved",lines)}),this.instance.bind("click",function(e,n){"function"==typeof t.$listeners.onConnectionClick&&t.$emit("onConnectionClick",e,n)}),this.instance.bind("dblclick",function(e,n){"function"==typeof t.$listeners.onConnectionDbClick&&t.$emit("onConnectionDbClick",e,n)}),this.instance.bind("endpointClick",function(e,n){"function"==typeof t.$listeners.onEndpointClick&&t.$emit("onEndpointClick",e,n)}),this.instance.bind("endpointDblClick",function(e,n){"function"==typeof t.$listeners.onEndpointDbClick&&t.$emit("onEndpointDbClick",e,n)})},renderData:function(){var t=this;this.instance.batch(function(){t.nodes.forEach(function(e){t.initNode(e)}),t.lines.forEach(function(e){t.createConnector(e,t.connectorOptions)})})},updateCanvas:function(t){this.removeAllConnector(),this.lines=t.lines,this.nodes=t.nodes,this.renderData()},createNode:function(t){var e=this;("function"!=typeof this.$listeners.onCreateNodeBefore||this.$listeners.onCreateNodeBefore(t))&&(this.nodes.push(t),this.$nextTick(function(){e.initNode(t)}))},initNode:function(t){var e=document.getElementById(t.id);e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.setNodeDraggable(t,this.nodeOptions),this.setNodeEndPoint(t,this.endpointOptions),"function"==typeof this.$listeners.onCreateNodeAfter&&this.$emit("onCreateNodeAfter",t)},removeNode:function(t){var e=this.nodes.findIndex(function(e){return e.id===t.id});this.nodes.splice(e,1),this.instance.remove(t.id)},setNodeEndPoint:function(t,n){var i=this,o=n.anchors||{Top:[.5,0,0,-1,"Top"],Right:[1,.5,1,0,"Right"],Bottom:[.5,1,0,1,"Bottom"],Left:[0,.5,-1,0,"Left"]};Object.keys(o).forEach(function(s){var r=o[s],a=i.instance.addEndpoint(t.id,e({anchor:r,uuid:s+t.id},n));a&&a.endpoint.canvas&&(a.endpoint.canvas.dataset.pos=s)})},setNodeDraggable:function(t,n){if(this.editable){var o=this;this.instance.draggable(t.id,e({grid:[20,20],drag:function(e){var n=o.instance.getDragSelection().map(function(t){return t.el.id}),i=o.nodes.find(function(e){return t.id===e.id}),s=Object.assign({},i);if(o.toggleHighLight(t,!1),0===n.length)o.setReferenceLine(t.id,e),o.setBoundaryOffset(e);else if(n.some(function(e){return e===t.id})){var r;if(!o.frameMoving){var a,l,u=Math.min.apply(null,o.selectedNodes.map(function(t){return t.x})),c=Math.min.apply(null,o.selectedNodes.map(function(t){return t.y}));o.selectedNodes.some(function(t){if(t.x===u)return a=t,!0}),o.selectedNodes.some(function(t){if(t.y===c)return l=t,!0}),o.frameMoving={left:a,top:l}}(null===(r=o.frameMoving.left)||void 0===r?void 0:r.id)===t.id&&o.setFrameReferLine()}else o.cancelFrameSelectorHandler();o.$emit("onNodeMoving",s,e)},stop:function(e){var n=-1,s=i(e.pos,2),r=s[0],a=s[1],l=o.nodes.find(function(e,i){if(e.id===t.id)return n=i,!0}),u=Object.assign({},l,{x:r,y:a});o.nodes.splice(n,1,u),o.frameMoving=null,o.$emit("onNodeMoveStop",u,e);var c=o.$refs.canvasFlow.querySelector(".reference-line-vertical"),h=o.$refs.canvasFlow.querySelector(".reference-line-horizontal");c.setAttribute("style","display: none; left: 0"),h.setAttribute("style","display: none; top: 0"),clearTimeout(this.moveTimer)}},n))}},setReferenceLine:function(t,e){var n=this,o=e.el,s=o.clientWidth,r=o.clientHeight,a=i(e.pos,2),l=[a[0]+s/2,a[1]+r/2],u=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),c=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");u.setAttribute("style","display: none; left: 0"),c.setAttribute("style","display: none; top: 0");var h=!1,d=!1;this.data.nodes.some(function(e){if(e.id!==t){var i=n.$refs.canvasFlow.querySelector("#".concat(e.id)),o=window.getComputedStyle(i),s=o.width,r=o.height,a=[e.x+Number(s.replace("px",""))/2,e.y+Number(r.replace("px",""))/2];return h||a[0]!==l[0]||(u.setAttribute("style","display: inline-block; left: ".concat(a[0]-1,"px;")),h=!0),d||a[1]!==l[1]||(c.setAttribute("style","display: inline-block; top: ".concat(a[1]-1,"px;")),d=!0),!(!h||!d)||void 0}})},setFrameReferLine:function(){var t=this,e=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.left.id)),n=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.top.id)),i=Number(window.getComputedStyle(e).left.replace("px","")),o=Number(window.getComputedStyle(n).top.replace("px","")),s=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),r=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");s.setAttribute("style","display: none; left: 0"),r.setAttribute("style","display: none; top: 0");var a=!1,l=!1;this.data.nodes.some(function(e){if(!t.selectedNodes.find(function(t){return t.id===e.id})){var n=[e.x,e.y];return a||n[0]!==i||(s.setAttribute("style","display: inline-block; left: ".concat(i,"px;")),a=!0),l||n[1]!==o||(r.setAttribute("style","display: inline-block; top: ".concat(o,"px;")),l=!0),!(!a||!l)||void 0}})},setBoundaryOffset:function(t){var e=this.$refs.canvasFlowWrap.getBoundingClientRect(),n=e.left,i=e.top,o=e.width,s=e.height;t.e.pageX<n&&this.intervalMoveCanvas("horizontal",20),t.e.pageX>n+o&&this.intervalMoveCanvas("horizontal",-20),t.e.pageY<i&&this.intervalMoveCanvas("vertical",20),t.e.pageY>i+s&&this.intervalMoveCanvas("vertical",-20)},intervalMoveCanvas:function(t,e){var n=this;this.moveTimer&&clearTimeout(this.moveTimer),this.moveTimer=setTimeout(function(){var i=n.canvasOffset,o=i.x,s=i.y;"horizontal"===t?o+=e:s+=e,n.setCanvasPosition(o,s),n.moveTimer||n.intervalMoveCanvas(t,e)},16)},setNodePosition:function(t){var e=document.getElementById(t.id);e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.instance.revalidate(e)},toggleNodeDraggable:function(t,e){this.instance.setDraggable(t,e)},setNodeInitialPos:function(t){var e={left:"".concat(t.x,"px"),top:"".concat(t.y,"px"),visibility:t.visible?"initial":"hidden"};return 1!==this.zoom&&(e.transform="matrix(".concat(this.zoom,", 0, 0, ").concat(this.zoom,", 0, 0)")),e},createConnector:function(t,n){var i=t.options||{};return this.instance.connect({source:t.source.id,target:t.target.id,uuids:[t.source.arrow+t.source.id,t.target.arrow+t.target.id]},e(e({},n),i))},setConnector:function(t,e,n){var i=this;this.instance.getAllConnections().filter(function(n){return n.sourceId===t&&n.targetId===e}).forEach(function(t){t.setConnector(n),i.endpointOptions&&i.endpointOptions.connectorOverlays&&i.endpointOptions.connectorOverlays.forEach(function(e){t.addOverlay(e)})})},removeConnector:function(t){var e=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){e.instance.deleteConnection(t)})},removeAllConnector:function(){this.instance.deleteEveryConnection(),this.lines=[]},getConnectorsByNodeId:function(t){return this.instance.getAllConnections().filter(function(e){return e.sourceId===t||e.targetId===t})},getNodeByEvent:function(t){var e=t.parentNode;return!(!e||"HTML"===e.nodeName)&&(e.classList.contains("jsflow-node")?e:this.getNodeByEvent(e))},addLineOverlay:function(t,e){var n=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.addOverlay([e.type,{label:e.name,location:e.location,cssClass:e.cls,id:e.id,events:{click:function(t,e){n.$emit("onOverlayClick",t,e)}}}])})},removeLineOverlay:function(t,e){this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.removeOverlay(e)})},onCanvasMouseDown:function(t){"touchstart"!==t.type&&0!==t.button||(t=v(t),this.isFrameSelecting?this.frameSelectHandler(t):(this.canvasGrabbing=!0,this.mouseDownPos={x:t.pageX,y:t.pageY},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.canvasFlowMoveHandler,!1)))},canvasFlowMoveHandler:function(t){t=v(t),this.canvasOffset={x:this.canvasPos.x+t.pageX-this.mouseDownPos.x,y:this.canvasPos.y+t.pageY-this.mouseDownPos.y},this.$refs.canvasFlow.style.left="".concat(this.canvasOffset.x,"px"),this.$refs.canvasFlow.style.top="".concat(this.canvasOffset.y,"px"),this.$emit("onCanvasMove",{left:this.canvasOffset.x,top:this.canvasOffset.y})},onCanvasMouseUp:function(t){this.isFrameSelecting?this.frameSelectEndHandler(t):(this.canvasGrabbing=!1,this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.canvasFlowMoveHandler),this.canvasPos={x:this.canvasOffset.x,y:this.canvasOffset.y})},registerPaletteEvent:function(){this.$refs.palettePanel.addEventListener(this.mousedown,this.nodeCreateHandler,!1)},nodeCreateHandler:function(t){var n=this,i=function t(e,n){return 1===e.nodeType&&e.classList.contains(n)?e:"HTML"!==e.parentNode.nodeName?t(e.parentNode,n):null}(t.target,this.selector);if(i){var o=i.dataset.type?i.dataset.type:"",s={};for(var r in i.dataset){var a=r.match(/(config)(\w*)/);if(a&&""!==a[2]){var l=a[2],u=l[0].toLowerCase()+l.slice(1);s[u]=i.dataset[r]}}this.showAddingNode=!0,this.addingNodeConfig.id=x("node"),this.addingNodeConfig.type=o,this.$nextTick(function(){var i=n.$el.querySelector(".adding-node");n.addingNodeRect=i.getBoundingClientRect();var r=n.getAddingNodePos(t);n.addingNodeConfig=e({id:x("node"),type:o,x:r.x,y:r.y,adding:!0,visible:!1},s),n.$el.addEventListener(n.mousemove,n.nodeMovingHandler,!1),document.addEventListener(n.mouseup,n.nodeMoveEndHandler,!1)})}},nodeMovingHandler:function(t){var e=this.getAddingNodePos(t);this.$set(this.addingNodeConfig,"x",e.x),this.$set(this.addingNodeConfig,"y",e.y),this.$set(this.addingNodeConfig,"visible",!0),"function"==typeof this.$listeners.onAddNodeMoving&&this.$emit("onAddNodeMoving",{type:this.addingNodeConfig.type,x:e.x,y:e.y})},nodeMoveEndHandler:function(t){if(this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler),this.showAddingNode=!1,t.pageX>this.paletteRect.left+this.paletteRect.width){var e=this.canvasOffset.x,n=this.canvasOffset.y;if("function"==typeof DOMMatrixReadOnly){var i=window.getComputedStyle(this.$refs.canvasFlow),o=new DOMMatrixReadOnly(i.transform);e+=o.e,n+=o.f}var s=(this.addingNodeConfig.x-this.paletteRect.width-e+this.addingNodeRect.width*(1-this.zoom)/2)/this.zoom,r=(this.addingNodeConfig.y-n+this.addingNodeRect.height*(1-this.zoom)/2)/this.zoom;this.$set(this.addingNodeConfig,"x",s),this.$set(this.addingNodeConfig,"y",r),delete this.addingNodeConfig.adding,delete this.addingNodeConfig.visible,this.createNode(this.addingNodeConfig)}this.addingNodeConfig={},this.addingNodeRect={}},getAddingNodePos:function(t){return{x:t.pageX-this.paletteRect.left-this.addingNodeRect.width/this.zoom/2,y:t.pageY-this.paletteRect.top-this.addingNodeRect.height/this.zoom/2}},toggleHighLight:function(t){var e=this,n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(this.editable){var i=document.getElementById(t.id);this.instance.selectEndpoints({source:i}).each(function(t){var i;n?(i=e.endpointOptions.hoverPaintStyle,t.endpoint.canvas.classList.add("jtk-endpoint-highlight")):(i=e.endpointOptions.paintStyle,t.endpoint.canvas.classList.remove("jtk-endpoint-highlight")),i&&t.setStyle(i)})}},onToolClick:function(t){"function"==typeof this[t.type]&&this[t.type](),this.$emit("onToolClick",t)},setZoom:function(t,e,n){this.instance.setContainer("canvas-flow"),this.$refs.canvasFlow.style.transform="matrix("+t+",0,0,"+t+","+e+","+n+")",this.$refs.canvasFlow.style.transformOrigin="0 0",this.$refs.canvasFlow.zoom=t,this.zoom=t,this.instance.setZoom(t)},zoomIn:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1.1,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i>2||this.setZoom(i,o,s)},zoomOut:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:.9,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i<.1||this.setZoom(i,o,s)},resetPosition:function(){this.setZoom(1,0,0),this.setCanvasPosition(0,0)},setCanvasPosition:function(t,e){this.canvasOffset={x:t,y:e},this.canvasPos={x:t,y:e},this.$refs.canvasFlow.style.left=this.canvasOffset.x+"px",this.$refs.canvasFlow.style.top=this.canvasOffset.y+"px"},frameSelect:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.isFrameSelecting=t},onOpenFrameSelect:function(){this.frameSelect()},onCloseFrameSelect:function(){this.frameSelect(!1)},frameSelectHandler:function(t){this.canvasRect=this.$refs.canvasFlowWrap.getBoundingClientRect(),this.mouseDownPos={x:t.clientX-this.canvasRect.left,y:t.clientY-this.canvasRect.top},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.frameSelectMovingHandler,!1)},frameSelectMovingHandler:function(t){var e=t.clientX-this.mouseDownPos.x-this.canvasRect.left,n=t.clientY-this.mouseDownPos.y-this.canvasRect.top;this.frameSelectorRect={width:Math.abs(e),height:Math.abs(n)},this.frameSelectorPos={x:e>0?this.mouseDownPos.x:this.mouseDownPos.x+e,y:n>0?this.mouseDownPos.y:this.mouseDownPos.y+n}},frameSelectEndHandler:function(t){this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.frameSelectMovingHandler),this.$refs.canvasFlowWrap.removeEventListener(this.mouseup,this.frameSelectEndHandler),document.addEventListener(this.mousedown,this.cancelFrameSelectorHandler,{capture:!1,once:!0});var e=this.getSelectedNodes(),n=e.map(function(t){return t.id}),i=this.mouseDownPos,o=i.x,s=i.y;this.isFrameSelecting=!1,this.frameSelectorPos={x:0,y:0},this.frameSelectorRect={width:0,height:0},this.selectedNodes=e,this.clearNodesDragSelection(),this.addNodesToDragSelection(n),this.$emit("onFrameSelectEnd",e.slice(0),o,s)},getSelectedNodes:function(){var t=this,e=this.frameSelectorPos,n=e.x,i=e.y,o=this.frameSelectorRect,s=o.width,r=o.height;return this.nodes.filter(function(e){var o=document.querySelector("#".concat(e.id)).getBoundingClientRect(),a=o.left-t.canvasRect.left,l=o.top-t.canvasRect.top;if(n<a&&n+s>a&&i<l&&i+r>l)return!0})},cancelFrameSelectorHandler:function(t){this.selectedNodes=[],this.clearNodesDragSelection(),this.$emit("onCloseFrameSelect")},addNodesToDragSelection:function(t){t.forEach(function(t){var e=document.querySelector("#".concat(t));e&&e.classList.add("selected")}),this.instance.addToDragSelection(t)},clearNodesDragSelection:function(){document.querySelectorAll(".jsflow-node.selected").forEach(function(t){t.classList.remove("selected")}),this.instance.clearDragSelection()}}},void 0,!1,void 0,p,void 0);"undefined"!=typeof window&&"Vue"in window&&window.Vue.component("js-flow",j);export default j;
+function t(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)}return n}function e(e){for(var i=1;i<arguments.length;i++){var o=null!=arguments[i]?arguments[i]:{};i%2?t(Object(o),!0).forEach(function(t){n(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):t(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}function n(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var i,o,s=[],r=!0,a=!1;try{for(n=n.call(t);!(r=(i=n.next()).done)&&(s.push(i.value),!e||s.length!==e);r=!0);}catch(t){a=!0,o=t}finally{try{r||null==n.return||n.return()}finally{if(a)throw o}}return s}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,i=new Array(e);n<e;n++)i[n]=t[n];return i}var s="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var r,a=(function(t,e){(function(){void 0===Math.sgn&&(Math.sgn=function(t){return 0==t?0:t>0?1:-1});var t=function(t,e){return{x:t.x-e.x,y:t.y-e.y}},n=function(t,e){return t.x*e.x+t.y*e.y},i=function(t){return Math.sqrt(t.x*t.x+t.y*t.y)},o=function(t,e){return{x:t.x*e,y:t.y*e}},s=Math.pow(2,-65),r=function(e,n){for(var o=[],s=a(e,n),r=n.length-1,u=l(s,2*r-1,o,0),c=t(e,n[0]),h=i(c),p=0,f=0;f<u;f++){c=t(e,d(n,r,o[f],null,null));var g=i(c);g<h&&(h=g,p=o[f])}return c=t(e,n[r]),(g=i(c))<h&&(h=g,p=1),{location:p,distance:h}},a=function(e,i){for(var s=i.length-1,r=2*s-1,a=[],l=[],u=[],c=[],h=[[1,.6,.3,.1],[.4,.6,.6,.4],[.1,.3,.6,1]],d=0;d<=s;d++)a[d]=t(i[d],e);for(d=0;d<=s-1;d++)l[d]=t(i[d+1],i[d]),l[d]=o(l[d],3);for(var p=0;p<=s-1;p++)for(var f=0;f<=s;f++)u[p]||(u[p]=[]),u[p][f]=n(l[p],a[f]);for(d=0;d<=r;d++)c[d]||(c[d]=[]),c[d].y=0,c[d].x=parseFloat(d)/r;for(var g=s,m=s-1,v=0;v<=g+m;v++){var y=Math.max(0,v-m),b=Math.min(v,g);for(d=y;d<=b;d++){var P=v-d;c[d+P].y+=u[P][d]*h[P][d]}}return c},l=function(t,e,n,i){var o,s,r=[],a=[],p=[],f=[];switch(u(t,e)){case 0:return 0;case 1:if(i>=64)return n[0]=(t[0].x+t[e].x)/2,1;if(c(t,e))return n[0]=h(t,e),1}d(t,e,.5,r,a),o=l(r,e,p,i+1),s=l(a,e,f,i+1);for(var g=0;g<o;g++)n[g]=p[g];for(g=0;g<s;g++)n[g+o]=f[g];return o+s},u=function(t,e){var n,i,o=0;n=i=Math.sgn(t[0].y);for(var s=1;s<=e;s++)(n=Math.sgn(t[s].y))!=i&&o++,i=n;return o},c=function(t,e){var n,i,o,r,a,l,u,c,h;r=t[0].y-t[e].y,a=t[e].x-t[0].x,l=t[0].x*t[e].y-t[e].x*t[0].y,c=h=0;for(var d=1;d<e;d++){var p=r*t[d].x+a*t[d].y+l;p>c?c=p:p<h&&(h=p)}return 0,1,0,n=(1*(l-c)-0*(u=a))*(1/(0*u-1*r)),i=(1*(l-h)-0*(u=a))*(1/(0*u-1*r)),o=Math.min(n,i),Math.max(n,i)-o<s?1:0},h=function(t,e){var n=t[e].x-t[0].x,i=t[e].y-t[0].y,o=t[0].x-0;return 0+1*((n*(t[0].y-0)-i*o)*(1/(0*n-1*i)))},d=function(t,e,n,i,o){for(var s=[[]],r=0;r<=e;r++)s[0][r]=t[r];for(var a=1;a<=e;a++)for(r=0;r<=e-a;r++)s[a]||(s[a]=[]),s[a][r]||(s[a][r]={}),s[a][r].x=(1-n)*s[a-1][r].x+n*s[a-1][r+1].x,s[a][r].y=(1-n)*s[a-1][r].y+n*s[a-1][r+1].y;if(null!=i)for(r=0;r<=e;r++)i[r]=s[r][0];if(null!=o)for(r=0;r<=e;r++)o[r]=s[e-r][r];return s[e][0]},p={},f=function(t,e){for(var n=function(t){var e=p[t];if(!e){var n=function(t){return function(e){return t}},i=function(){return function(t){return t}},o=function(){return function(t){return 1-t}},s=function(t){return function(e){for(var n=1,i=0;i<t.length;i++)n*=t[i](e);return n}};(e=[]).push(new function(){return function(e){return Math.pow(e,t)}});for(var r=1;r<t;r++){for(var a=[new n(t)],l=0;l<t-r;l++)a.push(new i);for(l=0;l<r;l++)a.push(new o);e.push(new s(a))}e.push(new function(){return function(e){return Math.pow(1-e,t)}}),p[t]=e}return e}(t.length-1),i=0,o=0,s=0;s<t.length;s++)i+=t[s].x*n[s](e),o+=t[s].y*n[s](e);return{x:i,y:o}},g=function(t,e){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))},m=function(t){return t[0].x===t[1].x&&t[0].y===t[1].y},v=function(t,e,n){if(m(t))return{point:t[0],location:e};for(var i=f(t,e),o=0,s=e,r=n>0?1:-1,a=null;o<Math.abs(n);)a=f(t,s+=.005*r),o+=g(a,i),i=a;return{point:a,location:s}},y=function(t,e){var n=f(t,e),i=f(t.slice(0,t.length-1),e),o=i.y-n.y,s=i.x-n.x;return 0===o?1/0:Math.atan(o/s)},b=function(t,e,n,i,o){var s=i-e,r=t-n,a=t*(e-i)+e*(n-t),l=function(t){return[P(t,"x"),P(t,"y")]}(o),u=[s*l[0][0]+r*l[1][0],s*l[0][1]+r*l[1][1],s*l[0][2]+r*l[1][2],s*l[0][3]+r*l[1][3]+a],c=function(t,e,n,i){var o,s,r=e/t,a=n/t,l=i/t,u=(3*a-Math.pow(r,2))/9,c=(9*r*a-27*l-2*Math.pow(r,3))/54,h=Math.pow(u,3)+Math.pow(c,2),d=[];if(h>=0)o=x(c+Math.sqrt(h))*Math.pow(Math.abs(c+Math.sqrt(h)),1/3),s=x(c-Math.sqrt(h))*Math.pow(Math.abs(c-Math.sqrt(h)),1/3),d[0]=-r/3+(o+s),d[1]=-r/3-(o+s)/2,d[2]=-r/3-(o+s)/2,0!==Math.abs(Math.sqrt(3)*(o-s)/2)&&(d[1]=-1,d[2]=-1);else{var p=Math.acos(c/Math.sqrt(-Math.pow(u,3)));d[0]=2*Math.sqrt(-u)*Math.cos(p/3)-r/3,d[1]=2*Math.sqrt(-u)*Math.cos((p+2*Math.PI)/3)-r/3,d[2]=2*Math.sqrt(-u)*Math.cos((p+4*Math.PI)/3)-r/3}for(var f=0;f<3;f++)(d[f]<0||d[f]>1)&&(d[f]=-1);return d}.apply(null,u),h=[];if(null!=c)for(var d=0;d<3;d++){var p,f=c[d],g=Math.pow(f,2),m=Math.pow(f,3),v=[l[0][0]*m+l[0][1]*g+l[0][2]*f+l[0][3],l[1][0]*m+l[1][1]*g+l[1][2]*f+l[1][3]];p=n-t!=0?(v[0]-t)/(n-t):(v[1]-e)/(i-e),f>=0&&f<=1&&p>=0&&p<=1&&h.push(v)}return h};function P(t,e){return[-t[0][e]+3*t[1][e]+-3*t[2][e]+t[3][e],3*t[0][e]-6*t[1][e]+3*t[2][e],-3*t[0][e]+3*t[1][e],t[0][e]]}function x(t){return t<0?-1:t>0?1:0}var C=this.jsBezier={distanceFromCurve:r,gradientAtPoint:y,gradientAtPointAlongCurveFrom:function(t,e,n){var i=v(t,e,n);return i.location>1&&(i.location=1),i.location<0&&(i.location=0),y(t,i.location)},nearestPointOnCurve:function(t,e){var n=r(t,e);return{point:d(e,e.length-1,n.location,null,null),location:n.location}},pointOnCurve:f,pointAlongCurveFrom:function(t,e,n){return v(t,e,n).point},perpendicularToCurveAt:function(t,e,n,i){var o=v(t,e,i=null==i?0:i),s=y(t,o.location),r=Math.atan(-1/s),a=n/2*Math.sin(r),l=n/2*Math.cos(r);return[{x:o.point.x+l,y:o.point.y+a},{x:o.point.x-l,y:o.point.y-a}]},locationAlongCurveFrom:function(t,e,n){return v(t,e,n).location},getLength:function(t){var e=(new Date).getTime();if(m(t))return 0;for(var n=f(t,0),i=0,o=0,s=null;o<1;)s=f(t,o+=.005),i+=g(s,n),n=s;return console.log("length",(new Date).getTime()-e),i},lineIntersection:b,boxIntersection:function(t,e,n,i,o){var s=[];return s.push.apply(s,b(t,e,t+n,e,o)),s.push.apply(s,b(t+n,e,t+n,e+i,o)),s.push.apply(s,b(t+n,e+i,t,e+i,o)),s.push.apply(s,b(t,e+i,t,e,o)),s},boundingBoxIntersection:function(t,e){var n=[];return n.push.apply(n,b(t.x,t.y,t.x+t.w,t.y,e)),n.push.apply(n,b(t.x+t.w,t.y,t.x+t.w,t.y+t.h,e)),n.push.apply(n,b(t.x+t.w,t.y+t.h,t.x,t.y+t.h,e)),n.push.apply(n,b(t.x,t.y+t.h,t.x,t.y,e)),n},version:"0.9.0"};e.jsBezier=C}).call("undefined"!=typeof window?window:s),function(){var t=this.Biltong={version:"0.4.0"};e.Biltong=t;var n=function(t){return"[object Array]"===Object.prototype.toString.call(t)},i=function(t,e,i){return i(t=n(t)?t:[t.x,t.y],e=n(e)?e:[e.x,e.y])},o=t.gradient=function(t,e){return i(t,e,function(t,e){return e[0]==t[0]?e[1]>t[1]?1/0:-1/0:e[1]==t[1]?e[0]>t[0]?0:-0:(e[1]-t[1])/(e[0]-t[0])})},s=(t.normal=function(t,e){return-1/o(t,e)},t.lineLength=function(t,e){return i(t,e,function(t,e){return Math.sqrt(Math.pow(e[1]-t[1],2)+Math.pow(e[0]-t[0],2))})},t.quadrant=function(t,e){return i(t,e,function(t,e){return e[0]>t[0]?e[1]>t[1]?2:1:e[0]==t[0]?e[1]>t[1]?2:1:e[1]>t[1]?3:4})}),r=(t.theta=function(t,e){return i(t,e,function(t,e){var n=o(t,e),i=Math.atan(n),r=s(t,e);return 4!=r&&3!=r||(i+=Math.PI),i<0&&(i+=2*Math.PI),i})},t.intersects=function(t,e){var n=t.x,i=t.x+t.w,o=t.y,s=t.y+t.h,r=e.x,a=e.x+e.w,l=e.y,u=e.y+e.h;return n<=r&&r<=i&&o<=l&&l<=s||n<=a&&a<=i&&o<=l&&l<=s||n<=r&&r<=i&&o<=u&&u<=s||n<=a&&r<=i&&o<=u&&u<=s||r<=n&&n<=a&&l<=o&&o<=u||r<=i&&i<=a&&l<=o&&o<=u||r<=n&&n<=a&&l<=s&&s<=u||r<=i&&n<=a&&l<=s&&s<=u},t.encloses=function(t,e,n){var i=t.x,o=t.x+t.w,s=t.y,r=t.y+t.h,a=e.x,l=e.x+e.w,u=e.y,c=e.y+e.h,h=function(t,e,i,o){return n?t<=e&&i>=o:t<e&&i>o};return h(i,a,o,l)&&h(s,u,r,c)},[null,[1,-1],[1,1],[-1,1],[-1,-1]]),a=[null,[-1,-1],[-1,1],[1,1],[1,-1]];t.pointOnLine=function(t,e,n){var i=o(t,e),l=s(t,e),u=n>0?r[l]:a[l],c=Math.atan(i),h=Math.abs(n*Math.sin(c))*u[1],d=Math.abs(n*Math.cos(c))*u[0];return{x:t.x+d,y:t.y+h}},t.perpendicularLineTo=function(t,e,n){var i=o(t,e),s=Math.atan(-1/i),r=n/2*Math.sin(s),a=n/2*Math.cos(s);return[{x:e.x+a,y:e.y+r},{x:e.x-a,y:e.y-r}]}}.call("undefined"!=typeof window?window:s),function(){function t(t,e,n,i,o,s,r,a){return function(){var t=[];return Array.prototype.push.apply(t,arguments),t.item=function(t){return this[t]},t}(function(t,e,n,i,o,s,r,a){return new Touch({target:e,identifier:A(),pageX:n,pageY:i,screenX:o,screenY:s,clientX:r||o,clientY:a||s})}.apply(null,arguments))}var n=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},i=function(t){return"string"==typeof t||t.constructor===String?document.getElementById(t):t},o=function(t){return t.srcElement||t.target},s=function(t,e,n,i){if(i){if(void 0!==t.path&&t.path.indexOf)return{path:t.path,end:t.path.indexOf(n)};var o={path:[],end:-1},s=function(t){o.path.push(t),t===n?o.end=o.path.length-1:null!=t.parentNode&&s(t.parentNode)};return s(e),o}return{path:[e],end:1}},r=function(t,e){for(var n=0,i=t.length;n<i&&t[n]!=e;n++);n<t.length&&t.splice(n,1)},a=1,l=function(t,e,n){var i=a++;return t.__ta=t.__ta||{},t.__ta[e]=t.__ta[e]||{},t.__ta[e][i]=n,n.__tauid=i,i},u=function(t,e,i,r){if(null==t)return i;var a=t.split(","),l=function(r){l.__tauid=i.__tauid;var u=o(r),c=u,h=s(r,u,e,null!=t);if(-1!=h.end)for(var d=0;d<h.end;d++){c=h.path[d];for(var p=0;p<a.length;p++)n(c,a[p],e)&&i.apply(c,arguments)}};return c(i,r,l),l},c=function(t,e,n){t.__taExtra=t.__taExtra||[],t.__taExtra.push([e,n])},h=function(t,e,n,i){if(m&&y[e]){var o=u(i,t,n,y[e]);S(t,y[e],o,n)}"focus"===e&&null==t.getAttribute("tabindex")&&t.setAttribute("tabindex","1"),S(t,e,u(i,t,n,e),n)},d={tap:{touches:1,taps:1},dbltap:{touches:1,taps:2},contextmenu:{touches:2,taps:1}},p=function(t,e){return function(i,a,l,u){if("contextmenu"==a&&v)h(i,a,l,u);else{if(null==i.__taTapHandler){var c=i.__taTapHandler={tap:[],dbltap:[],contextmenu:[],down:!1,taps:0,downSelectors:[]},p=function(){c.down=!1},f=function(){c.taps=0};h(i,"mousedown",function(r){for(var a=o(r),l=s(r,a,i,null!=u),h=!1,d=0;d<l.end;d++){if(h)return;a=l.path[d];for(var g=0;g<c.downSelectors.length;g++)if(null==c.downSelectors[g]||n(a,c.downSelectors[g],i)){c.down=!0,setTimeout(p,t),setTimeout(f,e),h=!0;break}}}),h(i,"mouseup",function(t){if(c.down){var e,r,a=o(t);c.taps++;var l=E(t);for(var u in d)if(d.hasOwnProperty(u)){var h=d[u];if(h.touches===l&&(1===h.taps||h.taps===c.taps))for(var p=0;p<c[u].length;p++){r=s(t,a,i,null!=c[u][p][1]);for(var f=0;f<r.end;f++)if(e=r.path[f],null==c[u][p][1]||n(e,c[u][p][1],i)){c[u][p][0].apply(e,[t]);break}}}}})}i.__taTapHandler.downSelectors.push(u),i.__taTapHandler[a].push([l,u]),l.__taUnstore=function(){r(i.__taTapHandler[a],l)}}}},f=function(t,e,n,i){for(var o in n.__tamee[t])n.__tamee[t].hasOwnProperty(o)&&n.__tamee[t][o].apply(i,[e])},g=function(){var t=[];return function(e,i,s,r){if(!e.__tamee){e.__tamee={over:!1,mouseenter:[],mouseexit:[]};var a=function(i){var s=o(i);(null==r&&s==e&&!e.__tamee.over||n(s,r,e)&&(null==s.__tamee||!s.__tamee.over))&&(f("mouseenter",i,e,s),s.__tamee=s.__tamee||{},s.__tamee.over=!0,t.push(s))},c=function(i){for(var s=o(i),r=0;r<t.length;r++)s!=t[r]||n(i.relatedTarget||i.toElement,"*",s)||(s.__tamee.over=!1,t.splice(r,1),f("mouseexit",i,e,s))};S(e,"mouseover",u(r,e,a,"mouseover"),a),S(e,"mouseout",u(r,e,c,"mouseout"),c)}s.__taUnstore=function(){delete e.__tamee[i][s.__tauid]},l(e,i,s),e.__tamee[i][s.__tauid]=s}},m="ontouchstart"in document.documentElement||navigator.maxTouchPoints,v="onmousedown"in document.documentElement,y={mousedown:"touchstart",mouseup:"touchend",mousemove:"touchmove"},b=function(){var t=-1;if("Microsoft Internet Explorer"==navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),P=b>-1&&b<9,x=function(t,e){if(null==t)return[0,0];var n=j(t),i=_(n,0);return[i[e+"X"],i[e+"Y"]]},C=function(t){return null==t?[0,0]:P?[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop]:x(t,"page")},_=function(t,e){return t.item?t.item(e):t[e]},j=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},E=function(t){return j(t).length},S=function(t,e,n,i){if(l(t,e,n),i.__tauid=n.__tauid,t.addEventListener)t.addEventListener(e,n,!1);else if(t.attachEvent){var o=e+n.__tauid;t["e"+o]=n,t[o]=function(){t["e"+o]&&t["e"+o](window.event)},t.attachEvent("on"+e,t[o])}},w=function(t,e,n){null!=n&&D(t,function(){var o=i(this);if(function(t,e,n){if(t.__ta&&t.__ta[e]&&delete t.__ta[e][n.__tauid],n.__taExtra){for(var i=0;i<n.__taExtra.length;i++)w(t,n.__taExtra[i][0],n.__taExtra[i][1]);n.__taExtra.length=0}n.__taUnstore&&n.__taUnstore()}(o,e,n),null!=n.__tauid)if(o.removeEventListener)o.removeEventListener(e,n,!1),m&&y[e]&&o.removeEventListener(y[e],n,!1);else if(this.detachEvent){var s=e+n.__tauid;o[s]&&o.detachEvent("on"+e,o[s]),o[s]=null,o["e"+s]=null}n.__taTouchProxy&&w(t,n.__taTouchProxy[1],n.__taTouchProxy[0])})},D=function(t,e){if(null!=t){t="undefined"!=typeof Window&&"unknown"!=typeof t.top&&t==t.top?[t]:"string"!=typeof t&&null==t.tagName&&null!=t.length?t:"string"==typeof t?document.querySelectorAll(t):[t];for(var n=0;n<t.length;n++)e.apply(t[n])}},A=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"==t?e:3&e|8).toString(16)})};this.Mottle=function(e){var n=(e=e||{}).clickThreshold||250,s=e.dblClickThreshold||450,a=new g,l=new p(n,s),u=e.smartClicks,c=function(t,e,n,s){null!=n&&D(t,function(){var t=i(this);u&&"click"===e?function(t,e,n,i){null==t.__taSmartClicks&&(h(t,"mousedown",function(e){t.__tad=C(e)},i),h(t,"mouseup",function(e){t.__tau=C(e)},i),h(t,"click",function(e){if(t.__tad&&t.__tau&&t.__tad[0]===t.__tau[0]&&t.__tad[1]===t.__tau[1])for(var n=0;n<t.__taSmartClicks.length;n++)t.__taSmartClicks[n].apply(o(e),[e])},i),t.__taSmartClicks=[]);t.__taSmartClicks.push(n),n.__taUnstore=function(){r(t.__taSmartClicks,n)}}(t,0,n,s):"tap"===e||"dbltap"===e||"contextmenu"===e?l(t,e,n,s):"mouseenter"===e||"mouseexit"==e?a(t,e,n,s):h(t,e,n,s)})};this.remove=function(t){return D(t,function(){var t=i(this);if(t.__ta)for(var e in t.__ta)if(t.__ta.hasOwnProperty(e))for(var n in t.__ta[e])t.__ta[e].hasOwnProperty(n)&&w(t,e,t.__ta[e][n]);t.parentNode&&t.parentNode.removeChild(t)}),this},this.on=function(t,e,n,i){var o=arguments[0],s=4==arguments.length?arguments[2]:null,r=arguments[1],a=arguments[arguments.length-1];return c(o,r,a,s),this},this.off=function(t,e,n){return w(t,e,n),this},this.trigger=function(e,n,o,s){var r=v&&("undefined"==typeof MouseEvent||null==o||o.constructor===MouseEvent),a=m&&!v&&y[n]?y[n]:n,l=!(m&&!v&&y[n]),u=C(o),c=x(o,"screen"),h=function(t){return x(t,"client")}(o);return D(e,function(){var e,d=i(this);o=o||{screenX:c[0],screenY:c[1],clientX:h[0],clientY:h[1]};var p=function(t){s&&(t.payload=s)},f={TouchEvent:function(e){var n=t(window,d,0,u[0],u[1],c[0],c[1],h[0],h[1]);(e.initTouchEvent||e.initEvent)(a,!0,!0,window,null,c[0],c[1],h[0],h[1],!1,!1,!1,!1,n,n,n,1,0)},MouseEvents:function(t){t.initMouseEvent(a,!0,!0,window,0,c[0],c[1],h[0],h[1],!1,!1,!1,!1,1,d)}};if(document.createEvent){var g=!l&&!r&&m&&y[n]?"TouchEvent":"MouseEvents";e=document.createEvent(g),f[g](e),p(e),d.dispatchEvent(e)}else document.createEventObject&&((e=document.createEventObject()).eventType=e.eventName=a,e.screenX=c[0],e.screenY=c[1],e.clientX=h[0],e.clientY=h[1],p(e),d.fireEvent("on"+a,e))}),this}},this.Mottle.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.Mottle.pageLocation=C,this.Mottle.setForceTouchEvents=function(t){m=t},this.Mottle.setForceMouseEvents=function(t){v=t},this.Mottle.version="0.8.0",e.Mottle=this.Mottle}.call("undefined"==typeof window?s:window),function(){var t=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},n=function(t,e){var n=t.indexOf(e);-1!==n&&t.splice(n,1)},i=function(t){return null!=t&&("string"==typeof t||t.constructor===String)},o=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},s=function(t,e,n){if(o(e,n,t))return e;for(var i=e.parentNode;null!=i&&i!==t;){if(o(i,n,t))return i;i=i.parentNode}},r=function(){var t=-1;if("Microsoft Internet Explorer"===navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),a=r>-1&&r<9,l=9===r,u=function(t){if(a)return[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop];var e=h(t),n=c(e,0);return l?[n.pageX||n.clientX,n.pageY||n.clientY]:[n.pageX,n.pageY]},c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d={delegatedDraggable:"katavorio-delegated-draggable",draggable:"katavorio-draggable",droppable:"katavorio-droppable",drag:"katavorio-drag",selected:"katavorio-drag-selected",active:"katavorio-drag-active",hover:"katavorio-drag-hover",noSelect:"katavorio-drag-no-select",ghostProxy:"katavorio-ghost-proxy",clonedDrag:"katavorio-clone-drag"},p=["stop","start","drag","drop","over","out","beforeStart"],f=function(){},g=function(){return!0},m=function(t,e,n){for(var i=0;i<t.length;i++)t[i]!=n&&e(t[i])},v=function(t,e,n,i){m(t,function(t){t.setActive(e),e&&t.updatePosition(),n&&t.setHover(i,e)})},y=function(t,e){if(null!=t){t=i(t)||null!=t.tagName||null==t.length?[t]:t;for(var n=0;n<t.length;n++)e.apply(t[n],[t[n]])}},b=function(t){t.stopPropagation?(t.stopPropagation(),t.preventDefault()):t.returnValue=!1},P=function(t,e,n,i){this.params=e||{},this.el=t,this.params.addClass(this.el,this._class),this.uuid=E();var o=!0;return this.setEnabled=function(t){o=t},this.isEnabled=function(){return o},this.toggleEnabled=function(){o=!o},this.setScope=function(t){this.scopes=t?t.split(/\s+/):[i]},this.addScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.removeScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){delete e[t]}),this.scopes=[],e)this.scopes.push(n)},this.toggleScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]?delete e[t]:e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.setScope(e.scope),this.k=e.katavorio,e.katavorio},x=function(){return!0},C=function(){return!1},_=function(t,e,n,r){this._class=n.draggable;var a=P.apply(this,arguments);this.rightButtonCanDrag=this.params.rightButtonCanDrag;var l,c,h,p,f,m,y=[0,0],_=null,j=null,w=[0,0],D=!1,A=[0,0],I=!1!==this.params.consumeStartEvent,k=this.el,O=this.params.clone,M=(this.params.scroll,!1!==e.multipleDrop),T=!1,F=null,L=[],N=null,R=e.ghostProxyParent;if(l=!0===e.ghostProxy?x:e.ghostProxy&&"function"==typeof e.ghostProxy?e.ghostProxy:function(t,e){return!(!N||!N.useGhostProxy)&&N.useGhostProxy(t,e)},c=e.makeGhostProxy?e.makeGhostProxy:function(t){return N&&N.makeGhostProxy?N.makeGhostProxy(t):t.cloneNode(!0)},e.selector){var G=t.getAttribute("katavorio-draggable");null==G&&(G=""+(new Date).getTime(),t.setAttribute("katavorio-draggable",G)),L.push(e)}var B,H=e.snapThreshold,U=function(t,e,n,i,o){var s=e*Math.floor(t[0]/e),r=s+e,a=Math.abs(t[0]-s)<=i?s:Math.abs(r-t[0])<=i?r:t[0],l=n*Math.floor(t[1]/n),u=l+n;return[a,Math.abs(t[1]-l)<=o?l:Math.abs(u-t[1])<=o?u:t[1]]};this.posses=[],this.posseRoles={},this.toGrid=function(t){if(null==this.params.grid)return t;var e=this.params.grid?this.params.grid[0]/2:H||5,n=this.params.grid?this.params.grid[1]/2:H||5;return U(t,this.params.grid[0],this.params.grid[1],e,n)},this.snap=function(t,e){if(null!=k){t=t||(this.params.grid?this.params.grid[0]:10),e=e||(this.params.grid?this.params.grid[1]:10);var n=this.params.getPosition(k),i=this.params.grid?this.params.grid[0]/2:H,o=this.params.grid?this.params.grid[1]/2:H,s=U(n,t,e,i,o);return this.params.setPosition(k,s),s}},this.setUseGhostProxy=function(t){l=t?x:C};var X=function(t){return!1===e.allowNegative?[Math.max(0,t[0]),Math.max(0,t[1])]:t},Y=function(t){B="function"==typeof t?t:t?function(t,e,n,i){return X([Math.max(0,Math.min(n.w-i[0],t[0])),Math.max(0,Math.min(n.h-i[1],t[1]))])}.bind(this):function(t){return X(t)}}.bind(this);Y("function"==typeof this.params.constrain?this.params.constrain:this.params.constrain||this.params.containment),this.setConstrain=function(t){Y(t)};var $;this.setRevert=function(t){$=t},this.params.revert&&($=this.params.revert);var z={},W=this.setFilter=function(e,n){if(e){var s="function"==typeof(r=e)?(r._katavorioId=E(),r._katavorioId):r;z[s]=[function(n){var s,r=n.srcElement||n.target;return i(e)?s=o(r,e,t):"function"==typeof e&&(s=e(n,t)),s},!1!==n]}var r};this.addFilter=W,this.removeFilter=function(t){var e="function"==typeof t?t._katavorioId:t;delete z[e]};this.clearAllFilters=function(){z={}},this.canDrag=this.params.canDrag||g;var q,V=[],J=[];this.addSelector=function(t){t.selector&&L.push(t)},this.downListener=function(t){var e,i,r,l,c,h,p,f,g;if(!t.defaultPrevented&&((this.rightButtonCanDrag||3!==t.which&&2!==t.button)&&this.isEnabled()&&this.canDrag()))if(function(t){for(var e in z){var n=z[e],i=n[0](t);if(n[1]&&(i=!i),!i)return!1}return!0}(t)&&function(t,e,n){var i=t.srcElement||t.target;return!o(i,n.getInputFilterSelector(),e)}(t,this.el,this.k)){if(N=null,F=null,L.length>0){var m=function(t,e,n){for(var i=null,r=e.getAttribute("katavorio-draggable"),a=null!=r?"[katavorio-draggable='"+r+"'] ":"",l=0;l<t.length;l++)if(null!=(i=s(e,n,a+t[l].selector))){if(t[l].filter){var u=o(n,t[l].filter,i);if(!0===t[l].filterExclude&&!u||u)return null}return[t[l],i]}return null}(L,this.el,t.target||t.srcElement);if(null!=m&&(N=m[0],F=m[1]),null==F)return}else F=this.el;if(O)if(k=F.cloneNode(!0),this.params.addClass(k,d.clonedDrag),k.setAttribute("id",null),k.style.position="absolute",null!=this.params.parent){var v=this.params.getPosition(this.el);k.style.left=v[0]+"px",k.style.top=v[1]+"px",this.params.parent.appendChild(k)}else{var P=(e=F.getBoundingClientRect(),i=document.body,r=document.documentElement,l=window.pageYOffset||r.scrollTop||i.scrollTop,c=window.pageXOffset||r.scrollLeft||i.scrollLeft,h=r.clientTop||i.clientTop||0,p=r.clientLeft||i.clientLeft||0,f=e.top+l-h,g=e.left+c-p,{top:Math.round(f),left:Math.round(g)});k.style.left=P.left+"px",k.style.top=P.top+"px",document.body.appendChild(k)}else k=F;I&&b(t),y=u(t),k&&k.parentNode&&(A=[k.parentNode.scrollLeft,k.parentNode.scrollTop]),this.params.bind(document,"mousemove",this.moveListener),this.params.bind(document,"mouseup",this.upListener),a.markSelection(this),a.markPosses(this),this.params.addClass(document.body,n.noSelect),Q("beforeStart",{el:this.el,pos:_,e:t,drag:this})}else this.params.consumeFilteredEvents&&b(t)}.bind(this),this.moveListener=function(t){if(y){if(!D)if(!1!==Q("start",{el:this.el,pos:_,e:t,drag:this})){if(!y)return;this.mark(!0),D=!0}else this.abort();if(y){J.length=0;var e=u(t),n=e[0]-y[0],i=e[1]-y[1],o=this.params.ignoreZoom?1:a.getZoom();k&&k.parentNode&&(n+=k.parentNode.scrollLeft-A[0],i+=k.parentNode.scrollTop-A[1]),n/=o,i/=o,this.moveBy(n,i,t),a.updateSelection(n,i,this),a.updatePosses(n,i,this)}}}.bind(this),this.upListener=function(t){y&&(y=null,this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.params.removeClass(document.body,n.noSelect),this.unmark(t),a.unmarkSelection(this,t),a.unmarkPosses(this,t),this.stop(t),a.notifyPosseDragStop(this,t),D=!1,J.length=0,O?(k&&k.parentNode&&k.parentNode.removeChild(k),k=null):$&&!0===$(k,this.params.getPosition(k))&&(this.params.setPosition(k,_),Q("revert",k)))}.bind(this),this.getFilters=function(){return z},this.abort=function(){null!=y&&this.upListener()},this.getDragElement=function(t){return t?F||this.el:k||this.el};var Z={start:[],drag:[],stop:[],over:[],out:[],beforeStart:[],revert:[]};e.events.start&&Z.start.push(e.events.start),e.events.beforeStart&&Z.beforeStart.push(e.events.beforeStart),e.events.stop&&Z.stop.push(e.events.stop),e.events.drag&&Z.drag.push(e.events.drag),e.events.revert&&Z.revert.push(e.events.revert),this.on=function(t,e){Z[t]&&Z[t].push(e)},this.off=function(t,e){if(Z[t]){for(var n=[],i=0;i<Z[t].length;i++)Z[t][i]!==e&&n.push(Z[t][i]);Z[t]=n}};var K,Q=function(t,e){var n=null;if(N&&N[t])n=N[t](e);else if(Z[t])for(var i=0;i<Z[t].length;i++)try{var o=Z[t][i](e);null!=o&&(n=o)}catch(t){}return n};this.notifyStart=function(t){Q("start",{el:this.el,pos:this.params.getPosition(k),e:t,drag:this})},this.stop=function(t,e){if(e||D){var n=[],i=a.getSelection(),o=this.params.getPosition(k);if(i.length>0)for(var s=0;s<i.length;s++){var r=this.params.getPosition(i[s].el);n.push([i[s].el,{left:r[0],top:r[1]},i[s]])}else n.push([k,{left:o[0],top:o[1]},this]);Q("stop",{el:k,pos:K||o,finalPos:o,e:t,drag:this,selection:n})}},this.mark=function(t){var e;_=this.params.getPosition(k),j=this.params.getPosition(k,!0),w=[j[0]-_[0],j[1]-_[1]],this.size=this.params.getSize(k),V=a.getMatchingDroppables(this),v(V,!0,!1,this),this.params.addClass(k,this.params.dragClass||n.drag),e=this.params.getConstrainingRectangle?this.params.getConstrainingRectangle(k):this.params.getSize(k.parentNode),q={w:e[0],h:e[1]},f=0,m=0,t&&a.notifySelectionDragStart(this)},this.unmark=function(t,i){if(v(V,!1,!0,this),T&&l(F,k)?(K=[k.offsetLeft-f,k.offsetTop-m],k.parentNode.removeChild(k),k=F):K=null,this.params.removeClass(k,this.params.dragClass||n.drag),V.length=0,T=!1,!i){J.length>0&&K&&e.setPosition(F,K),J.sort(S);for(var o=0;o<J.length;o++){if(!0===J[o].drop(this,t))break}}},this.moveBy=function(t,n,i){J.length=0;var o=this.toGrid([_[0]+t,_[1]+n]),s=function(t,e,n,i){return null!=N&&N.constrain&&"function"==typeof N.constrain?N.constrain(t,e,n,i):B(t,e,n,i)}(o,k,q,this.size);if(l(this.el,k))if(o[0]!==s[0]||o[1]!==s[1]){if(!T){var r=c(F);e.addClass(r,d.ghostProxy),R?(R.appendChild(r),h=e.getPosition(F.parentNode,!0),p=e.getPosition(e.ghostProxyParent,!0),f=h[0]-p[0],m=h[1]-p[1]):F.parentNode.appendChild(r),k=r,T=!0}s=o}else T&&(k.parentNode.removeChild(k),k=F,T=!1,h=null,p=null,f=0,m=0);var a={x:s[0],y:s[1],w:this.size[0],h:this.size[1]},u={x:a.x+w[0],y:a.y+w[1],w:a.w,h:a.h},g=null;this.params.setPosition(k,[s[0]+f,s[1]+m]);for(var v=0;v<V.length;v++){var y={x:V[v].pagePosition[0],y:V[v].pagePosition[1],w:V[v].size[0],h:V[v].size[1]};this.params.intersects(u,y)&&(M||null==g||g===V[v].el)&&V[v].canDrop(this)?(g||(g=V[v].el),J.push(V[v]),V[v].setHover(this,!0,i)):V[v].isHover()&&V[v].setHover(this,!1,i)}Q("drag",{el:this.el,pos:s,e:i,drag:this})},this.destroy=function(){this.params.unbind(this.el,"mousedown",this.downListener),this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.downListener=null,this.upListener=null,this.moveListener=null},this.params.bind(this.el,"mousedown",this.downListener),this.params.handle?W(this.params.handle,!1):W(this.params.filter,this.params.filterExclude)},j=function(t,e,n,i){this._class=n.droppable,this.params=e||{},this.rank=e.rank||0,this._activeClass=this.params.activeClass||n.active,this._hoverClass=this.params.hoverClass||n.hover,P.apply(this,arguments);var o=!1;this.allowLoopback=!1!==this.params.allowLoopback,this.setActive=function(t){this.params[t?"addClass":"removeClass"](this.el,this._activeClass)},this.updatePosition=function(){this.position=this.params.getPosition(this.el),this.pagePosition=this.params.getPosition(this.el,!0),this.size=this.params.getSize(this.el)},this.canDrop=this.params.canDrop||function(t){return!0},this.isHover=function(){return o},this.setHover=function(t,e,n){(e||null==this.el._katavorioDragHover||this.el._katavorioDragHover===t.el._katavorio)&&(this.params[e?"addClass":"removeClass"](this.el,this._hoverClass),this.el._katavorioDragHover=e?t.el._katavorio:null,o!==e&&this.params.events[e?"over":"out"]({el:this.el,e:n,drag:t,drop:this}),o=e)},this.drop=function(t,e){return this.params.events.drop({drag:t,e:e,drop:this})},this.destroy=function(){this._class=null,this._activeClass=null,this._hoverClass=null,o=null}},E=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"===t?e:3&e|8).toString(16)})},S=function(t,e){return t.rank<e.rank?1:t.rank>e.rank?-1:0},w=function(t){return null==t?null:null==(t="string"==typeof t||t.constructor===String?document.getElementById(t):t)?null:(t._katavorio=t._katavorio||E(),t)};this.Katavorio=function(e){var o=[],s={};this._dragsByScope={},this._dropsByScope={};var r=1,a=function(t,e){y(t,function(t){for(var n=0;n<t.scopes.length;n++)e[t.scopes[n]]=e[t.scopes[n]]||[],e[t.scopes[n]].push(t)})},l=function(t,n){var i=0;return y(t,function(t){for(var o=0;o<t.scopes.length;o++)if(n[t.scopes[o]]){var s=e.indexOf(n[t.scopes[o]],t);-1!==s&&(n[t.scopes[o]].splice(s,1),i++)}}),i>0},u=(this.getMatchingDroppables=function(t){for(var e=[],n={},i=0;i<t.scopes.length;i++){var o=this._dropsByScope[t.scopes[i]];if(o)for(var s=0;s<o.length;s++)!o[s].canDrop(t)||n[o[s].uuid]||!o[s].allowLoopback&&o[s].el===t.el||(n[o[s].uuid]=!0,e.push(o[s]))}return e.sort(S),e},function(t){t=t||{};var n,i={events:{}};for(n in e)i[n]=e[n];for(n in t)i[n]=t[n];for(n=0;n<p.length;n++)i.events[p[n]]=t[p[n]]||f;return i.katavorio=this,i}.bind(this)),c=function(t,e){for(var n=0;n<p.length;n++)e[p[n]]&&t.on(p[n],e[p[n]])}.bind(this),h={},g=e.css||{},v=e.scope||"katavorio-drag-scope";for(var b in d)h[b]=d[b];for(var b in g)h[b]=g[b];var P=e.inputFilterSelector||"input,textarea,select,button,option";this.getInputFilterSelector=function(){return P},this.setInputFilterSelector=function(t){return P=t,this},this.draggable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t)))if(null==t._katavorioDrag){var o=u(n);t._katavorioDrag=new _(t,o,h,v),a(t._katavorioDrag,this._dragsByScope),i.push(t._katavorioDrag),e.addClass(t,o.selector?h.delegatedDraggable:h.draggable)}else c(t._katavorioDrag,n)}.bind(this)),i},this.droppable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t))){var o=new j(t,u(n),h,v);t._katavorioDrop=t._katavorioDrop||[],t._katavorioDrop.push(o),a(o,this._dropsByScope),i.push(o),e.addClass(t,h.droppable)}}.bind(this)),i},this.select=function(t){return y(t,function(){var t=w(this);t&&t._katavorioDrag&&(s[t._katavorio]||(o.push(t._katavorioDrag),s[t._katavorio]=[t,o.length-1],e.addClass(t,h.selected)))}),this},this.deselect=function(t){return y(t,function(){var t=w(this);if(t&&t._katavorio&&s[t._katavorio]){for(var n=[],i=0;i<o.length;i++)o[i].el!==t&&n.push(o[i]);o=n,delete s[t._katavorio],e.removeClass(t,h.selected)}}),this},this.deselectAll=function(){for(var t in s){var n=s[t];e.removeClass(n[0],h.selected)}o.length=0,s={}},this.markSelection=function(t){m(o,function(t){t.mark()},t)},this.markPosses=function(t){t.posses&&y(t.posses,function(e){t.posseRoles[e]&&A[e]&&m(A[e].members,function(t){t.mark()},t)})},this.unmarkSelection=function(t,e){m(o,function(t){t.unmark(e)},t)},this.unmarkPosses=function(t,e){t.posses&&y(t.posses,function(n){t.posseRoles[n]&&A[n]&&m(A[n].members,function(t){t.unmark(e,!0)},t)})},this.getSelection=function(){return o.slice(0)},this.updateSelection=function(t,e,n){m(o,function(n){n.moveBy(t,e)},n)};var x=function(t,e){e.posses&&y(e.posses,function(n){e.posseRoles[n]&&A[n]&&m(A[n].members,function(e){t(e)},e)})};this.updatePosses=function(t,e,n){x(function(n){n.moveBy(t,e)},n)},this.notifyPosseDragStop=function(t,e){x(function(t){t.stop(e,!0)},t)},this.notifySelectionDragStop=function(t,e){m(o,function(t){t.stop(e,!0)},t)},this.notifySelectionDragStart=function(t,e){m(o,function(t){t.notifyStart(e)},t)},this.setZoom=function(t){r=t},this.getZoom=function(){return r};var C=function(t,e,n,i){y(t,function(t){l(t,n),t[i](e),a(t,n)})};y(["set","add","remove","toggle"],function(t){this[t+"Scope"]=function(e,n){C(e._katavorioDrag,n,this._dragsByScope,t+"Scope"),C(e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this),this[t+"DragScope"]=function(e,n){C(e.constructor===_?e:e._katavorioDrag,n,this._dragsByScope,t+"Scope")}.bind(this),this[t+"DropScope"]=function(e,n){C(e.constructor===j?e:e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this)}.bind(this)),this.snapToGrid=function(t,e){for(var n in this._dragsByScope)m(this._dragsByScope[n],function(n){n.snap(t,e)})},this.getDragsForScope=function(t){return this._dragsByScope[t]},this.getDropsForScope=function(t){return this._dropsByScope[t]};var E=function(t,e,n){if((t=w(t))[e]){var i=o.indexOf(t[e]);i>=0&&o.splice(i,1),l(t[e],n)&&y(t[e],function(t){t.destroy()}),delete t[e]}},D=function(t,e,n,i){(t=w(t))[e]&&t[e].off(n,i)};this.elementRemoved=function(t){t._katavorioDrag&&this.destroyDraggable(t),t._katavorioDrop&&this.destroyDroppable(t)},this.destroyDraggable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrag",this._dragsByScope):D(t,"_katavorioDrag",e,n)},this.destroyDroppable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrop",this._dropsByScope):D(t,"_katavorioDrop",e,n)},this.reset=function(){this._dragsByScope={},this._dropsByScope={},o=[],s={},A={}};var A={},I=function(e,n,o){var s,r=i(n)?n:n.id,a=!!i(n)||!1!==n.active,l=A[r]||(s={name:r,members:[]},A[r]=s,s);return y(e,function(e){if(e._katavorioDrag){if(o&&null!=e._katavorioDrag.posseRoles[l.name])return;t(l.members,e._katavorioDrag),t(e._katavorioDrag.posses,l.name),e._katavorioDrag.posseRoles[l.name]=a}}),l};this.addToPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i]));return 1===n.length?n[0]:n},this.setPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i],!0).name);return y(t,function(t){if(t._katavorioDrag){var e=function(t,e){for(var n=[],i=0;i<t.length;i++)-1===e.indexOf(t[i])&&n.push(t[i]);return n}(t._katavorioDrag.posses,n);Array.prototype.push.apply([],t._katavorioDrag.posses);for(var i=0;i<e.length;i++)this.removeFromPosse(t,e[i])}}.bind(this)),1===n.length?n[0]:n},this.removeFromPosse=function(t,e){if(arguments.length<2)throw new TypeError("No posse id provided for remove operation");for(var i=1;i<arguments.length;i++)e=arguments[i],y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var i=t._katavorioDrag;y(e,function(t){n(A[t].members,i),n(i.posses,t),delete i.posseRoles[t]})}})},this.removeFromAllPosses=function(t){y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var e=t._katavorioDrag;y(e.posses,function(t){n(A[t].members,e)}),e.posses.length=0,e.posseRoles={}}})},this.setPosseState=function(t,e,n){var i=A[e];i&&y(t,function(t){t._katavorioDrag&&t._katavorioDrag.posses&&(t._katavorioDrag.posseRoles[i.name]=n)})}},this.Katavorio.version="1.0.0",e.Katavorio=this.Katavorio}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil=this.jsPlumbUtil||{};var t=this.jsPlumbUtil;function n(t){return"[object Array]"===Object.prototype.toString.call(t)}function i(t){return"string"==typeof t}function o(t){return"boolean"==typeof t}function s(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function r(t){return"[object Date]"===Object.prototype.toString.call(t)}function a(t){return"[object Function]"===Object.prototype.toString.call(t)}function l(t){if(i(t))return""+t;if(o(t))return!!t;if(r(t))return new Date(t.getTime());if(a(t))return t;if(n(t)){for(var e=[],u=0;u<t.length;u++)e.push(l(t[u]));return e}if(s(t)){var c={};for(var h in t)c[h]=l(t[h]);return c}return t}function u(t,e,r,a){var u,c,h={},d={};for(r=r||[],a=a||[],c=0;c<r.length;c++)h[r[c]]=!0;for(c=0;c<a.length;c++)d[a[c]]=!0;var p=l(t);for(c in e)if(null==p[c]||d[c])p[c]=e[c];else if(i(e[c])||o(e[c]))h[c]?((u=[]).push.apply(u,n(p[c])?p[c]:[p[c]]),u.push.apply(u,o(e[c])?e[c]:[e[c]]),p[c]=u):p[c]=e[c];else if(n(e[c]))u=[],n(p[c])&&u.push.apply(u,p[c]),u.push.apply(u,e[c]),p[c]=u;else if(s(e[c]))for(var f in s(p[c])||(p[c]={}),e[c])p[c][f]=e[c][f];return p}function c(t,e){if(t)for(var n=0;n<t.length;n++)if(e(t[n]))return n;return-1}function h(t,e){var n=t.indexOf(e);return n>-1&&t.splice(n,1),-1!==n}function d(t,e,n,i){var o=t[e];return null==o&&(o=[],t[e]=o),o[i?"unshift":"push"](n),o}e.jsPlumbUtil=t,t.isArray=n,t.isNumber=function(t){return"[object Number]"===Object.prototype.toString.call(t)},t.isString=i,t.isBoolean=o,t.isNull=function(t){return null==t},t.isObject=s,t.isDate=r,t.isFunction=a,t.isNamedFunction=function(t){return a(t)&&null!=t.name&&t.name.length>0},t.isEmpty=function(t){for(var e in t)if(t.hasOwnProperty(e))return!1;return!0},t.clone=l,t.merge=u,t.replace=function(t,e,n){if(null!=t){var i=t;return e.replace(/([^\.])+/g,function(t,e,o,s){var r=t.match(/([^\[0-9]+){1}(\[)([0-9+])/),a=function(){return i[r[1]]||(i[r[1]]=[],i[r[1]])};if(o+t.length>=s.length)r?a()[r[3]]=n:i[t]=n;else if(r){var l=a();i=l[r[3]]||(l[r[3]]={},l[r[3]])}else i=i[t]||(i[t]={},i[t]);return""}),t}},t.functionChain=function(t,e,n){for(var i=0;i<n.length;i++){var o=n[i][0][n[i][1]].apply(n[i][0],n[i][2]);if(o===e)return o}return t},t.populate=function(t,e,o,r){var l=function(t){if(null!=t){if(i(t))return function(t){var n=t.match(/(\${.*?})/g);if(null!=n)for(var i=0;i<n.length;i++){var o=e[n[i].substring(2,n[i].length-1)]||"";null!=o&&(t=t.replace(n[i],o))}return t}(t);if(!a(t)||r||null!=o&&0!==(t.name||"").indexOf(o)){if(n(t)){for(var u=[],c=0;c<t.length;c++)u.push(l(t[c]));return u}if(s(t)){var h={};for(var d in t)h[d]=l(t[d]);return h}return t}return t(e)}};return l(t)},t.findWithFunction=c,t.removeWithFunction=function(t,e){var n=c(t,e);return n>-1&&t.splice(n,1),-1!==n},t.remove=h,t.addWithFunction=function(t,e,n){-1===c(t,n)&&t.push(e)},t.addToList=d,t.suggest=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},t.extend=function(t,e,i){var o;e=n(e)?e:[e];var s=function(e){for(var n=e.__proto__;null!=n;)if(null!=n.prototype){for(var i in n.prototype)n.prototype.hasOwnProperty(i)&&!t.prototype.hasOwnProperty(i)&&(t.prototype[i]=n.prototype[i]);n=n.prototype.__proto__}else n=null};for(o=0;o<e.length;o++){for(var r in e[o].prototype)e[o].prototype.hasOwnProperty(r)&&!t.prototype.hasOwnProperty(r)&&(t.prototype[r]=e[o].prototype[r]);s(e[o])}var a=function(t,n){return function(){for(o=0;o<e.length;o++)e[o].prototype[t]&&e[o].prototype[t].apply(this,arguments);return n.apply(this,arguments)}},l=function(e){for(var n in e)t.prototype[n]=a(n,e[n])};if(arguments.length>2)for(o=2;o<arguments.length;o++)l(arguments[o]);return t};for(var p=[],f=0;f<256;f++)p[f]=(f<16?"0":"")+f.toString(16);function g(){var t=4294967295*Math.random()|0,e=4294967295*Math.random()|0,n=4294967295*Math.random()|0,i=4294967295*Math.random()|0;return p[255&t]+p[t>>8&255]+p[t>>16&255]+p[t>>24&255]+"-"+p[255&e]+p[e>>8&255]+"-"+p[e>>16&15|64]+p[e>>24&255]+"-"+p[63&n|128]+p[n>>8&255]+"-"+p[n>>16&255]+p[n>>24&255]+p[255&i]+p[i>>8&255]+p[i>>16&255]+p[i>>24&255]}function m(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];if(t.logEnabled&&"undefined"!=typeof console)try{var i=arguments[arguments.length-1];console.log(i)}catch(t){}}t.uuid=g,t.fastTrim=function(t){if(null==t)return null;for(var e=t.replace(/^\s\s*/,""),n=/\s/,i=e.length;n.test(e.charAt(--i)););return e.slice(0,i+1)},t.each=function(t,e){t=null==t.length||"string"==typeof t?[t]:t;for(var n=0;n<t.length;n++)e(t[n])},t.map=function(t,e){for(var n=[],i=0;i<t.length;i++)n.push(e(t[i]));return n},t.mergeWithParents=function(t,e,n){n=n||"parent";var i=function(t){return t?e[t]:null},o=function(t){return t?i(t[n]):null},s=function(t,e){if(null==t)return e;var n=["anchor","anchors","cssClass","connector","paintStyle","hoverPaintStyle","endpoint","endpoints"];"override"===e.mergeStrategy&&Array.prototype.push.apply(n,["events","overlays"]);var i=u(t,e,[],n);return s(o(t),i)},r=function(t){if(null==t)return{};if("string"==typeof t)return i(t);if(t.length){for(var e=!1,n=0,o=void 0;!e&&n<t.length;)(o=r(t[n]))?e=!0:n++;return o}},a=r(t);return a?s(o(a),a):{}},t.logEnabled=!0,t.log=m,t.wrap=function(t,e,n){return function(){var i=null;try{null!=e&&(i=e.apply(this,arguments))}catch(t){m("jsPlumb function failed : "+t)}if(null!=t&&(null==n||i!==n))try{i=t.apply(this,arguments)}catch(t){m("wrapped function failed : "+t)}return i}};var v=function(){return function(){var t=this;this._listeners={},this.eventsSuspended=!1,this.tick=!1,this.eventsToDieOn={ready:!0},this.queue=[],this.bind=function(e,n,i){var o=function(e){d(t._listeners,e,n,i),n.__jsPlumb=n.__jsPlumb||{},n.__jsPlumb[g()]=e};if("string"==typeof e)o(e);else if(null!=e.length)for(var s=0;s<e.length;s++)o(e[s]);return t},this.fire=function(t,e,n){if(this.tick)this.queue.unshift(arguments);else{if(this.tick=!0,!this.eventsSuspended&&this._listeners[t]){var i=this._listeners[t].length,o=0,s=!1,r=null;if(!this.shouldFireEvent||this.shouldFireEvent(t,e,n))for(;!s&&o<i&&!1!==r;){if(this.eventsToDieOn[t])this._listeners[t][o].apply(this,[e,n]);else try{r=this._listeners[t][o].apply(this,[e,n])}catch(e){m("jsPlumb: fire failed for event "+t+" : "+e)}o++,null!=this._listeners&&null!=this._listeners[t]||(s=!0)}}this.tick=!1,this._drain()}return this},this._drain=function(){var e=t.queue.pop();e&&t.fire.apply(t,e)},this.unbind=function(t,e){if(0===arguments.length)this._listeners={};else if(1===arguments.length){if("string"==typeof t)delete this._listeners[t];else if(t.__jsPlumb){var n=void 0;for(var i in t.__jsPlumb)n=t.__jsPlumb[i],h(this._listeners[n]||[],t)}}else 2===arguments.length&&h(this._listeners[t]||[],e);return this},this.getListener=function(e){return t._listeners[e]},this.setSuspendEvents=function(e){t.eventsSuspended=e},this.isSuspendEvents=function(){return t.eventsSuspended},this.silently=function(e){t.setSuspendEvents(!0);try{e()}catch(t){m("Cannot execute silent function "+t)}t.setSuspendEvents(!1)},this.cleanupListeners=function(){for(var e in t._listeners)t._listeners[e]=null}}}();function y(t,e,n){var i=[t[0]-e[0],t[1]-e[1]],o=Math.cos(n/360*Math.PI*2),s=Math.sin(n/360*Math.PI*2);return[i[0]*o-i[1]*s+e[0],i[1]*o+i[0]*s+e[1],o,s]}t.EventGenerator=v,t.rotatePoint=y,t.rotateAnchorOrientation=function(t,e){var n=y(t,[0,0],e);return[Math.round(n[0]),Math.round(n[1])]}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil.matchesSelector=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},this.jsPlumbUtil.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.jsPlumbUtil.sizeElement=function(t,e,n,i,o){t&&(t.style.height=o+"px",t.height=o,t.style.width=i+"px",t.width=i,t.style.left=e+"px",t.style.top=n+"px")}}.call("undefined"!=typeof window?window:s),function(){var t={deriveAnchor:function(t,e,n,i){return{top:["TopRight","TopLeft"],bottom:["BottomRight","BottomLeft"]}[t][e]}},e=function(t,e){this.count=0,this.instance=t,this.lists={},this.options=e||{},this.instance.addList=function(t,e){return this.listManager.addList(t,e)},this.instance.removeList=function(t){this.listManager.removeList(t)},this.instance.bind("manageElement",function(t){for(var e=this.instance.getSelector(t.el,"[jtk-scrollable-list]"),n=0;n<e.length;n++)this.addList(e[n])}.bind(this)),this.instance.bind("unmanageElement",function(t){this.removeList(t.el)}),this.instance.bind("connection",function(t,e){null==e&&(this._maybeUpdateParentList(t.source),this._maybeUpdateParentList(t.target))}.bind(this))};this.jsPlumbListManager=e,e.prototype={addList:function(e,i){var o=this.instance.extend({},t);this.instance.extend(o,this.options),i=this.instance.extend(o,i||{});var s=[this.instance.getInstanceIndex(),this.count++].join("_");this.lists[s]=new n(this.instance,e,i,s)},removeList:function(t){var e=this.lists[t._jsPlumbList];e&&(e.destroy(),delete this.lists[t._jsPlumbList])},_maybeUpdateParentList:function(t){for(var e=t.parentNode,n=this.instance.getContainer();null!=e&&e!==n;){if(null!=e._jsPlumbList&&null!=this.lists[e._jsPlumbList])return void e._jsPlumbScrollHandler();e=e.parentNode}}};var n=function(t,e,n,i){function o(t,e,i,o){return n.anchor?n.anchor:n.deriveAnchor(t,e,i,o)}function s(t,e,i,o){return n.deriveEndpoint?n.deriveEndpoint(t,e,i,o):n.endpoint?n.endpoint:i.type}e._jsPlumbList=i;var r=function(n){for(var i=t.getSelector(e,".jtk-managed"),r=t.getId(e),a=0;a<i.length;a++){if(i[a].offsetTop<e.scrollTop)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("top",0,n.endpoints[0],n)},function(){return o("top",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("top",1,n.endpoints[1],n)},function(){return o("top",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a].offsetTop+i[a].offsetHeight>e.scrollTop+e.offsetHeight)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("bottom",0,n.endpoints[0],n)},function(){return o("bottom",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("bottom",1,n.endpoints[1],n)},function(){return o("bottom",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a]._jsPlumbProxies){for(var l=0;l<i[a]._jsPlumbProxies.length;l++)t.unproxyConnection(i[a]._jsPlumbProxies[l][0],i[a]._jsPlumbProxies[l][1],r);delete i[a]._jsPlumbProxies}t.revalidate(i[a])}!function(e){for(var n=e.parentNode,i=t.getContainer();null!=n&&n!==i;){if(t.hasClass(n,"jtk-managed"))return void t.recalculateOffsets(n);n=n.parentNode}}(e)};t.setAttribute(e,"jtk-scrollable-list","true"),e._jsPlumbScrollHandler=r,t.on(e,"scroll",r),r(),this.destroy=function(){t.off(e,"scroll",r),delete e._jsPlumbScrollHandler;for(var n=t.getSelector(e,".jtk-managed"),i=t.getId(e),o=0;o<n.length;o++)if(n[o]._jsPlumbProxies){for(var s=0;s<n[o]._jsPlumbProxies.length;s++)t.unproxyConnection(n[o]._jsPlumbProxies[s][0],n[o]._jsPlumbProxies[s][1],i);delete n[o]._jsPlumbProxies}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,n=t.jsPlumbUtil,i=function(t){if(t._jsPlumb.paintStyle&&t._jsPlumb.hoverPaintStyle){var e={};d.extend(e,t._jsPlumb.paintStyle),d.extend(e,t._jsPlumb.hoverPaintStyle),delete t._jsPlumb.hoverPaintStyle,e.gradient&&t._jsPlumb.paintStyle.fill&&delete e.gradient,t._jsPlumb.hoverPaintStyle=e}},o=["tap","dbltap","click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","contextmenu"],s=function(t){return null==t?null:t.split(" ")},r=function(t,e,n){for(var i in e)t[i]=n},a=function(t,e,i){if(t.getDefaultType){var o=t.getTypeDescriptor(),s={},a=t.getDefaultType(),l=n.merge({},a);r(s,a,"__default");for(var u=0,c=t._jsPlumb.types.length;u<c;u++){var h=t._jsPlumb.types[u];if("__default"!==h){var d=t._jsPlumb.instance.getType(h,o);if(null!=d){var p=["anchor","anchors","connector","paintStyle","hoverPaintStyle","endpoint","endpoints","connectorOverlays","connectorStyle","connectorHoverStyle","endpointStyle","endpointHoverStyle"],f=[];"override"===d.mergeStrategy?Array.prototype.push.apply(p,["events","overlays","cssClass"]):f.push("cssClass"),l=n.merge(l,d,f,p),r(s,d,h)}}}e&&(l=n.populate(l,e,"_")),t.applyType(l,i,s),i||t.repaint()}},l=t.jsPlumbUIComponent=function(t){n.EventGenerator.apply(this,arguments);var e=arguments,i=this.idPrefix+(new Date).getTime();this._jsPlumb={instance:t._jsPlumb,parameters:t.parameters||{},paintStyle:null,hoverPaintStyle:null,paintStyleInUse:null,hover:!1,beforeDetach:t.beforeDetach,beforeDrop:t.beforeDrop,overlayPlacements:[],hoverClass:t.hoverClass||t._jsPlumb.Defaults.HoverClass,types:[],typeCache:{}},this.cacheTypeItem=function(t,e,n){this._jsPlumb.typeCache[n]=this._jsPlumb.typeCache[n]||{},this._jsPlumb.typeCache[n][t]=e},this.getCachedTypeItem=function(t,e){return this._jsPlumb.typeCache[e]?this._jsPlumb.typeCache[e][t]:null},this.getId=function(){return i};var o=t.overlays||[],s={};if(this.defaultOverlayKeys){for(var r=0;r<this.defaultOverlayKeys.length;r++)Array.prototype.push.apply(o,this._jsPlumb.instance.Defaults[this.defaultOverlayKeys[r]]||[]);for(r=0;r<o.length;r++){var a=d.convertToFullOverlaySpec(o[r]);s[a[1].id]=a}}var l={overlays:s,parameters:t.parameters||{},scope:t.scope||this._jsPlumb.instance.getDefaultScope()};if(this.getDefaultType=function(){return l},this.appendToDefaultType=function(t){for(var e in t)l[e]=t[e]},t.events)for(var u in t.events)this.bind(u,t.events[u]);this.clone=function(){var t=Object.create(this.constructor.prototype);return this.constructor.apply(t,e),t}.bind(this),this.isDetachAllowed=function(t){var e=!0;if(this._jsPlumb.beforeDetach)try{e=this._jsPlumb.beforeDetach(t)}catch(t){n.log("jsPlumb: beforeDetach callback failed",t)}return e},this.isDropAllowed=function(t,e,i,o,s,r,a){var l=this._jsPlumb.instance.checkCondition("beforeDrop",{sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a});if(this._jsPlumb.beforeDrop)try{l=this._jsPlumb.beforeDrop({sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a})}catch(t){n.log("jsPlumb: beforeDrop callback failed",t)}return l};var c=[];this.setListenerComponent=function(t){for(var e=0;e<c.length;e++)c[e][3]=t}},u=function(t,e){var n=t._jsPlumb.types[e],i=t._jsPlumb.instance.getType(n,t.getTypeDescriptor());null!=i&&i.cssClass&&t.canvas&&t._jsPlumb.instance.removeClass(t.canvas,i.cssClass)};n.extend(t.jsPlumbUIComponent,n.EventGenerator,{getParameter:function(t){return this._jsPlumb.parameters[t]},setParameter:function(t,e){this._jsPlumb.parameters[t]=e},getParameters:function(){return this._jsPlumb.parameters},setParameters:function(t){this._jsPlumb.parameters=t},getClass:function(){return d.getClass(this.canvas)},hasClass:function(t){return d.hasClass(this.canvas,t)},addClass:function(t){d.addClass(this.canvas,t)},removeClass:function(t){d.removeClass(this.canvas,t)},updateClasses:function(t,e){d.updateClasses(this.canvas,t,e)},setType:function(t,e,n){this.clearTypes(),this._jsPlumb.types=s(t)||[],a(this,e,n)},getType:function(){return this._jsPlumb.types},reapplyTypes:function(t,e){a(this,t,e)},hasType:function(t){return-1!==this._jsPlumb.types.indexOf(t)},addType:function(t,e,n){var i=s(t),o=!1;if(null!=i){for(var r=0,l=i.length;r<l;r++)this.hasType(i[r])||(this._jsPlumb.types.push(i[r]),o=!0);o&&a(this,e,n)}},removeType:function(t,e,n){var i=s(t),o=!1,r=function(t){var e=this._jsPlumb.types.indexOf(t);return-1!==e&&(u(this,e),this._jsPlumb.types.splice(e,1),!0)}.bind(this);if(null!=i){for(var l=0,c=i.length;l<c;l++)o=r(i[l])||o;o&&a(this,e,n)}},clearTypes:function(t,e){for(var n=this._jsPlumb.types.length,i=0;i<n;i++)u(this,0),this._jsPlumb.types.splice(0,1);a(this,t,e)},toggleType:function(t,e,n){var i=s(t);if(null!=i){for(var o=0,r=i.length;o<r;o++){var l=this._jsPlumb.types.indexOf(i[o]);-1!==l?(u(this,l),this._jsPlumb.types.splice(l,1)):this._jsPlumb.types.push(i[o])}a(this,e,n)}},applyType:function(t,e){if(this.setPaintStyle(t.paintStyle,e),this.setHoverPaintStyle(t.hoverPaintStyle,e),t.parameters)for(var n in t.parameters)this.setParameter(n,t.parameters[n]);this._jsPlumb.paintStyleInUse=this.getPaintStyle()},setPaintStyle:function(t,e){this._jsPlumb.paintStyle=t,this._jsPlumb.paintStyleInUse=this._jsPlumb.paintStyle,i(this),e||this.repaint()},getPaintStyle:function(){return this._jsPlumb.paintStyle},setHoverPaintStyle:function(t,e){this._jsPlumb.hoverPaintStyle=t,i(this),e||this.repaint()},getHoverPaintStyle:function(){return this._jsPlumb.hoverPaintStyle},destroy:function(t){(t||null==this.typeId)&&(this.cleanupListeners(),this.clone=null,this._jsPlumb=null)},isHover:function(){return this._jsPlumb.hover},setHover:function(t,e,n){if(this._jsPlumb&&!this._jsPlumb.instance.currentlyDragging&&!this._jsPlumb.instance.isHoverSuspended()){this._jsPlumb.hover=t;var i=t?"addClass":"removeClass";null!=this.canvas&&(null!=this._jsPlumb.instance.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.instance.hoverClass),null!=this._jsPlumb.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.hoverClass)),null!=this._jsPlumb.hoverPaintStyle&&(this._jsPlumb.paintStyleInUse=t?this._jsPlumb.hoverPaintStyle:this._jsPlumb.paintStyle,this._jsPlumb.instance.isSuspendDrawing()||(n=n||jsPlumbUtil.uuid(),this.repaint({timestamp:n,recalc:!1}))),this.getAttachedElements&&!e&&function(t,e,n,i){var o=t.getAttachedElements();if(o)for(var s=0,r=o.length;s<r;s++)i&&i===o[s]||o[s].setHover(e,!0,n)}(this,t,jsPlumbUtil.uuid(),this)}}});var c=0,h=t.jsPlumbInstance=function(e){this.version="2.15.6",this.Defaults={Anchor:"Bottom",Anchors:[null,null],ConnectionsDetachable:!0,ConnectionOverlays:[],Connector:"Bezier",Container:null,DoNotThrowErrors:!1,DragOptions:{},DropOptions:{},Endpoint:"Dot",EndpointOverlays:[],Endpoints:[null,null],EndpointStyle:{fill:"#456"},EndpointStyles:[null,null],EndpointHoverStyle:null,EndpointHoverStyles:[null,null],HoverPaintStyle:null,LabelStyle:{color:"black"},ListStyle:{},LogEnabled:!1,Overlays:[],MaxConnections:1,PaintStyle:{"stroke-width":4,stroke:"#456"},ReattachConnections:!1,RenderMode:"svg",Scope:"jsPlumb_DefaultScope"},e&&d.extend(this.Defaults,e),this.logEnabled=this.Defaults.LogEnabled,this._connectionTypes={},this._endpointTypes={},n.EventGenerator.apply(this);var i=this,s=function(){var t=c+1;return c++,t}(),r=i.bind,a={},u=1,h=function(t){if(null==t)return null;if(3===t.nodeType||8===t.nodeType)return{el:t,text:!0};var e=i.getElement(t);return{el:e,id:n.isString(t)&&null==e?t:B(e)}};for(var p in this.getInstanceIndex=function(){return s},this.setZoom=function(t,e){return u=t,i.fire("zoom",u),e&&i.repaintEverything(),!0},this.getZoom=function(){return u},this.Defaults)a[p]=this.Defaults[p];var f,g=[];this.unbindContainer=function(){if(null!=f&&g.length>0)for(var t=0;t<g.length;t++)i.off(f,g[t][0],g[t][1])},this.setContainer=function(t){this.unbindContainer(),t=this.getElement(t),this.select().each(function(e){e.moveParent(t)}),this.selectEndpoints().each(function(e){e.moveParent(t)});var e=f;f=t,g.length=0;for(var n={endpointclick:"endpointClick",endpointdblclick:"endpointDblClick"},s=function(t,e,o){var s=e.srcElement||e.target,r=(s&&s.parentNode?s.parentNode._jsPlumb:null)||(s?s._jsPlumb:null)||(s&&s.parentNode&&s.parentNode.parentNode?s.parentNode.parentNode._jsPlumb:null);if(r){r.fire(t,r,e);var a=o&&n[o+t]||t;i.fire(a,r.component||r,e)}},r=function(t,e,n){g.push([t,n]),i.on(f,t,e,n)},a=function(t){r(t,".jtk-connector",function(e){s(t,e)}),r(t,".jtk-endpoint",function(e){s(t,e,"endpoint")}),r(t,".jtk-overlay",function(e){s(t,e)})},l=0;l<o.length;l++)a(o[l]);for(var u in x){var c=x[u].el;c.parentNode===e&&(e.removeChild(c),f.appendChild(c))}},this.getContainer=function(){return f},this.bind=function(t,e){"ready"===t&&v?e():r.apply(i,[t,e])},i.importDefaults=function(t){for(var e in t)i.Defaults[e]=t[e];return t.Container&&i.setContainer(t.Container),i},i.restoreDefaults=function(){return i.Defaults=d.extend({},a),i};var m=null,v=!1,y=[],b={},P={},x={},C={},_={},j=!1,E=[],S=!1,w=null,D=this.Defaults.Scope,A=1,I=function(){return""+A++},k=function(t,e){f?f.appendChild(t):e?this.getElement(e).appendChild(t):this.appendToRoot(t)}.bind(this),O=function(t,e,n,o){var s={c:[],e:[]};if(!S&&null!=(t=i.getElement(t))){var r=B(t),a=t.querySelectorAll(".jtk-managed");null==n&&(n=jsPlumbUtil.uuid());it({elId:r,offset:e,recalc:!1,timestamp:n});for(var l=0;l<a.length;l++)it({elId:a[l].getAttribute("id"),recalc:!0,timestamp:n});var u=i.router.redraw(r,e,n,null,o);if(Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e),a)for(var c=0;c<a.length;c++)u=i.router.redraw(a[c].getAttribute("id"),null,n,null,o,!0),Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e)}return s},M=function(t){return P[t]},T=function(t,e){var o=d.extend({},t);if(e&&d.extend(o,e),o.source&&(o.source.endpoint?o.sourceEndpoint=o.source:o.source=i.getElement(o.source)),o.target&&(o.target.endpoint?o.targetEndpoint=o.target:o.target=i.getElement(o.target)),t.uuids&&(o.sourceEndpoint=M(t.uuids[0]),o.targetEndpoint=M(t.uuids[1])),o.sourceEndpoint&&o.sourceEndpoint.isFull())n.log(i,"could not add connection; source endpoint is full");else if(o.targetEndpoint&&o.targetEndpoint.isFull())n.log(i,"could not add connection; target endpoint is full");else{if(!o.type&&o.sourceEndpoint&&(o.type=o.sourceEndpoint.connectionType),o.sourceEndpoint&&o.sourceEndpoint.connectorOverlays){o.overlays=o.overlays||[];for(var s=0,r=o.sourceEndpoint.connectorOverlays.length;s<r;s++)o.overlays.push(o.sourceEndpoint.connectorOverlays[s])}o.sourceEndpoint&&o.sourceEndpoint.scope&&(o.scope=o.sourceEndpoint.scope),!o["pointer-events"]&&o.sourceEndpoint&&o.sourceEndpoint.connectorPointerEvents&&(o["pointer-events"]=o.sourceEndpoint.connectorPointerEvents);var a=function(t,e,n){var s=function(t,e){var n=d.extend({},t);for(var i in e)e[i]&&(n[i]=e[i]);return n}(e,{anchor:o.anchors?o.anchors[n]:o.anchor,endpoint:o.endpoints?o.endpoints[n]:o.endpoint,paintStyle:o.endpointStyles?o.endpointStyles[n]:o.endpointStyle,hoverPaintStyle:o.endpointHoverStyles?o.endpointHoverStyles[n]:o.endpointHoverStyle});return i.addEndpoint(t,s)},l=function(t,e,n,i){if(o[t]&&!o[t].endpoint&&!o[t+"Endpoint"]&&!o.newConnection){var s=n[B(o[t])];if(s=s?s[i]:null){if(!s.enabled)return!1;var r=d.extend({},s.def);delete r.label;var l=null!=s.endpoint&&s.endpoint._jsPlumb?s.endpoint:a(o[t],r,e);if(l.isFull())return!1;o[t+"Endpoint"]=l,!o.scope&&r.scope&&(o.scope=r.scope),s.uniqueEndpoint?s.endpoint?l.finalEndpoint=s.endpoint:(s.endpoint=l,l.setDeleteOnEmpty(!1)):l.setDeleteOnEmpty(!0),0===e&&s.def.connectorOverlays&&(o.overlays=o.overlays||[],Array.prototype.push.apply(o.overlays,s.def.connectorOverlays))}}};if(!1!==l("source",0,this.sourceEndpointDefinitions,o.type||"default")&&!1!==l("target",1,this.targetEndpointDefinitions,o.type||"default"))return o.sourceEndpoint&&o.targetEndpoint&&(function(t,e){for(var n=t.scope.split(/\s/),i=e.scope.split(/\s/),o=0;o<n.length;o++)for(var s=0;s<i.length;s++)if(i[s]===n[o])return!0;return!1}(o.sourceEndpoint,o.targetEndpoint)||(o=null)),o}}.bind(i),F=function(t){var e=i.Defaults.ConnectionType||i.getDefaultConnectionType();t._jsPlumb=i,t.newConnection=F,t.newEndpoint=N,t.endpointsByUUID=P,t.endpointsByElement=b,t.finaliseConnection=L,t.id="con_"+I();var n=new e(t);return n.isDetachable()&&(n.endpoints[0].initDraggable("_jsPlumbSource"),n.endpoints[1].initDraggable("_jsPlumbTarget")),n},L=i.finaliseConnection=function(t,e,n,o){if(e=e||{},t.suspendedEndpoint||y.push(t),t.pending=null,t.endpoints[0].isTemporarySource=!1,!1!==o&&i.router.newConnection(t),O(t.source),!e.doNotFireConnectionEvent&&!1!==e.fireEvent){var s={connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]};i.fire("connection",s,n)}},N=function(t,e){var n=i.Defaults.EndpointType||d.Endpoint,o=d.extend({},t);o._jsPlumb=i,o.newConnection=F,o.newEndpoint=N,o.endpointsByUUID=P,o.endpointsByElement=b,o.fireDetachEvent=X,o.elementId=e||B(o.source);var s=new n(o);return s.id="ep_"+I(),nt(o.elementId,o.source),d.headless||i.getDragManager().endpointAdded(o.source,e),s},R=function(t,e,n){var i=b[t];if(i&&i.length)for(var o=0,s=i.length;o<s;o++){for(var r=0,a=i[o].connections.length;r<a;r++){if(e(i[o].connections[r]))return}n&&n(i[o])}},G=function(t,e,n){e="block"===e;var i=null;n&&(i=function(t){t.setVisible(e,!0,!0)});var o=h(t);R(o.id,function(t){if(e&&n){var i=t.sourceId===o.id?1:0;t.endpoints[i].isVisible()&&t.setVisible(!0)}else t.setVisible(e)},i)},B=function(t,e,o){if(n.isString(t))return t;if(null==t)return null;var r=i.getAttribute(t,"id");return r&&"undefined"!==r||(2===arguments.length&&void 0!==arguments[1]?r=e:(1===arguments.length||3===arguments.length&&!arguments[2])&&(r="jsPlumb_"+s+"_"+I()),o||i.setAttribute(t,"id",r)),r};this.setConnectionBeingDragged=function(t){j=t},this.isConnectionBeingDragged=function(){return j},this.getManagedElements=function(){return x},this.connectorClass="jtk-connector",this.connectorOutlineClass="jtk-connector-outline",this.connectedClass="jtk-connected",this.hoverClass="jtk-hover",this.endpointClass="jtk-endpoint",this.endpointConnectedClass="jtk-endpoint-connected",this.endpointFullClass="jtk-endpoint-full",this.endpointDropAllowedClass="jtk-endpoint-drop-allowed",this.endpointDropForbiddenClass="jtk-endpoint-drop-forbidden",this.overlayClass="jtk-overlay",this.draggingClass="jtk-dragging",this.elementDraggingClass="jtk-element-dragging",this.sourceElementDraggingClass="jtk-source-element-dragging",this.targetElementDraggingClass="jtk-target-element-dragging",this.endpointAnchorClassPrefix="jtk-endpoint-anchor",this.hoverSourceClass="jtk-source-hover",this.hoverTargetClass="jtk-target-hover",this.dragSelectClass="jtk-drag-select",this.Anchors={},this.Connectors={svg:{}},this.Endpoints={svg:{}},this.Overlays={svg:{}},this.ConnectorRenderers={},this.SVG="svg",this.addEndpoint=function(t,e,o){o=o||{};var s=d.extend({},o);d.extend(s,e),s.endpoint=s.endpoint||i.Defaults.Endpoint,s.paintStyle=s.paintStyle||i.Defaults.EndpointStyle;for(var r=[],a=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],l=0,u=a.length;l<u;l++){s.source=i.getElement(a[l]),et(s.source);var c=B(s.source),h=N(s,c),p=nt(c,s.source,null,!S).info.o;n.addToList(b,c,h),S||h.paint({anchorLoc:h.anchor.compute({xy:[p.left,p.top],wh:E[c],element:h,timestamp:w,rotation:this.getRotation(c)}),timestamp:w}),r.push(h)}return 1===r.length?r[0]:r},this.addEndpoints=function(t,e,o){for(var s=[],r=0,a=e.length;r<a;r++){var l=i.addEndpoint(t,e[r],o);n.isArray(l)?Array.prototype.push.apply(s,l):s.push(l)}return s},this.animate=function(t,e,o){if(!this.animationSupported)return!1;o=o||{};var s=i.getElement(t),r=B(s),a=d.animEvents.step,l=d.animEvents.complete;o[a]=n.wrap(o[a],function(){i.revalidate(r)}),o[l]=n.wrap(o[l],function(){i.revalidate(r)}),i.doAnimate(s,e,o)},this.checkCondition=function(t,e){var o=i.getListener(t),s=!0;if(o&&o.length>0){var r=Array.prototype.slice.call(arguments,1);try{for(var a=0,l=o.length;a<l;a++)s=s&&o[a].apply(o[a],r)}catch(e){n.log(i,"cannot check condition ["+t+"]"+e)}}return s},this.connect=function(t,e){var i,o=T(t,e);if(o){if(null==o.source&&null==o.sourceEndpoint)return void n.log("Cannot establish connection - source does not exist");if(null==o.target&&null==o.targetEndpoint)return void n.log("Cannot establish connection - target does not exist");et(o.source),i=F(o),L(i,o)}return i};var H=[{el:"source",elId:"sourceId",epDefs:"sourceEndpointDefinitions"},{el:"target",elId:"targetId",epDefs:"targetEndpointDefinitions"}],U=function(t,e,n,i){var o,s,r,a=H[n],l=t[a.elId],u=(t[a.el],t.endpoints[n]),c={index:n,originalSourceId:0===n?l:t.sourceId,newSourceId:t.sourceId,originalTargetId:1===n?l:t.targetId,newTargetId:t.targetId,connection:t};if(e.constructor===d.Endpoint)(o=e).addConnection(t),e=o.element;else if(s=B(e),r=this[a.epDefs][s],s===t[a.elId])o=null;else if(r)for(var h in r){if(!r[h].enabled)return;o=null!=r[h].endpoint&&r[h].endpoint._jsPlumb?r[h].endpoint:this.addEndpoint(e,r[h].def),r[h].uniqueEndpoint&&(r[h].endpoint=o),o.addConnection(t)}else o=t.makeEndpoint(0===n,e,s);return null!=o&&(u.detachFromConnection(t),t.endpoints[n]=o,t[a.el]=o.element,t[a.elId]=o.elementId,c[0===n?"newSourceId":"newTargetId"]=o.elementId,Y(c),i||t.repaint()),c.element=e,c}.bind(this);this.setSource=function(t,e,n){var i=U(t,e,0,n);this.router.sourceOrTargetChanged(i.originalSourceId,i.newSourceId,t,i.el,0)},this.setTarget=function(t,e,n){var i=U(t,e,1,n);this.router.sourceOrTargetChanged(i.originalTargetId,i.newTargetId,t,i.el,1)},this.deleteEndpoint=function(t,e,n){var o="string"==typeof t?P[t]:t;return o&&i.deleteObject({endpoint:o,dontUpdateHover:e,deleteAttachedObjects:n}),i},this.deleteEveryEndpoint=function(){var t=i.setSuspendDrawing(!0);for(var e in b){var n=b[e];if(n&&n.length)for(var o=0,s=n.length;o<s;o++)i.deleteEndpoint(n[o],!0)}b={},x={},P={},C={},_={},i.router.reset();var r=i.getDragManager();return r&&r.reset(),t||i.setSuspendDrawing(!1),i};var X=function(t,e,n){var o=i.Defaults.ConnectionType||i.getDefaultConnectionType(),s=t.constructor===o?{connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]}:t;e&&i.fire("connectionDetached",s,n),i.fire("internal.connectionDetached",s,n),i.router.connectionDetached(s)},Y=i.fireMoveEvent=function(t,e){i.fire("connectionMoved",t,e)};this.unregisterEndpoint=function(t){for(var e in t._jsPlumb.uuid&&(P[t._jsPlumb.uuid]=null),i.router.deleteEndpoint(t),b){var n=b[e];if(n){for(var o=[],s=0,r=n.length;s<r;s++)n[s]!==t&&o.push(n[s]);b[e]=o}b[e].length<1&&delete b[e]}};this.deleteConnection=function(t,e){return!(null==t||!(e=e||{}).force&&!n.functionChain(!0,!1,[[t.endpoints[0],"isDetachAllowed",[t]],[t.endpoints[1],"isDetachAllowed",[t]],[t,"isDetachAllowed",[t]],[i,"checkCondition",["beforeDetach",t]]]))&&(t.setHover(!1),X(t,!t.pending&&!1!==e.fireEvent,e.originalEvent),t.endpoints[0].detachFromConnection(t),t.endpoints[1].detachFromConnection(t),n.removeWithFunction(y,function(e){return t.id===e.id}),t.cleanup(),t.destroy(),!0)},this.deleteEveryConnection=function(t){t=t||{};var e=y.length,n=0;return i.batch(function(){for(var o=0;o<e;o++)n+=i.deleteConnection(y[0],t)?1:0}),n},this.deleteConnectionsForElement=function(t,e){e=e||{},t=i.getElement(t);var n=B(t),o=b[n];if(o&&o.length)for(var s=0,r=o.length;s<r;s++)o[s].deleteEveryConnection(e);return i},this.deleteObject=function(t){var e={endpoints:{},connections:{},endpointCount:0,connectionCount:0},o=!1!==t.deleteAttachedObjects,s=function(n){null!=n&&null==e.connections[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.connections[n.id]=n,e.connectionCount++)};for(var r in t.connection?s(t.connection):function(n){if(null!=n&&null==e.endpoints[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.endpoints[n.id]=n,e.endpointCount++,o))for(var i=0;i<n.connections.length;i++){var r=n.connections[i];s(r)}}(t.endpoint),e.connections){var a=e.connections[r];if(a._jsPlumb){n.removeWithFunction(y,function(t){return a.id===t.id}),X(a,!1!==t.fireEvent&&!a.pending,t.originalEvent);var l=null==t.deleteAttachedObjects?null:!t.deleteAttachedObjects;a.endpoints[0].detachFromConnection(a,null,l),a.endpoints[1].detachFromConnection(a,null,l),a.cleanup(!0),a.destroy(!0)}}for(var u in e.endpoints){var c=e.endpoints[u];c._jsPlumb&&(i.unregisterEndpoint(c),c.cleanup(!0),c.destroy(!0))}return e};var $=function(t,e,n){return function(){return function(t,e,n,i){for(var o=0,s=t.length;o<s;o++)t[o][e].apply(t[o],n);return i(t)}(t,e,arguments,n)}},z=function(t,e){return function(){return function(t,e,n){for(var i=[],o=0,s=t.length;o<s;o++)i.push([t[o][e].apply(t[o],n),t[o]]);return i}(t,e,arguments)}},W=function(t,e){var n=[];if(t)if("string"==typeof t){if("*"===t)return t;n.push(t)}else if(e)n=t;else if(t.length)for(var i=0,o=t.length;i<o;i++)n.push(h(t[i]).id);else n.push(h(t).id);return n},q=function(t,e,n){return"*"===t||(t.length>0?-1!==t.indexOf(e):!n)};this.getConnections=function(t,e){t?t.constructor===String&&(t={scope:t}):t={};for(var n=t.scope||i.getDefaultScope(),o=W(n,!0),s=W(t.source),r=W(t.target),a=!e&&o.length>1?{}:[],l=function(t,n){if(!e&&o.length>1){var i=a[t];null==i&&(i=a[t]=[]),i.push(n)}else a.push(n)},u=0,c=y.length;u<c;u++){var h=y[u],d=h.proxies&&h.proxies[0]?h.proxies[0].originalEp.elementId:h.sourceId,p=h.proxies&&h.proxies[1]?h.proxies[1].originalEp.elementId:h.targetId;q(o,h.scope)&&q(s,d)&&q(r,p)&&l(h.scope,h)}return a};var V=function(t,e){return function(n){for(var i=0,o=t.length;i<o;i++)n(t[i]);return e(t)}},J=function(t){return function(e){return t[e]}},Z=function(t,e){var n,i,o={length:t.length,each:V(t,e),get:J(t)},s=["setHover","removeAllOverlays","setLabel","addClass","addOverlay","removeOverlay","removeOverlays","showOverlay","hideOverlay","showOverlays","hideOverlays","setPaintStyle","setHoverPaintStyle","setSuspendEvents","setParameter","setParameters","setVisible","repaint","addType","toggleType","removeType","removeClass","setType","bind","unbind"],r=["getLabel","getOverlay","isHover","getParameter","getParameters","getPaintStyle","getHoverPaintStyle","isVisible","hasType","getType","isSuspendEvents"];for(n=0,i=s.length;n<i;n++)o[s[n]]=$(t,s[n],e);for(n=0,i=r.length;n<i;n++)o[r[n]]=z(t,r[n]);return o},K=function(t){var e=Z(t,K);return d.extend(e,{setDetachable:$(t,"setDetachable",K),setReattach:$(t,"setReattach",K),setConnector:$(t,"setConnector",K),delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteConnection(t[e])},isDetachable:z(t,"isDetachable"),isReattach:z(t,"isReattach")})},Q=function(t){var e=Z(t,Q);return d.extend(e,{setEnabled:$(t,"setEnabled",Q),setAnchor:$(t,"setAnchor",Q),isEnabled:z(t,"isEnabled"),deleteEveryConnection:function(){for(var e=0,n=t.length;e<n;e++)t[e].deleteEveryConnection()},delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteEndpoint(t[e])}})};this.select=function(t){return(t=t||{}).scope=t.scope||"*",K(t.connections||i.getConnections(t,!0))},this.selectEndpoints=function(t){(t=t||{}).scope=t.scope||"*";var e=!t.element&&!t.source&&!t.target,n=e?"*":W(t.element),i=e?"*":W(t.source),o=e?"*":W(t.target),s=W(t.scope,!0),r=[];for(var a in b){var l=q(n,a,!0),u=q(i,a,!0),c="*"!==i,h=q(o,a,!0),d="*"!==o;if(l||u||h)t:for(var p=0,f=b[a].length;p<f;p++){var g=b[a][p];if(q(s,g.scope,!0)){var m=c&&i.length>0&&!g.isSource,v=d&&o.length>0&&!g.isTarget;if(m||v)continue t;r.push(g)}}}return Q(r)},this.getAllConnections=function(){return y},this.getDefaultScope=function(){return D},this.getEndpoint=M,this.getEndpoints=function(t){return b[h(t).id]||[]},this.getDefaultEndpointType=function(){return d.Endpoint},this.getDefaultConnectionType=function(){return d.Connection},this.getId=B,this.draw=O,this.info=h,this.appendElement=k;var tt=!1;this.isHoverSuspended=function(){return tt},this.setHoverSuspended=function(t){tt=t},this.hide=function(t,e){return G(t,"none",e),i},this.idstamp=I;var et=function(t){if(!f&&t){var e=i.getElement(t);e.offsetParent&&i.setContainer(e.offsetParent)}},nt=i.manage=function(t,e,n,o){return x[t]?o&&(x[t].info=it({elId:t,timestamp:w,recalc:!0})):(x[t]={el:e,endpoints:[],connections:[],rotation:0},x[t].info=it({elId:t,timestamp:w}),i.addClass(e,"jtk-managed"),n||i.fire("manageElement",{id:t,info:x[t].info,el:e})),x[t]};this.unmanage=function(t){if(x[t]){var e=x[t].el;i.removeClass(e,"jtk-managed"),delete x[t],i.fire("unmanageElement",{id:t,el:e})}},this.rotate=function(t,e,n){return x[t]&&(x[t].rotation=e,x[t].el.style.transform="rotate("+e+"deg)",x[t].el.style.transformOrigin="center center",!0!==n)?this.revalidate(t):{c:[],e:[]}},this.getRotation=function(t){return x[t]&&x[t].rotation||0};var it=function(t){var e,n=t.timestamp,o=t.recalc,s=t.offset,r=t.elId;return S&&!n&&(n=w),!o&&n&&n===_[r]?{o:t.offset||C[r],s:E[r]}:(o||!s&&null==C[r]?null!=(e=x[r]?x[r].el:null)&&(E[r]=i.getSize(e),C[r]=i.getOffset(e),_[r]=n):(C[r]=s||C[r],null==E[r]&&null!=(e=x[r].el)&&(E[r]=i.getSize(e)),_[r]=n),C[r]&&!C[r].right&&(C[r].right=C[r].left+E[r][0],C[r].bottom=C[r].top+E[r][1],C[r].width=E[r][0],C[r].height=E[r][1],C[r].centerx=C[r].left+C[r].width/2,C[r].centery=C[r].top+C[r].height/2),{o:C[r],s:E[r]})};this.updateOffset=it,this.init=function(){v||(i.Defaults.Container&&i.setContainer(i.Defaults.Container),i.router=new t.jsPlumb.DefaultRouter(i),i.anchorManager=i.router.anchorManager,v=!0,i.fire("ready",i))}.bind(this),this.log=m,this.jsPlumbUIComponent=l,this.makeAnchor=function(){var e,o=function(e,n){if(t.jsPlumb.Anchors[e])return new t.jsPlumb.Anchors[e](n);if(!i.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown anchor type '"+e+"'"}};if(0===arguments.length)return null;var s=arguments[0],r=arguments[1],a=null;if(s.compute&&s.getOrientation)return s;if("string"==typeof s)a=o(arguments[0],{elementId:r,jsPlumbInstance:i});else if(n.isArray(s))if(n.isArray(s[0])||n.isString(s[0]))2===s.length&&n.isObject(s[1])?n.isString(s[0])?(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i},s[1]),a=o(s[0],e)):(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i,anchors:s[0]},s[1]),a=new t.jsPlumb.DynamicAnchor(e)):a=new d.DynamicAnchor({anchors:s,selector:null,elementId:r,jsPlumbInstance:i});else{var l={x:s[0],y:s[1],orientation:s.length>=4?[s[2],s[3]]:[0,0],offsets:s.length>=6?[s[4],s[5]]:[0,0],elementId:r,jsPlumbInstance:i,cssClass:7===s.length?s[6]:null};(a=new t.jsPlumb.Anchor(l)).clone=function(){return new t.jsPlumb.Anchor(l)}}return a.id||(a.id="anchor_"+I()),a},this.makeAnchors=function(e,o,s){for(var r=[],a=0,l=e.length;a<l;a++)"string"==typeof e[a]?r.push(t.jsPlumb.Anchors[e[a]]({elementId:o,jsPlumbInstance:s})):n.isArray(e[a])&&r.push(i.makeAnchor(e[a],o,s));return r},this.makeDynamicAnchor=function(e,n){return new t.jsPlumb.DynamicAnchor({anchors:e,selector:n,elementId:null,jsPlumbInstance:i})},this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={};var ot=function(e,o,s,r,a){var u=new l(o),c=o._jsPlumb.EndpointDropHandler({jsPlumb:i,enabled:function(){return e.def.enabled},isFull:function(){var t=i.select({target:e.id}).length;return e.def.maxConnections>0&&t>=e.def.maxConnections},element:e.el,elementId:e.id,isSource:r,isTarget:a,addClass:function(t){i.addClass(e.el,t)},removeClass:function(t){i.removeClass(e.el,t)},onDrop:function(t){t.endpoints[0].anchor.locked=!1},isDropAllowed:function(){return u.isDropAllowed.apply(u,arguments)},isRedrop:function(t){return null!=t.suspendedElement&&null!=t.suspendedEndpoint&&t.suspendedEndpoint.element===e.el},getEndpoint:function(n){var s=e.def.endpoint;if(null==s||null==s._jsPlumb){var r=i.deriveEndpointAndAnchorSpec(n.getType().join(" "),!0),a=r.endpoints?t.jsPlumb.extend(o,{endpoint:e.def.def.endpoint||r.endpoints[1]}):o;r.anchors&&(a=t.jsPlumb.extend(a,{anchor:e.def.def.anchor||r.anchors[1]})),(s=i.addEndpoint(e.el,a))._mtNew=!0}if(o.uniqueEndpoint&&(e.def.endpoint=s),s.setDeleteOnEmpty(!0),n.isDetachable()&&s.initDraggable(),null!=s.anchor.positionFinder){var l=i.getUIPosition(arguments,i.getZoom()),u=i.getOffset(e.el),c=i.getSize(e.el),h=null==l?[0,0]:s.anchor.positionFinder(l,u,c,s.anchor.constructorParams);s.anchor.x=h[0],s.anchor.y=h[1]}return s},maybeCleanup:function(t){t._mtNew&&0===t.connections.length?i.deleteObject({endpoint:t}):delete t._mtNew}}),h=t.jsPlumb.dragEvents.drop;return s.scope=s.scope||o.scope||i.Defaults.Scope,s[h]=n.wrap(s[h],c,!0),s.rank=o.rank||0,a&&(s[t.jsPlumb.dragEvents.over]=function(){return!0}),!1===o.allowLoopback&&(s.canDrop=function(t){return t.getDragElement()._jsPlumbRelatedElement!==e.el}),i.initDroppable(e.el,s,"internal"),c};this.makeTarget=function(e,n,o){var s=t.jsPlumb.extend({_jsPlumb:this},o);t.jsPlumb.extend(s,n);for(var r=s.maxConnections||-1,a=function(e){var n=h(e),o=n.id,a=t.jsPlumb.extend({},s.dropOptions||{}),l=s.connectionType||"default";this.targetEndpointDefinitions[o]=this.targetEndpointDefinitions[o]||{},et(o),n.el._isJsPlumbGroup&&null==a.rank&&(a.rank=-1);var u={def:t.jsPlumb.extend({},s),uniqueEndpoint:s.uniqueEndpoint,maxConnections:r,enabled:!0};s.createEndpoint&&(u.uniqueEndpoint=!0,u.endpoint=i.addEndpoint(e,u.def),u.endpoint.setDeleteOnEmpty(!1)),n.def=u,this.targetEndpointDefinitions[o][l]=u,ot(n,s,a,!0===s.isSource,!0),n.el._katavorioDrop[n.el._katavorioDrop.length-1].targetDef=u}.bind(this),l=e.length&&e.constructor!==String?e:[e],u=0,c=l.length;u<c;u++)a(l[u]);return this},this.unmakeTarget=function(t,e){var n=h(t);return i.destroyDroppable(n.el,"internal"),e||delete this.targetEndpointDefinitions[n.id],this},this.makeSource=function(e,o,s){var r=t.jsPlumb.extend({_jsPlumb:this},s);t.jsPlumb.extend(r,o);var a=r.connectionType||"default",l=i.deriveEndpointAndAnchorSpec(a);r.endpoint=r.endpoint||l.endpoints[0],r.anchor=r.anchor||l.anchors[0];for(var c=r.maxConnections||-1,d=r.onMaxConnections,p=function(o){var s=o.id,l=this.getElement(o.el);this.sourceEndpointDefinitions[s]=this.sourceEndpointDefinitions[s]||{},et(s);var h={def:t.jsPlumb.extend({},r),uniqueEndpoint:r.uniqueEndpoint,maxConnections:c,enabled:!0};r.createEndpoint&&(h.uniqueEndpoint=!0,h.endpoint=i.addEndpoint(e,h.def),h.endpoint.setDeleteOnEmpty(!1)),this.sourceEndpointDefinitions[s][a]=h,o.def=h;var p=t.jsPlumb.dragEvents.stop,f=t.jsPlumb.dragEvents.drag,g=t.jsPlumb.extend({},r.dragOptions||{}),m=g.drag,v=g.stop,y=null,b=!1;g.scope=g.scope||r.scope,g[f]=n.wrap(g[f],function(){m&&m.apply(this,arguments),b=!1}),g[p]=n.wrap(g[p],function(){if(v&&v.apply(this,arguments),this.currentlyDragging=!1,null!=y._jsPlumb){var t=r.anchor||this.Defaults.Anchor,e=y.anchor,n=y.connections[0],o=this.makeAnchor(t,s,this),a=y.element;if(null!=o.positionFinder){var l=i.getOffset(a),u=this.getSize(a),c={left:l.left+e.x*u[0],top:l.top+e.y*u[1]},h=o.positionFinder(c,l,u,o.constructorParams);o.x=h[0],o.y=h[1]}y.setAnchor(o,!0),y.repaint(),this.repaint(y.elementId),null!=n&&this.repaint(n.targetId)}}.bind(this));var P=function(e){if(3!==e.which&&2!==e.button){s=this.getId(this.getElement(o.el));var h=this.sourceEndpointDefinitions[s][a];if(h.enabled){if(r.filter)if(!1===(n.isString(r.filter)?function(t,e,n,i,o){for(var s=t.target||t.srcElement,r=!1,a=i.getSelector(e,n),l=0;l<a.length;l++)if(a[l]===s){r=!0;break}return o?!r:r}(e,o.el,r.filter,this,r.filterExclude):r.filter(e,o.el)))return;var p=this.select({source:s}).length;if(h.maxConnections>=0&&p>=h.maxConnections)return d&&d({element:o.el,maxConnections:c},e),!1;var f=t.jsPlumb.getPositionOnElement(e,l,u),m={};t.jsPlumb.extend(m,h.def),m.isTemporarySource=!0,m.anchor=[f[0],f[1],0,0],m.dragOptions=g,h.def.scope&&(m.scope=h.def.scope),y=this.addEndpoint(s,m),b=!0,y.setDeleteOnEmpty(!0),h.uniqueEndpoint&&(h.endpoint?y.finalEndpoint=h.endpoint:(h.endpoint=y,y.setDeleteOnEmpty(!1)));var v=function(){i.off(y.canvas,"mouseup",v),i.off(o.el,"mouseup",v),b&&(b=!1,i.deleteEndpoint(y))};i.on(y.canvas,"mouseup",v),i.on(o.el,"mouseup",v);var P={};if(h.def.extract)for(var x in h.def.extract){var C=(e.srcElement||e.target).getAttribute(x);C&&(P[h.def.extract[x]]=C)}i.trigger(y.canvas,"mousedown",e,P),n.consume(e)}}}.bind(this);this.on(o.el,"mousedown",P),h.trigger=P,r.filter&&(n.isString(r.filter)||n.isFunction(r.filter))&&i.setDragFilter(o.el,r.filter);var x=t.jsPlumb.extend({},r.dropOptions||{});ot(o,r,x,!0,!0===r.isTarget)}.bind(this),f=e.length&&e.constructor!==String?e:[e],g=0,m=f.length;g<m;g++)p(h(f[g]));return this},this.unmakeSource=function(t,e,n){var o=h(t);i.destroyDroppable(o.el,"internal");var s=this.sourceEndpointDefinitions[o.id];if(s)for(var r in s)if(null==e||e===r){var a=s[r].trigger;a&&i.off(o.el,"mousedown",a),n||delete this.sourceEndpointDefinitions[o.id][r]}return this},this.unmakeEverySource=function(){for(var t in this.sourceEndpointDefinitions)i.unmakeSource(t,null,!0);return this.sourceEndpointDefinitions={},this};var st=function(t,e,i){e=n.isArray(e)?e:[e];var o=B(t);i=i||"default";for(var s=0;s<e.length;s++){var r=this[e[s]][o];if(r&&r[i])return r[i].def.scope||this.Defaults.Scope}}.bind(this),rt=function(t,e,i,o){i=n.isArray(i)?i:[i];var s=B(t);o=o||"default";for(var r=0;r<i.length;r++){var a=this[i[r]][s];a&&a[o]&&(a[o].def.scope=e)}}.bind(this);this.getScope=function(t,e){return st(t,["sourceEndpointDefinitions","targetEndpointDefinitions"])},this.getSourceScope=function(t){return st(t,"sourceEndpointDefinitions")},this.getTargetScope=function(t){return st(t,"targetEndpointDefinitions")},this.setScope=function(t,e,n){this.setSourceScope(t,e,n),this.setTargetScope(t,e,n)},this.setSourceScope=function(t,e,n){rt(t,e,"sourceEndpointDefinitions",n),this.setDragScope(t,e)},this.setTargetScope=function(t,e,n){rt(t,e,"targetEndpointDefinitions",n),this.setDropScope(t,e)},this.unmakeEveryTarget=function(){for(var t in this.targetEndpointDefinitions)i.unmakeTarget(t,!0);return this.targetEndpointDefinitions={},this};var at=function(t,e,o,s,r){var a,l,u,c="source"===t?this.sourceEndpointDefinitions:this.targetEndpointDefinitions;if(r=r||"default",e.length&&!n.isString(e)){a=[];for(var d=0,p=e.length;d<p;d++)c[(l=h(e[d])).id]&&c[l.id][r]&&(a[d]=c[l.id][r].enabled,u=s?!a[d]:o,c[l.id][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}else{var f=(l=h(e)).id;c[f]&&c[f][r]&&(a=c[f][r].enabled,u=s?!a:o,c[f][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}return a}.bind(this),lt=function(t,e){if(null!=t){if(n.isString(t)||!t.length)return e.apply(this,[t]);if(t.length)return e.apply(this,[t[0]])}}.bind(this);this.toggleSourceEnabled=function(t,e){return at("source",t,null,!0,e),this.isSourceEnabled(t,e)},this.setSourceEnabled=function(t,e,n){return at("source",t,e,null,n)},this.isSource=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isSourceEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.toggleTargetEnabled=function(t,e){return at("target",t,null,!0,e),this.isTargetEnabled(t,e)},this.isTarget=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isTargetEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.setTargetEnabled=function(t,e,n){return at("target",t,e,null,n)},this.ready=function(t){i.bind("ready",t)};this.repaint=function(t,e,n){return function(t,e){if("object"==typeof t&&t.length)for(var n=0,o=t.length;n<o;n++)e(t[n]);else e(t);return i}(t,function(t){O(t,e,n)})},this.revalidate=function(t,e,n){var o=n?t:i.getId(t);i.updateOffset({elId:o,recalc:!0,timestamp:e});var s=i.getDragManager();return s&&s.updateOffsets(o),O(t,null,e)},this.repaintEverything=function(){var t,e=jsPlumbUtil.uuid();for(t in b)i.updateOffset({elId:t,recalc:!0,timestamp:e});for(t in b)O(t,null,e);return this},this.removeAllEndpoints=function(t,e,n){n=n||[];var o=function(t){var s,r,a=h(t),l=b[a.id];if(l)for(n.push(a),s=0,r=l.length;s<r;s++)i.deleteEndpoint(l[s],!1);if(delete b[a.id],e&&a.el&&3!==a.el.nodeType&&8!==a.el.nodeType)for(s=0,r=a.el.childNodes.length;s<r;s++)o(a.el.childNodes[s])};return o(t),this};var ut=function(t,e){i.removeAllEndpoints(t.id,!0,e);for(var n=i.getDragManager(),o=function(t){n&&n.elementRemoved(t.id),i.router.elementRemoved(t.id),i.isSource(t.el)&&i.unmakeSource(t.el),i.isTarget(t.el)&&i.unmakeTarget(t.el),i.destroyDraggable(t.el),i.destroyDroppable(t.el),delete i.floatingConnections[t.id],delete x[t.id],delete C[t.id],t.el&&(i.removeElement(t.el),t.el._jsPlumb=null)},s=1;s<e.length;s++)o(e[s]);o(t)};this.remove=function(t,e){var n=h(t),o=[];return n.text&&n.el.parentNode?n.el.parentNode.removeChild(n.el):n.id&&i.batch(function(){ut(n,o)},!0===e),i},this.empty=function(t,e){var n=[],o=function(t,e){var i=h(t);if(i.text)i.el.parentNode.removeChild(i.el);else if(i.el){for(;i.el.childNodes.length>0;)o(i.el.childNodes[0]);e||ut(i,n)}};return i.batch(function(){o(t,!0)},!1===e),i},this.reset=function(t){i.silently(function(){tt=!1,i.removeAllGroups(),i.removeGroupManager(),i.deleteEveryEndpoint(),t||i.unbind(),this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={},y.length=0,this.doReset&&this.doReset()}.bind(this))},this.destroy=function(){this.reset(),f=null,g=null};var ct=function(t){t.canvas&&t.canvas.parentNode&&t.canvas.parentNode.removeChild(t.canvas),t.cleanup(),t.destroy()};this.clear=function(){i.select().each(ct),i.selectEndpoints().each(ct),b={},P={}},this.setDefaultScope=function(t){return D=t,i},this.deriveEndpointAndAnchorSpec=function(t,e){for(var n=((e?"":"default ")+t).split(/[\s]/),o=null,s=null,r=null,a=null,l=0;l<n.length;l++){var u=i.getType(n[l],"connection");u&&(u.endpoints&&(o=u.endpoints),u.endpoint&&(s=u.endpoint),u.anchors&&(a=u.anchors),u.anchor&&(r=u.anchor))}return{endpoints:o||[s,s],anchors:a||[r,r]}},this.setId=function(t,e,i){var o;n.isString(t)?o=t:(t=this.getElement(t),o=this.getId(t));var s=this.getConnections({source:o,scope:"*"},!0),r=this.getConnections({target:o,scope:"*"},!0);e=""+e,i?t=this.getElement(e):(t=this.getElement(o),this.setAttribute(t,"id",e)),b[e]=b[o]||[];for(var a=0,l=b[e].length;a<l;a++)b[e][a].setElementId(e),b[e][a].setReferenceElement(t);delete b[o],this.sourceEndpointDefinitions[e]=this.sourceEndpointDefinitions[o],delete this.sourceEndpointDefinitions[o],this.targetEndpointDefinitions[e]=this.targetEndpointDefinitions[o],delete this.targetEndpointDefinitions[o],this.router.changeId(o,e);var u=this.getDragManager();u&&u.changeId(o,e),x[e]=x[o],delete x[o];var c=function(n,i,o){for(var s=0,r=n.length;s<r;s++)n[s].endpoints[i].setElementId(e),n[s].endpoints[i].setReferenceElement(t),n[s][o+"Id"]=e,n[s][o]=t};c(s,0,"source"),c(r,1,"target"),this.repaint(e)},this.setDebugLog=function(t){m=t},this.setSuspendDrawing=function(t,e){var n=S;return S=t,w=t?(new Date).getTime():null,e&&this.repaintEverything(),n},this.isSuspendDrawing=function(){return S},this.getSuspendedAt=function(){return w},this.batch=function(t,e){var i=this.isSuspendDrawing();i||this.setSuspendDrawing(!0);try{t()}catch(t){n.log("Function run while suspended failed",t)}i||this.setSuspendDrawing(!1,!e)},this.doWhileSuspended=this.batch,this.getCachedData=function(t){var e=C[t];return e?{o:e,s:E[t]}:it({elId:t})},this.show=function(t,e){return G(t,"block",e),i},this.toggleVisible=function(t,e){var n=null;e&&(n=function(t){var e=t.isVisible();t.setVisible(!e)}),R(t,function(t){var e=t.isVisible();t.setVisible(!e)},n)},this.addListener=this.bind;var ht=[];this.registerFloatingConnection=function(t,e,i){ht[t.id]=e,n.addToList(b,t.id,i)},this.getFloatingConnectionFor=function(t){return ht[t]},this.listManager=new t.jsPlumbListManager(this,this.Defaults.ListStyle)};n.extend(t.jsPlumbInstance,n.EventGenerator,{setAttribute:function(t,e,n){this.setAttribute(t,e,n)},getAttribute:function(e,n){return this.getAttribute(t.jsPlumb.getElement(e),n)},convertToFullOverlaySpec:function(t){return n.isString(t)&&(t=[t,{}]),t[1].id=t[1].id||n.uuid(),t},registerConnectionType:function(e,n){if(this._connectionTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._connectionTypes[e].overlays=i}},registerConnectionTypes:function(t){for(var e in t)this.registerConnectionType(e,t[e])},registerEndpointType:function(e,n){if(this._endpointTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._endpointTypes[e].overlays=i}},registerEndpointTypes:function(t){for(var e in t)this.registerEndpointType(e,t[e])},getType:function(t,e){return"connection"===e?this._connectionTypes[t]:this._endpointTypes[t]},setIdChanged:function(t,e){this.setId(t,e,!0)},setParent:function(t,e){var n=this.getElement(t),i=this.getId(n),o=this.getElement(e),s=this.getId(o),r=this.getDragManager();n.parentNode.removeChild(n),o.appendChild(n),r&&r.setParent(n,i,o,s)},extend:function(t,e,n){var i;if(n)for(i=0;i<n.length;i++)t[n[i]]=e[n[i]];else for(i in e)t[i]=e[i];return t},floatingConnections:{},getFloatingAnchorIndex:function(t){return t.endpoints[0].isFloating()?0:t.endpoints[1].isFloating()?1:-1},proxyConnection:function(t,e,n,i,o,s){var r,a=t.endpoints[e].elementId,l=t.endpoints[e];t.proxies=t.proxies||[],(r=t.proxies[e]?t.proxies[e].ep:this.addEndpoint(n,{endpoint:o(t,e),anchor:s(t,e),parameters:{isProxyEndpoint:!0}})).setDeleteOnEmpty(!0),t.proxies[e]={ep:r,originalEp:l},0===e?this.router.sourceOrTargetChanged(a,i,t,n,0):this.router.sourceOrTargetChanged(a,i,t,n,1),l.detachFromConnection(t,null,!0),r.connections=[t],t.endpoints[e]=r,l.setVisible(!1),t.setVisible(!0),this.revalidate(n)},unproxyConnection:function(t,e,n){if(null!=t._jsPlumb&&null!=t.proxies&&null!=t.proxies[e]){var i=t.proxies[e].originalEp.element,o=t.proxies[e].originalEp.elementId;t.endpoints[e]=t.proxies[e].originalEp,0===e?this.router.sourceOrTargetChanged(n,o,t,i,0):this.router.sourceOrTargetChanged(n,o,t,i,1),t.proxies[e].ep.detachFromConnection(t,null),t.proxies[e].originalEp.addConnection(t),t.isVisible()&&t.proxies[e].originalEp.setVisible(!0),delete t.proxies[e]}}});var d=new h;t.jsPlumb=d,d.getInstance=function(t,e){var n=new h(t);if(e)for(var i in e)n[i]=e[i];return n.init(),n},d.each=function(t,e){if(null!=t)if("string"==typeof t)e(d.getElement(t));else if(null!=t.length)for(var n=0;n<t.length;n++)e(d.getElement(t[n]));else e(t)},e.jsPlumb=d}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil;e.OverlayCapableJsPlumbUIComponent=function(e){t.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.overlays={},this._jsPlumb.overlayPositions={},e.label&&(this.getDefaultType().overlays.__label=["Label",{label:e.label,location:e.labelLocation||this.defaultLabelLocation||.5,labelStyle:e.labelStyle||this._jsPlumb.instance.Defaults.LabelStyle,id:"__label"}]),this.setListenerComponent=function(t){if(this._jsPlumb)for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].setListenerComponent(t)}},e.OverlayCapableJsPlumbUIComponent.applyType=function(t,e){if(e.overlays){var n,i={};for(n in e.overlays){var o=t._jsPlumb.overlays[e.overlays[n][1].id];if(o)o.updateFrom(e.overlays[n][1]),i[e.overlays[n][1].id]=!0,o.reattach(t._jsPlumb.instance,t);else{var s=t.getCachedTypeItem("overlay",e.overlays[n][1].id);null!=s?(s.reattach(t._jsPlumb.instance,t),s.setVisible(!0),s.updateFrom(e.overlays[n][1]),t._jsPlumb.overlays[s.id]=s):s=t.addOverlay(e.overlays[n],!0),i[s.id]=!0}}for(n in t._jsPlumb.overlays)null==i[t._jsPlumb.overlays[n].id]&&t.removeOverlay(t._jsPlumb.overlays[n].id,!0)}},n.extend(e.OverlayCapableJsPlumbUIComponent,t.jsPlumbUIComponent,{setHover:function(t,e){if(this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged())for(var n in this._jsPlumb.overlays)this._jsPlumb.overlays[n][t?"addClass":"removeClass"](this._jsPlumb.instance.hoverClass)},addOverlay:function(t,i){var o=function(t,i){var o=null;if(n.isArray(i)){var s=i[0],r=e.extend({component:t,_jsPlumb:t._jsPlumb.instance},i[1]);3===i.length&&e.extend(r,i[2]),o=new(e.Overlays[t._jsPlumb.instance.getRenderMode()][s])(r)}else o=i.constructor===String?new(e.Overlays[t._jsPlumb.instance.getRenderMode()][i])({component:t,_jsPlumb:t._jsPlumb.instance}):i;return o.id=o.id||n.uuid(),t.cacheTypeItem("overlay",o,o.id),t._jsPlumb.overlays[o.id]=o,o}(this,t);if(this.getData&&"Label"===o.type&&n.isArray(t)){var s=this.getData(),r=t[1];if(s){var a=r.labelLocationAttribute||"labelLocation",l=s?s[a]:null;l&&(o.loc=l)}}return i||this.repaint(),o},getOverlay:function(t){return this._jsPlumb.overlays[t]},getOverlays:function(){return this._jsPlumb.overlays},hideOverlay:function(t){var e=this.getOverlay(t);e&&e.hide()},hideOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].hide()},showOverlay:function(t){var e=this.getOverlay(t);e&&e.show()},showOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].show()},removeAllOverlays:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup&&this._jsPlumb.overlays[e].cleanup();this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null,this._jsPlumb.overlayPlacements={},t||this.repaint()},removeOverlay:function(t,e){var n=this._jsPlumb.overlays[t];n&&(n.setVisible(!1),!e&&n.cleanup&&n.cleanup(),delete this._jsPlumb.overlays[t],this._jsPlumb.overlayPositions&&delete this._jsPlumb.overlayPositions[t],this._jsPlumb.overlayPlacements&&delete this._jsPlumb.overlayPlacements[t])},removeOverlays:function(){for(var t=0,e=arguments.length;t<e;t++)this.removeOverlay(arguments[t])},moveParent:function(t){if(this.bgCanvas&&(this.bgCanvas.parentNode.removeChild(this.bgCanvas),t.appendChild(this.bgCanvas)),this.canvas&&this.canvas.parentNode)for(var e in this.canvas.parentNode.removeChild(this.canvas),t.appendChild(this.canvas),this._jsPlumb.overlays)if(this._jsPlumb.overlays[e].isAppendedAtTopLevel){var n=this._jsPlumb.overlays[e].getElement();n.parentNode.removeChild(n),t.appendChild(n)}},getLabel:function(){var t=this.getOverlay("__label");return null!=t?t.getLabel():null},getLabelOverlay:function(){return this.getOverlay("__label")},setLabel:function(t){var n=this.getOverlay("__label");n?t.constructor===String||t.constructor===Function?n.setLabel(t):(t.label&&n.setLabel(t.label),t.location&&n.setLocation(t.location)):(n=function(t,n){var i={cssClass:n.cssClass,labelStyle:t.labelStyle,id:"__label",component:t,_jsPlumb:t._jsPlumb.instance},o=e.extend(i,n);return new(e.Overlays[t._jsPlumb.instance.getRenderMode()].Label)(o)}(this,t.constructor===String||t.constructor===Function?{label:t}:t),this._jsPlumb.overlays.__label=n);this._jsPlumb.instance.isSuspendDrawing()||this.repaint()},cleanup:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup(t),this._jsPlumb.overlays[e].destroy(t);t&&(this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null)},setVisible:function(t){this[t?"showOverlays":"hideOverlays"]()},setAbsoluteOverlayPosition:function(t,e){this._jsPlumb.overlayPositions[t.id]=e},getAbsoluteOverlayPosition:function(t){return this._jsPlumb.overlayPositions?this._jsPlumb.overlayPositions[t.id]:null},_clazzManip:function(t,e,n){if(!n)for(var i in this._jsPlumb.overlays)this._jsPlumb.overlays[i][t+"Class"](e)},addClass:function(t,e){this._clazzManip("add",t,e)},removeClass:function(t,e){this._clazzManip("remove",t,e)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=["connectorStyle","connectorHoverStyle","connectorOverlays","connector","connectionType","connectorClass","connectorHoverClass"];t.Endpoint=function(i){var o=i._jsPlumb,s=i.newConnection,r=i.newEndpoint;this.idPrefix="_jsplumb_e_",this.defaultLabelLocation=[.5,.5],this.defaultOverlayKeys=["Overlays","EndpointOverlays"],t.OverlayCapableJsPlumbUIComponent.apply(this,arguments),this.appendToDefaultType({connectionType:i.connectionType,maxConnections:null==i.maxConnections?this._jsPlumb.instance.Defaults.MaxConnections:i.maxConnections,paintStyle:i.endpointStyle||i.paintStyle||i.style||this._jsPlumb.instance.Defaults.EndpointStyle||t.Defaults.EndpointStyle,hoverPaintStyle:i.endpointHoverStyle||i.hoverPaintStyle||this._jsPlumb.instance.Defaults.EndpointHoverStyle||t.Defaults.EndpointHoverStyle,connectorStyle:i.connectorStyle,connectorHoverStyle:i.connectorHoverStyle,connectorClass:i.connectorClass,connectorHoverClass:i.connectorHoverClass,connectorOverlays:i.connectorOverlays,connector:i.connector,connectorTooltip:i.connectorTooltip}),this._jsPlumb.enabled=!(!1===i.enabled),this._jsPlumb.visible=!0,this.element=t.getElement(i.source),this._jsPlumb.uuid=i.uuid,this._jsPlumb.floatingEndpoint=null,this._jsPlumb.uuid&&(i.endpointsByUUID[this._jsPlumb.uuid]=this),this.elementId=i.elementId,this.dragProxy=i.dragProxy,this._jsPlumb.connectionCost=i.connectionCost,this._jsPlumb.connectionsDirected=i.connectionsDirected,this._jsPlumb.currentAnchorClass="",this._jsPlumb.events={};var a=!0===i.deleteOnEmpty;this.setDeleteOnEmpty=function(t){a=t};var l=function(){var e=o.endpointAnchorClassPrefix+"-"+this._jsPlumb.currentAnchorClass;this._jsPlumb.currentAnchorClass=this.anchor.getCssClass();var n=o.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");this.removeClass(e),this.addClass(n),t.updateClasses(this.element,n,e)}.bind(this);this.prepareAnchor=function(t){var e=this._jsPlumb.instance.makeAnchor(t,this.elementId,o);return e.bind("anchorChanged",function(t){this.fire("anchorChanged",{endpoint:this,anchor:t}),l()}.bind(this)),e},this.setPreparedAnchor=function(t,e){return this._jsPlumb.instance.continuousAnchorFactory.clear(this.elementId),this.anchor=t,l(),e||this._jsPlumb.instance.repaint(this.elementId),this},this.setAnchor=function(t,e){var n=this.prepareAnchor(t);return this.setPreparedAnchor(n,e),this};var u=function(t){if(this.connections.length>0)for(var e=0;e<this.connections.length;e++)this.connections[e].setHover(t,!1);else this.setHover(t)}.bind(this);this.bind("mouseover",function(){u(!0)}),this.bind("mouseout",function(){u(!1)}),i._transient||this._jsPlumb.instance.router.addEndpoint(this,this.elementId),this.prepareEndpoint=function(n,s){var r,a=function(e,n){var i=o.getRenderMode();if(t.Endpoints[i][e])return new t.Endpoints[i][e](n);if(!o.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown endpoint type '"+e+"'"}},l={_jsPlumb:this._jsPlumb.instance,cssClass:i.cssClass,container:i.container,tooltip:i.tooltip,connectorTooltip:i.connectorTooltip,endpoint:this};return e.isString(n)?r=a(n,l):e.isArray(n)?(l=e.merge(n[1],l),r=a(n[0],l)):r=n.clone(),r.clone=function(){return e.isString(n)?a(n,l):e.isArray(n)?(l=e.merge(n[1],l),a(n[0],l)):void 0}.bind(this),r.typeId=s,r},this.setEndpoint=function(t,e){var n=this.prepareEndpoint(t);this.setPreparedEndpoint(n,!0)},this.setPreparedEndpoint=function(t,e){null!=this.endpoint&&(this.endpoint.cleanup(),this.endpoint.destroy()),this.endpoint=t,this.type=this.endpoint.type,this.canvas=this.endpoint.canvas},t.extend(this,i,n),this.isSource=i.isSource||!1,this.isTemporarySource=i.isTemporarySource||!1,this.isTarget=i.isTarget||!1,this.connections=i.connections||[],this.connectorPointerEvents=i["connector-pointer-events"],this.scope=i.scope||o.getDefaultScope(),this.timestamp=null,this.reattachConnections=i.reattach||o.Defaults.ReattachConnections,this.connectionsDetachable=o.Defaults.ConnectionsDetachable,!1!==i.connectionsDetachable&&!1!==i.detachable||(this.connectionsDetachable=!1),this.dragAllowedWhenFull=!1!==i.dragAllowedWhenFull,i.onMaxConnections&&this.bind("maxConnections",i.onMaxConnections),this.addConnection=function(t){this.connections.push(t),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)},this.detachFromConnection=function(t,e,n){(e=null==e?this.connections.indexOf(t):e)>=0&&(this.connections.splice(e,1),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)),!n&&a&&0===this.connections.length&&o.deleteObject({endpoint:this,fireEvent:!1,deleteAttachedObjects:!0!==n})},this.deleteEveryConnection=function(t){for(var e=this.connections.length,n=0;n<e;n++)o.deleteConnection(this.connections[0],t)},this.detachFrom=function(t,e,n){for(var i=[],s=0;s<this.connections.length;s++)this.connections[s].endpoints[1]!==t&&this.connections[s].endpoints[0]!==t||i.push(this.connections[s]);for(var r=0,a=i.length;r<a;r++)o.deleteConnection(i[0]);return this},this.getElement=function(){return this.element},this.setElement=function(n){var s=this._jsPlumb.instance.getId(n),r=this.elementId;return e.removeWithFunction(i.endpointsByElement[this.elementId],function(t){return t.id===this.id}.bind(this)),this.element=t.getElement(n),this.elementId=o.getId(this.element),o.router.rehomeEndpoint(this,r,this.element),o.dragManager.endpointAdded(this.element),e.addToList(i.endpointsByElement,s,this),this},this.makeInPlaceCopy=function(){var t=this.anchor.getCurrentLocation({element:this}),e=this.anchor.getOrientation(this),n=this.anchor.getCssClass(),o={bind:function(){},compute:function(){return[t[0],t[1]]},getCurrentLocation:function(){return[t[0],t[1]]},getOrientation:function(){return e},getCssClass:function(){return n}};return r({dropOptions:i.dropOptions,anchor:o,source:this.element,paintStyle:this.getPaintStyle(),endpoint:i.hideOnDrag?"Blank":this.endpoint,_transient:!0,scope:this.scope,reference:this})},this.connectorSelector=function(){return this.connections[0]},this.setStyle=this.setPaintStyle,this.paint=function(t){var e=(t=t||{}).timestamp,n=!(!1===t.recalc);if(!e||this.timestamp!==e){var i=o.updateOffset({elId:this.elementId,timestamp:e}),s=t.offset?t.offset.o:i.o;if(null!=s){var r=t.anchorPoint,a=t.connectorPaintStyle;if(null==r){var l=t.dimensions||i.s,u={xy:[s.left,s.top],wh:l,element:this,timestamp:e};if(n&&this.anchor.isDynamic&&this.connections.length>0){var c=function(t,e){var n=0;if(null!=e)for(var i=0;i<t.connections.length;i++)if(t.connections[i].sourceId===e||t.connections[i].targetId===e){n=i;break}return t.connections[n]}(this,t.elementWithPrecedence),h=c.endpoints[0]===this?1:0,d=0===h?c.sourceId:c.targetId,p=o.getCachedData(d),f=p.o,g=p.s;u.index=0===h?1:0,u.connection=c,u.txy=[f.left,f.top],u.twh=g,u.tElement=c.endpoints[h],u.tRotation=o.getRotation(d)}else this.connections.length>0&&(u.connection=this.connections[0]);u.rotation=o.getRotation(this.elementId),r=this.anchor.compute(u)}for(var m in this.endpoint.compute(r,this.anchor.getOrientation(this),this._jsPlumb.paintStyleInUse,a||this.paintStyleInUse),this.endpoint.paint(this._jsPlumb.paintStyleInUse,this.anchor),this.timestamp=e,this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&(this._jsPlumb.overlayPlacements[m]=v.draw(this.endpoint,this._jsPlumb.paintStyleInUse),v.paint(this._jsPlumb.overlayPlacements[m]))}}}},this.getTypeDescriptor=function(){return"endpoint"},this.isVisible=function(){return this._jsPlumb.visible},this.repaint=this.paint;var c=!1;this.initDraggable=function(){if(!c&&t.isDragSupported(this.element)){var n,a={id:null,element:null},l=null,u=!1,h=null,d=function(t,e,n){var i=!1;return{drag:function(){if(i)return i=!1,!0;if(e.element){var o=n.getUIPosition(arguments,n.getZoom());null!=o&&n.setPosition(e.element,o),n.repaint(e.element,o),t.paint({anchorPoint:t.anchor.getCurrentLocation({element:t})})}},stopDrag:function(){i=!0}}}(this,a,o),p=i.dragOptions||{},f=t.dragEvents.start,g=t.dragEvents.stop,m=t.dragEvents.drag,v=t.dragEvents.beforeStart,y=function(e){l=this.connectorSelector();var c=!0;this.isEnabled()||(c=!1),null!=l||this.isSource||this.isTemporarySource||(c=!1),!this.isSource||!this.isFull()||null!=l&&this.dragAllowedWhenFull||(c=!1),null==l||l.isDetachable(this)||(this.isFull()?c=!1:l=null);var p=o.checkCondition(null==l?"beforeDrag":"beforeStartDetach",{endpoint:this,source:this.element,sourceId:this.elementId,connection:l});if(!1===p?c=!1:"object"==typeof p?t.extend(p,n||{}):p=n||{},!1===c)return o.stopDrag&&o.stopDrag(this.canvas),d.stopDrag(),!1;for(var f=0;f<this.connections.length;f++)this.connections[f].setHover(!1);this.addClass("endpointDrag"),o.setConnectionBeingDragged(!0),l&&!this.isFull()&&this.isSource&&(l=null),o.updateOffset({elId:this.elementId});var g=this._jsPlumb.instance.getOffset(this.canvas),m=this.canvas,v=this._jsPlumb.instance.getSize(this.canvas);!function(t,e,n,i){var o=e.createElement("div",{position:"absolute"});e.appendElement(o);var s=e.getId(o);e.setPosition(o,n),o.style.width=i[0]+"px",o.style.height=i[1]+"px",e.manage(s,o,!0),t.id=s,t.element=o}(a,o,g,v),o.setAttributes(this.canvas,{dragId:a.id,elId:this.elementId});var y=this.dragProxy||this.endpoint;if(null==this.dragProxy&&null!=this.connectionType){var b=this._jsPlumb.instance.deriveEndpointAndAnchorSpec(this.connectionType);b.endpoints[1]&&(y=b.endpoints[1])}var P=this._jsPlumb.instance.makeAnchor("Center");P.isFloating=!0,this._jsPlumb.floatingEndpoint=function(e,n,i,o,s,r,a,l){return a({paintStyle:e,endpoint:i,anchor:new t.FloatingAnchor({reference:n,referenceCanvas:o,jsPlumbInstance:r}),source:s,scope:l})}(this.getPaintStyle(),P,y,this.canvas,a.element,o,r,this.scope);var x=this._jsPlumb.floatingEndpoint.anchor;if(null==l)this.setHover(!1,!1),(l=s({sourceEndpoint:this,targetEndpoint:this._jsPlumb.floatingEndpoint,source:this.element,target:a.element,anchors:[this.anchor,this._jsPlumb.floatingEndpoint.anchor],paintStyle:i.connectorStyle,hoverPaintStyle:i.connectorHoverStyle,connector:i.connector,overlays:i.connectorOverlays,type:this.connectionType,cssClass:this.connectorClass,hoverClass:this.connectorHoverClass,scope:i.scope,data:p})).pending=!0,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.anchor=x,o.fire("connectionDrag",l),o.router.newConnection(l);else{u=!0,l.setHover(!1);var C=l.endpoints[0].id===this.id?0:1;this.detachFromConnection(l,null,!0);var _=o.getDragScope(m);o.setAttribute(this.canvas,"originalScope",_),o.fire("connectionDrag",l),0===C?(h=[l.source,l.sourceId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,0)):(h=[l.target,l.targetId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,1)),l.suspendedEndpoint=l.endpoints[C],l.suspendedElement=l.endpoints[C].getElement(),l.suspendedElementId=l.endpoints[C].elementId,l.suspendedElementType=0===C?"source":"target",l.suspendedEndpoint.setHover(!1),this._jsPlumb.floatingEndpoint.referenceEndpoint=l.suspendedEndpoint,l.endpoints[C]=this._jsPlumb.floatingEndpoint,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass)}o.registerFloatingConnection(a,l,this._jsPlumb.floatingEndpoint),o.currentlyDragging=!0}.bind(this),b=function(){if(o.setConnectionBeingDragged(!1),l&&null!=l.endpoints){var t=o.getDropEvent(arguments),e=o.getFloatingAnchorIndex(l);if(l.endpoints[0===e?1:0].anchor.locked=!1,l.removeClass(o.draggingClass),this._jsPlumb&&(l.deleteConnectionNow||l.endpoints[e]===this._jsPlumb.floatingEndpoint)&&u&&l.suspendedEndpoint){0===e?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=h[0],l.sourceId=h[1]):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=h[0],l.targetId=h[1]);var n=this._jsPlumb.floatingEndpoint;o.setDragScope(h[2],h[3]),l.endpoints[e]=l.suspendedEndpoint,l.isReattach()||l._forceReattach||l._forceDetach||!o.deleteConnection(l,{originalEvent:t})?(l.setHover(!1),l._forceDetach=null,l._forceReattach=null,this._jsPlumb.floatingEndpoint.detachFromConnection(l),l.suspendedEndpoint.addConnection(l),1===e?o.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,e):o.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,e),o.repaint(h[1])):o.deleteObject({endpoint:n})}this.deleteAfterDragStop?o.deleteObject({endpoint:this}):this._jsPlumb&&this.paint({recalc:!1}),o.fire("connectionDragStop",l,t),l.pending&&o.fire("connectionAborted",l,t),o.currentlyDragging=!1,l.suspendedElement=null,l.suspendedEndpoint=null,l=null}a&&a.element&&o.remove(a.element,!1,!1),this._jsPlumb&&(this.canvas.style.visibility="visible",this.anchor.locked=!1,this._jsPlumb.floatingEndpoint=null)}.bind(this);(p=t.extend({},p)).scope=this.scope||p.scope,p[v]=e.wrap(p[v],function(t){n=t.e.payload||{}},!1),p[f]=e.wrap(p[f],y,!1),p[m]=e.wrap(p[m],d.drag),p[g]=e.wrap(p[g],b),p.multipleDrop=!1,p.canDrag=function(){return this.isSource||this.isTemporarySource||this.connections.length>0&&!1!==this.connectionsDetachable}.bind(this),o.initDraggable(this.canvas,p,"internal"),this.canvas._jsPlumbRelatedElement=this.element,c=!0}};var h=i.endpoint||this._jsPlumb.instance.Defaults.Endpoint||t.Defaults.Endpoint;this.setEndpoint(h,!0);var d=i.anchor?i.anchor:i.anchors?i.anchors:o.Defaults.Anchor||"Top";this.setAnchor(d,!0);var p=["default",i.type||""].join(" ");this.addType(p,i.data,!0),this.canvas=this.endpoint.canvas,this.canvas._jsPlumb=this,this.initDraggable();var f=function(n,s,r,a){if(t.isDropSupported(this.element)){var l=i.dropOptions||o.Defaults.DropOptions||t.Defaults.DropOptions;(l=t.extend({},l)).scope=l.scope||this.scope;var u=t.dragEvents.drop,c=t.dragEvents.over,h=t.dragEvents.out,d=this,p=o.EndpointDropHandler({getEndpoint:function(){return d},jsPlumb:o,enabled:function(){return null==r||r.isEnabled()},isFull:function(){return r.isFull()},element:this.element,elementId:this.elementId,isSource:this.isSource,isTarget:this.isTarget,addClass:function(t){d.addClass(t)},removeClass:function(t){d.removeClass(t)},isDropAllowed:function(){return d.isDropAllowed.apply(d,arguments)},reference:a,isRedrop:function(t,e){return t.suspendedEndpoint&&e.reference&&t.suspendedEndpoint.id===e.reference.id}});l[u]=e.wrap(l[u],p,!0),l[c]=e.wrap(l[c],function(){var e=t.getDragObject(arguments),n=o.getAttribute(t.getElement(e),"dragId"),i=o.getFloatingConnectionFor(n);if(null!=i){var s=o.getFloatingAnchorIndex(i);if(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id){var r=o.checkCondition("checkDropAllowed",{sourceEndpoint:i.endpoints[s],targetEndpoint:this,connection:i});this[(r?"add":"remove")+"Class"](o.endpointDropAllowedClass),this[(r?"remove":"add")+"Class"](o.endpointDropForbiddenClass),i.endpoints[s].anchor.over(this.anchor,this)}}}.bind(this)),l[h]=e.wrap(l[h],function(){var e=t.getDragObject(arguments),n=null==e?null:o.getAttribute(t.getElement(e),"dragId"),i=n?o.getFloatingConnectionFor(n):null;if(null!=i){var s=o.getFloatingAnchorIndex(i);(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id)&&(this.removeClass(o.endpointDropAllowedClass),this.removeClass(o.endpointDropForbiddenClass),i.endpoints[s].anchor.out())}}.bind(this)),o.initDroppable(n,l,"internal",s)}}.bind(this);return this.anchor.isFloating||f(this.canvas,!(i._transient||this.anchor.isFloating),this,i.reference),this},e.extend(t.Endpoint,t.OverlayCapableJsPlumbUIComponent,{setVisible:function(t,e,n){if(this._jsPlumb.visible=t,this.canvas&&(this.canvas.style.display=t?"block":"none"),this[t?"showOverlays":"hideOverlays"](),!e)for(var i=0;i<this.connections.length;i++)if(this.connections[i].setVisible(t),!n){var o=this===this.connections[i].endpoints[0]?1:0;1===this.connections[i].endpoints[o].connections.length&&this.connections[i].endpoints[o].setVisible(t,!0,!0)}},getAttachedElements:function(){return this.connections},applyType:function(e,i){this.setPaintStyle(e.endpointStyle||e.paintStyle,i),this.setHoverPaintStyle(e.endpointHoverStyle||e.hoverPaintStyle,i),null!=e.maxConnections&&(this._jsPlumb.maxConnections=e.maxConnections),e.scope&&(this.scope=e.scope),t.extend(this,e,n),null!=e.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,e.cssClass),t.OverlayCapableJsPlumbUIComponent.applyType(this,e)},isEnabled:function(){return this._jsPlumb.enabled},setEnabled:function(t){this._jsPlumb.enabled=t},cleanup:function(){var e=this._jsPlumb.instance.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");t.removeClass(this.element,e),this.anchor=null,this.endpoint.cleanup(!0),this.endpoint.destroy(),this.endpoint=null,this._jsPlumb.instance.destroyDraggable(this.canvas,"internal"),this._jsPlumb.instance.destroyDroppable(this.canvas,"internal")},setHover:function(t){this.endpoint&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&this.endpoint.setHover(t)},isFull:function(){return 0===this._jsPlumb.maxConnections||!(this.isFloating()||this._jsPlumb.maxConnections<0||this.connections.length<this._jsPlumb.maxConnections)},isFloating:function(){return null!=this.anchor&&this.anchor.isFloating},isConnectedTo:function(t){var e=!1;if(t)for(var n=0;n<this.connections.length;n++)if(this.connections[n].endpoints[1]===t||this.connections[n].endpoints[0]===t){e=!0;break}return e},getConnectionCost:function(){return this._jsPlumb.connectionCost},setConnectionCost:function(t){this._jsPlumb.connectionCost=t},areConnectionsDirected:function(){return this._jsPlumb.connectionsDirected},setConnectionsDirected:function(t){this._jsPlumb.connectionsDirected=t},setElementId:function(t){this.elementId=t,this.anchor.elementId=t},setReferenceElement:function(e){this.element=t.getElement(e)},setDragAllowedWhenFull:function(t){this.dragAllowedWhenFull=t},equals:function(t){return this.anchor.equals(t.anchor)},getUuid:function(){return this._jsPlumb.uuid},computeAnchor:function(t){return this.anchor.compute(t)}}),this.jsPlumbInstance.prototype.EndpointDropHandler=function(t){return function(n){var i=t.jsPlumb;t.removeClass(i.endpointDropAllowedClass),t.removeClass(i.endpointDropForbiddenClass);var o=i.getDropEvent(arguments),s=i.getDragObject(arguments),r=i.getAttribute(s,"dragId"),a=(i.getAttribute(s,"elId"),i.getAttribute(s,"originalScope")),l=i.getFloatingConnectionFor(r);if(null!=l){var u=null!=l.suspendedEndpoint;if(!u||null!=l.suspendedEndpoint._jsPlumb){var c=t.getEndpoint(l);if(null!=c){if(t.isRedrop(l,t))return l._forceReattach=!0,l.setHover(!1),void(t.maybeCleanup&&t.maybeCleanup(c));var h=i.getFloatingAnchorIndex(l);if(0===h&&!t.isSource||1===h&&!t.isTarget)t.maybeCleanup&&t.maybeCleanup(c);else{t.onDrop&&t.onDrop(l),a&&i.setDragScope(s,a);var d=t.isFull(n);if(d&&c.fire("maxConnections",{endpoint:this,connection:l,maxConnections:c._jsPlumb.maxConnections},o),!d&&t.enabled()){var p=!0;0===h?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=t.element,l.sourceId=i.getId(t.element)):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=t.element,l.targetId=i.getId(t.element)),u&&l.suspendedEndpoint.id!==c.id&&(l.isDetachAllowed(l)&&l.endpoints[h].isDetachAllowed(l)&&l.suspendedEndpoint.isDetachAllowed(l)&&i.checkCondition("beforeDetach",l)||(p=!1));var f=function(n){l.endpoints[h].detachFromConnection(l),l.suspendedEndpoint&&l.suspendedEndpoint.detachFromConnection(l),l.endpoints[h]=c,c.addConnection(l);var s=c.getParameters();for(var r in s)l.setParameter(r,s[r]);if(u){var a=l.suspendedEndpoint.elementId;i.fireMoveEvent({index:h,originalSourceId:0===h?a:l.sourceId,newSourceId:0===h?c.elementId:l.sourceId,originalTargetId:1===h?a:l.targetId,newTargetId:1===h?c.elementId:l.targetId,originalSourceEndpoint:0===h?l.suspendedEndpoint:l.endpoints[0],newSourceEndpoint:0===h?c:l.endpoints[0],originalTargetEndpoint:1===h?l.suspendedEndpoint:l.endpoints[1],newTargetEndpoint:1===h?c:l.endpoints[1],connection:l},o)}else s.draggable&&i.initDraggable(this.element,t.dragOptions,"internal",i);(1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),l.endpoints[0].finalEndpoint)&&(l.endpoints[0].detachFromConnection(l),l.endpoints[0]=l.endpoints[0].finalEndpoint,l.endpoints[0].addConnection(l));e.isObject(n)&&l.mergeData(n),i.finaliseConnection(l,null,o,!1),l.setHover(!1),i.revalidate(l.endpoints[0].element)}.bind(this);if(p=p&&t.isDropAllowed(l.sourceId,l.targetId,l.scope,l,c))return f(p),!0;l.suspendedEndpoint&&(l.endpoints[h]=l.suspendedEndpoint,l.setHover(!1),l._forceDetach=!0,0===h?(l.source=l.suspendedEndpoint.element,l.sourceId=l.suspendedEndpoint.elementId):(l.target=l.suspendedEndpoint.element,l.targetId=l.suspendedEndpoint.elementId),l.suspendedEndpoint.addConnection(l),1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),i.repaint(l.sourceId),l._forceDetach=!1)}t.maybeCleanup&&t.maybeCleanup(c),i.currentlyDragging=!1}}}}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=function(t,i,o,s,r){if(e.Connectors[i]=e.Connectors[i]||{},null==e.Connectors[i][o]){if(null==e.Connectors[o]){if(t.Defaults.DoNotThrowErrors)return null;throw new TypeError("jsPlumb: unknown connector type '"+o+"'")}e.Connectors[i][o]=function(){e.Connectors[o].apply(this,arguments),e.ConnectorRenderers[i].apply(this,arguments)},n.extend(e.Connectors[i][o],[e.Connectors[o],e.ConnectorRenderers[i]])}return new e.Connectors[i][o](s,r)},o=function(t,e,n){return t?n.makeAnchor(t,e,n):null},s=function(t,e,i,o){null!=e&&(e._jsPlumbConnections=e._jsPlumbConnections||{},o?delete e._jsPlumbConnections[t.id]:e._jsPlumbConnections[t.id]=!0,n.isEmpty(e._jsPlumbConnections)?i.removeClass(e,i.connectedClass):i.addClass(e,i.connectedClass))};e.Connection=function(t){var i=t.newEndpoint;this.id=t.id,this.connector=null,this.idPrefix="_jsplumb_c_",this.defaultLabelLocation=.5,this.defaultOverlayKeys=["Overlays","ConnectionOverlays"],this.previousConnection=t.previousConnection,this.source=e.getElement(t.source),this.target=e.getElement(t.target),e.OverlayCapableJsPlumbUIComponent.apply(this,arguments),t.sourceEndpoint?(this.source=t.sourceEndpoint.getElement(),this.sourceId=t.sourceEndpoint.elementId):this.sourceId=this._jsPlumb.instance.getId(this.source),t.targetEndpoint?(this.target=t.targetEndpoint.getElement(),this.targetId=t.targetEndpoint.elementId):this.targetId=this._jsPlumb.instance.getId(this.target),this.scope=t.scope,this.endpoints=[],this.endpointStyles=[];var o=this._jsPlumb.instance;o.manage(this.sourceId,this.source),o.manage(this.targetId,this.target),this._jsPlumb.visible=!0,this._jsPlumb.params={cssClass:t.cssClass,container:t.container,"pointer-events":t["pointer-events"],editorParams:t.editorParams,overlays:t.overlays},this._jsPlumb.lastPaintedAt=null,this.bind("mouseover",function(){this.setHover(!0)}.bind(this)),this.bind("mouseout",function(){this.setHover(!1)}.bind(this)),this.makeEndpoint=function(e,n,s,r,a){return s=s||this._jsPlumb.instance.getId(n),this.prepareEndpoint(o,i,this,r,e?0:1,t,n,s,a)},t.type&&(t.endpoints=t.endpoints||this._jsPlumb.instance.deriveEndpointAndAnchorSpec(t.type).endpoints);var s=this.makeEndpoint(!0,this.source,this.sourceId,t.sourceEndpoint),r=this.makeEndpoint(!1,this.target,this.targetId,t.targetEndpoint);s&&n.addToList(t.endpointsByElement,this.sourceId,s),r&&n.addToList(t.endpointsByElement,this.targetId,r),this.scope||(this.scope=this.endpoints[0].scope),null!=t.deleteEndpointsOnEmpty&&(this.endpoints[0].setDeleteOnEmpty(t.deleteEndpointsOnEmpty),this.endpoints[1].setDeleteOnEmpty(t.deleteEndpointsOnEmpty));var a=o.Defaults.ConnectionsDetachable;!1===t.detachable&&(a=!1),!1===this.endpoints[0].connectionsDetachable&&(a=!1),!1===this.endpoints[1].connectionsDetachable&&(a=!1);var l=t.reattach||this.endpoints[0].reattachConnections||this.endpoints[1].reattachConnections||o.Defaults.ReattachConnections;this.appendToDefaultType({detachable:a,reattach:l,paintStyle:this.endpoints[0].connectorStyle||this.endpoints[1].connectorStyle||t.paintStyle||o.Defaults.PaintStyle||e.Defaults.PaintStyle,hoverPaintStyle:this.endpoints[0].connectorHoverStyle||this.endpoints[1].connectorHoverStyle||t.hoverPaintStyle||o.Defaults.HoverPaintStyle||e.Defaults.HoverPaintStyle});var u=o.getSuspendedAt();if(!o.isSuspendDrawing()){var c=o.getCachedData(this.sourceId),h=c.o,d=c.s,p=o.getCachedData(this.targetId),f=p.o,g=p.s,m=u||jsPlumbUtil.uuid(),v=this.endpoints[0].anchor.compute({xy:[h.left,h.top],wh:d,element:this.endpoints[0],elementId:this.endpoints[0].elementId,txy:[f.left,f.top],twh:g,tElement:this.endpoints[1],timestamp:m,rotation:o.getRotation(this.endpoints[0].elementId)});this.endpoints[0].paint({anchorLoc:v,timestamp:m}),v=this.endpoints[1].anchor.compute({xy:[f.left,f.top],wh:g,element:this.endpoints[1],elementId:this.endpoints[1].elementId,txy:[h.left,h.top],twh:d,tElement:this.endpoints[0],timestamp:m,rotation:o.getRotation(this.endpoints[1].elementId)}),this.endpoints[1].paint({anchorLoc:v,timestamp:m})}this.getTypeDescriptor=function(){return"connection"},this.getAttachedElements=function(){return this.endpoints},this.isDetachable=function(t){return!1!==this._jsPlumb.detachable&&(null!=t?!0===t.connectionsDetachable:!0===this._jsPlumb.detachable)},this.setDetachable=function(t){this._jsPlumb.detachable=!0===t},this.isReattach=function(){return!0===this._jsPlumb.reattach||!0===this.endpoints[0].reattachConnections||!0===this.endpoints[1].reattachConnections},this.setReattach=function(t){this._jsPlumb.reattach=!0===t},this._jsPlumb.cost=t.cost||this.endpoints[0].getConnectionCost(),this._jsPlumb.directed=t.directed,null==t.directed&&(this._jsPlumb.directed=this.endpoints[0].areConnectionsDirected());var y=e.extend({},this.endpoints[1].getParameters());e.extend(y,this.endpoints[0].getParameters()),e.extend(y,this.getParameters()),this.setParameters(y),this.setConnector(this.endpoints[0].connector||this.endpoints[1].connector||t.connector||o.Defaults.Connector||e.Defaults.Connector,!0);var b=null!=t.data&&n.isObject(t.data)?t.data:{};this.getData=function(){return b},this.setData=function(t){b=t||{}},this.mergeData=function(t){b=e.extend(b,t)};var P=["default",this.endpoints[0].connectionType,this.endpoints[1].connectionType,t.type].join(" ");/[^\s]/.test(P)&&this.addType(P,t.data,!0),this.updateConnectedClass()},n.extend(e.Connection,e.OverlayCapableJsPlumbUIComponent,{applyType:function(t,n,i){var o=null;null!=t.connector&&(null==(o=this.getCachedTypeItem("connector",i.connector))&&(o=this.prepareConnector(t.connector,i.connector),this.cacheTypeItem("connector",o,i.connector)),this.setPreparedConnector(o)),null!=t.detachable&&this.setDetachable(t.detachable),null!=t.reattach&&this.setReattach(t.reattach),t.scope&&(this.scope=t.scope),null!=t.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,t.cssClass);var s=null;t.anchor?null==(s=this.getCachedTypeItem("anchors",i.anchor))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchor),this._jsPlumb.instance.makeAnchor(t.anchor)],this.cacheTypeItem("anchors",s,i.anchor)):t.anchors&&null==(s=this.getCachedTypeItem("anchors",i.anchors))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchors[0]),this._jsPlumb.instance.makeAnchor(t.anchors[1])],this.cacheTypeItem("anchors",s,i.anchors)),null!=s&&(this.endpoints[0].anchor=s[0],this.endpoints[1].anchor=s[1],this.endpoints[1].anchor.isDynamic&&this._jsPlumb.instance.repaint(this.endpoints[1].elementId)),e.OverlayCapableJsPlumbUIComponent.applyType(this,t)},addClass:function(t,e){e&&(this.endpoints[0].addClass(t),this.endpoints[1].addClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.addClass(t)),this.connector&&this.connector.addClass(t)},removeClass:function(t,e){e&&(this.endpoints[0].removeClass(t),this.endpoints[1].removeClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.removeClass(t)),this.connector&&this.connector.removeClass(t)},isVisible:function(){return this._jsPlumb.visible},setVisible:function(t){this._jsPlumb.visible=t,this.connector&&this.connector.setVisible(t),this.repaint()},cleanup:function(){this.updateConnectedClass(!0),this.endpoints=null,this.source=null,this.target=null,null!=this.connector&&(this.connector.cleanup(!0),this.connector.destroy(!0)),this.connector=null},updateConnectedClass:function(t){this._jsPlumb&&(s(this,this.source,this._jsPlumb.instance,t),s(this,this.target,this._jsPlumb.instance,t))},setHover:function(e){this.connector&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&(this.connector.setHover(e),t.jsPlumb[e?"addClass":"removeClass"](this.source,this._jsPlumb.instance.hoverSourceClass),t.jsPlumb[e?"addClass":"removeClass"](this.target,this._jsPlumb.instance.hoverTargetClass))},getUuids:function(){return[this.endpoints[0].getUuid(),this.endpoints[1].getUuid()]},getCost:function(){return this._jsPlumb?this._jsPlumb.cost:-1/0},setCost:function(t){this._jsPlumb.cost=t},isDirected:function(){return this._jsPlumb.directed},getConnector:function(){return this.connector},prepareConnector:function(t,e){var o,s={_jsPlumb:this._jsPlumb.instance,cssClass:this._jsPlumb.params.cssClass,container:this._jsPlumb.params.container,"pointer-events":this._jsPlumb.params["pointer-events"]},r=this._jsPlumb.instance.getRenderMode();return n.isString(t)?o=i(this._jsPlumb.instance,r,t,s,this):n.isArray(t)&&(o=1===t.length?i(this._jsPlumb.instance,r,t[0],s,this):i(this._jsPlumb.instance,r,t[0],n.merge(t[1],s),this)),null!=e&&(o.typeId=e),o},setPreparedConnector:function(t,e,n,i){if(this.connector!==t){var o,s="";if(null!=this.connector&&(s=(o=this.connector).getClass(),this.connector.cleanup(),this.connector.destroy()),this.connector=t,i&&this.cacheTypeItem("connector",t,i),this.canvas=this.connector.canvas,this.bgCanvas=this.connector.bgCanvas,this.connector.reattach(this._jsPlumb.instance),this.addClass(s),this.canvas&&(this.canvas._jsPlumb=this),this.bgCanvas&&(this.bgCanvas._jsPlumb=this),null!=o)for(var r=this.getOverlays(),a=0;a<r.length;a++)r[a].transfer&&r[a].transfer(this.connector);n||this.setListenerComponent(this.connector),e||this.repaint()}},setConnector:function(t,e,n,i){var o=this.prepareConnector(t,i);this.setPreparedConnector(o,e,n,i)},paint:function(t){if(!this._jsPlumb.instance.isSuspendDrawing()&&this._jsPlumb.visible){var e=(t=t||{}).timestamp,n=this.targetId,i=this.sourceId;if(null==e||e!==this._jsPlumb.lastPaintedAt){var o=this._jsPlumb.instance.updateOffset({elId:i}).o,s=this._jsPlumb.instance.updateOffset({elId:n}).o,r=this.endpoints[0],a=this.endpoints[1],l=r.anchor.getCurrentLocation({xy:[o.left,o.top],wh:[o.width,o.height],element:r,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.sourceId)}),u=a.anchor.getCurrentLocation({xy:[s.left,s.top],wh:[s.width,s.height],element:a,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.targetId)});this.connector.resetBounds(),this.connector.compute({sourcePos:l,targetPos:u,sourceOrientation:r.anchor.getOrientation(r),targetOrientation:a.anchor.getOrientation(a),sourceEndpoint:this.endpoints[0],targetEndpoint:this.endpoints[1],"stroke-width":this._jsPlumb.paintStyleInUse.strokeWidth,sourceInfo:o,targetInfo:s});var c={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0};for(var h in this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(h)){var d=this._jsPlumb.overlays[h];d.isVisible()&&(this._jsPlumb.overlayPlacements[h]=d.draw(this.connector,this._jsPlumb.paintStyleInUse,this.getAbsoluteOverlayPosition(d)),c.minX=Math.min(c.minX,this._jsPlumb.overlayPlacements[h].minX),c.maxX=Math.max(c.maxX,this._jsPlumb.overlayPlacements[h].maxX),c.minY=Math.min(c.minY,this._jsPlumb.overlayPlacements[h].minY),c.maxY=Math.max(c.maxY,this._jsPlumb.overlayPlacements[h].maxY))}var p=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||1)/2,f=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||0),g={xmin:Math.min(this.connector.bounds.minX-(p+f),c.minX),ymin:Math.min(this.connector.bounds.minY-(p+f),c.minY),xmax:Math.max(this.connector.bounds.maxX+(p+f),c.maxX),ymax:Math.max(this.connector.bounds.maxY+(p+f),c.maxY)};for(var m in this.connector.paintExtents=g,this.connector.paint(this._jsPlumb.paintStyleInUse,null,g),this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&v.paint(this._jsPlumb.overlayPlacements[m],g)}}this._jsPlumb.lastPaintedAt=e}},repaint:function(t){var e=jsPlumb.extend(t||{},{});e.elId=this.sourceId,this.paint(e)},prepareEndpoint:function(t,n,i,s,r,a,l,u,c){var h;if(s)i.endpoints[r]=s,s.addConnection(i);else{a.endpoints||(a.endpoints=[null,null]);var d=c||a.endpoints[r]||a.endpoint||t.Defaults.Endpoints[r]||e.Defaults.Endpoints[r]||t.Defaults.Endpoint||e.Defaults.Endpoint;a.endpointStyles||(a.endpointStyles=[null,null]),a.endpointHoverStyles||(a.endpointHoverStyles=[null,null]);var p=a.endpointStyles[r]||a.endpointStyle||t.Defaults.EndpointStyles[r]||e.Defaults.EndpointStyles[r]||t.Defaults.EndpointStyle||e.Defaults.EndpointStyle;null==p.fill&&null!=a.paintStyle&&(p.fill=a.paintStyle.stroke),null==p.outlineStroke&&null!=a.paintStyle&&(p.outlineStroke=a.paintStyle.outlineStroke),null==p.outlineWidth&&null!=a.paintStyle&&(p.outlineWidth=a.paintStyle.outlineWidth);var f=a.endpointHoverStyles[r]||a.endpointHoverStyle||t.Defaults.EndpointHoverStyles[r]||e.Defaults.EndpointHoverStyles[r]||t.Defaults.EndpointHoverStyle||e.Defaults.EndpointHoverStyle;null!=a.hoverPaintStyle&&(null==f&&(f={}),null==f.fill&&(f.fill=a.hoverPaintStyle.stroke));var g=a.anchors?a.anchors[r]:a.anchor?a.anchor:o(t.Defaults.Anchors[r],u,t)||o(e.Defaults.Anchors[r],u,t)||o(t.Defaults.Anchor,u,t)||o(e.Defaults.Anchor,u,t);h=n({paintStyle:p,hoverPaintStyle:f,endpoint:d,connections:[i],uuid:a.uuids?a.uuids[r]:null,anchor:g,source:l,scope:a.scope,reattach:a.reattach||t.Defaults.ReattachConnections,detachable:a.detachable||t.Defaults.ConnectionsDetachable}),null==s&&h.setDeleteOnEmpty(!0),i.endpoints[r]=h,!1===a.drawEndpoints&&h.setVisible(!1,!0,!0)}return h},replaceEndpoint:function(t,e){var n=this.endpoints[t],i=n.elementId,o=this._jsPlumb.instance.getEndpoints(i),s=o.indexOf(n),r=this.makeEndpoint(0===t,n.element,i,null,e);this.endpoints[t]=r,o.splice(s,1,r),this._jsPlumb.instance.deleteObject({endpoint:n,deleteAttachedObjects:!1}),this._jsPlumb.instance.fire("endpointReplaced",{previous:n,current:r}),this._jsPlumb.instance.router.sourceOrTargetChanged(this.endpoints[1].elementId,this.endpoints[1].elementId,this,this.endpoints[1].element,1)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumbUtil,e=this.jsPlumb;e.AnchorManager=function(n){var i={},o={},s={},r={},a=this,l={},u=n.jsPlumbInstance,c={},h=function(t,e){return e[0][0]-t[0][0]},d=function(t,e){return(t[0][0]<0?-Math.PI-t[0][0]:Math.PI-t[0][0])-(e[0][0]<0?-Math.PI-e[0][0]:Math.PI-e[0][0])},p={top:d,right:h,bottom:h,left:d},f=function(t,e){var n=u.getCachedData(t),i=n.s,r=n.o,a=function(e,n,i,r,a,l,c){if(r.length>0)for(var h=function(t,e,n,i,o,s,r,a){for(var l=[],u=e[o?0:1]/(i.length+1),c=0;c<i.length;c++){var h=(c+1)*u,d=s*e[o?1:0];r&&(h=e[o?0:1]-h);var p=o?h:d,f=n.left+p,g=p/e[0],m=o?d:h,v=n.top+m,y=m/e[1];if(0!==a){var b=jsPlumbUtil.rotatePoint([f,v],[n.centerx,n.centery],a);f=b[0],v=b[1]}l.push([f,v,g,y,i[c][1],i[c][2]])}return l}(0,n,i,(y=p[e],r.sort(y)),a,l,"right"===e||"top"===e,u.getRotation(t)),d=function(t,e){o[t.id]=[e[0],e[1],e[2],e[3]],s[t.id]=c},f=0;f<h.length;f++){var g=h[f][4],m=g.endpoints[0].elementId===t,v=g.endpoints[1].elementId===t;m&&d(g.endpoints[0],h[f]),v&&d(g.endpoints[1],h[f])}var y};a("bottom",i,r,e.bottom,!0,1,[0,1]),a("top",i,r,e.top,!0,0,[0,-1]),a("left",i,r,e.left,!1,0,[-1,0]),a("right",i,r,e.right,!1,1,[1,0])};this.reset=function(){i={},r={},l={}},this.addFloatingConnection=function(t,e){c[t]=e},this.newConnection=function(n){var i=n.sourceId,o=n.targetId,s=n.endpoints,a=!0,l=function(l,u,c,h,d){i===o&&c.isContinuous&&(n._jsPlumb.instance.removeElement(s[1].canvas),a=!1),t.addToList(r,h,[d,u,c.constructor===e.DynamicAnchor])};l(0,s[0],s[0].anchor,o,n),a&&l(0,s[1],s[1].anchor,i,n)};var g=function(e){!function(e,n){if(e){var i=function(t){return t[4]===n};t.removeWithFunction(e.top,i),t.removeWithFunction(e.left,i),t.removeWithFunction(e.bottom,i),t.removeWithFunction(e.right,i)}}(l[e.elementId],e.id)};this.connectionDetached=function(e,n){var i=e.connection||e,o=e.sourceId,s=e.targetId,l=i.endpoints,u=function(e,n,i,o,s){t.removeWithFunction(r[o],function(t){return t[0].id===s.id})};u(0,l[1],l[1].anchor,o,i),u(0,l[0],l[0].anchor,s,i),i.floatingId&&(u(i.floatingIndex,i.floatingEndpoint,i.floatingEndpoint.anchor,i.floatingId,i),g(i.floatingEndpoint)),g(i.endpoints[0]),g(i.endpoints[1]),n||(a.redraw(i.sourceId),i.targetId!==i.sourceId&&a.redraw(i.targetId))},this.addEndpoint=function(e,n){t.addToList(i,n,e)},this.changeId=function(t,e){r[e]=r[t],i[e]=i[t],delete r[t],delete i[t]},this.getConnectionsFor=function(t){return r[t]||[]},this.getEndpointsFor=function(t){return i[t]||[]},this.deleteEndpoint=function(e){t.removeWithFunction(i[e.elementId],function(t){return t.id===e.id}),g(e)},this.elementRemoved=function(t){delete c[t],delete i[t],i[t]=[]};var m=function(e,i,o,s,r,a,l,u,c,h,d,p){var f,g,m=-1,v=s.endpoints[l],y=v.id,b=[1,0][l],P=[[i,o],s,r,a,y],x=e[c],C=v._continuousAnchorEdge?e[v._continuousAnchorEdge]:null;if(C){var _=t.findWithFunction(C,function(t){return t[4]===y});if(-1!==_)for(C.splice(_,1),f=0;f<C.length;f++)g=C[f][1],t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,C[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,C[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id})}for(f=0;f<x.length;f++)g=x[f][1],1===n.idx&&x[f][3]===a&&-1===m&&(m=f),t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,x[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,x[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id});var j=u?-1!==m?m:0:x.length;x.splice(j,0,P),v._continuousAnchorEdge=c};this.sourceOrTargetChanged=function(n,i,o,s,a){if(0===a){if(n!==i){o.sourceId=i,o.source=s,t.removeWithFunction(r[n],function(t){return t[0].id===o.id});var l=t.findWithFunction(r[o.targetId],function(t){return t[0].id===o.id});l>-1&&(r[o.targetId][l][0]=o,r[o.targetId][l][1]=o.endpoints[0],r[o.targetId][l][2]=o.endpoints[0].anchor.constructor===e.DynamicAnchor),t.addToList(r,i,[o,o.endpoints[1],o.endpoints[1].anchor.constructor===e.DynamicAnchor]),o.endpoints[1].anchor.isContinuous&&(o.source===o.target?o._jsPlumb.instance.removeElement(o.endpoints[1].canvas):null==o.endpoints[1].canvas.parentNode&&o._jsPlumb.instance.appendElement(o.endpoints[1].canvas)),o.updateConnectedClass()}}else if(1===a){var u=o.endpoints[0].elementId;o.target=s,o.targetId=i;var c=t.findWithFunction(r[u],function(t){return t[0].id===o.id}),h=t.findWithFunction(r[n],function(t){return t[0].id===o.id});-1!==c&&(r[u][c][0]=o,r[u][c][1]=o.endpoints[1],r[u][c][2]=o.endpoints[1].anchor.constructor===e.DynamicAnchor),h>-1&&(r[n].splice(h,1),t.addToList(r,i,[o,o.endpoints[0],o.endpoints[0].anchor.constructor===e.DynamicAnchor])),o.updateConnectedClass()}},this.rehomeEndpoint=function(t,e,n){var o=i[e]||[],s=u.getId(n);if(s!==e){var r=o.indexOf(t);if(r>-1){var l=o.splice(r,1)[0];a.add(l,s)}}for(var c=0;c<t.connections.length;c++)t.connections[c].sourceId===e?a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,0):t.connections[c].targetId===e&&a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,1)},this.redraw=function(n,o,s,a,h,d){var p=[],g=[],v=[];if(!u.isSuspendDrawing()){var y=i[n]||[],b=r[n]||[];s=s||jsPlumbUtil.uuid(),a=a||{left:0,top:0},o&&(o={left:o.left+a.left,top:o.top+a.top});for(var P=u.updateOffset({elId:n,offset:o,recalc:!1,timestamp:s}),x={},C=0;C<b.length;C++){var _=b[C][0],j=_.sourceId,E=_.targetId,S=_.endpoints[0].anchor.isContinuous,w=_.endpoints[1].anchor.isContinuous;if(S||w){var D=j+"_"+E,A=x[D],I=_.sourceId===n?1:0,k=u.getRotation(E),O=u.getRotation(j);S&&!l[j]&&(l[j]={top:[],right:[],bottom:[],left:[]}),w&&!l[E]&&(l[E]={top:[],right:[],bottom:[],left:[]}),n!==E&&u.updateOffset({elId:E,timestamp:s}),n!==j&&u.updateOffset({elId:j,timestamp:s});var M=u.getCachedData(E),T=u.getCachedData(j);E===j&&(S||w)?(m(l[j],-Math.PI/2,0,_,!1,E,0,!1,"top",0,p,g),m(l[E],-Math.PI/2,0,_,!1,j,1,!1,"top",0,p,g)):(A||(A=this.calculateOrientation(j,E,T.o,M.o,_.endpoints[0].anchor,_.endpoints[1].anchor,_,O,k),x[D]=A),S&&m(l[j],A.theta,0,_,!1,E,0,!1,A.a[0],0,p,g),w&&m(l[E],A.theta2,-1,_,!0,j,1,!0,A.a[1],0,p,g)),S&&t.addWithFunction(v,j,function(t){return t===j}),w&&t.addWithFunction(v,E,function(t){return t===E}),t.addWithFunction(p,_,function(t){return t.id===_.id}),(S&&0===I||w&&1===I)&&t.addWithFunction(g,_.endpoints[I],function(t){return t.id===_.endpoints[I].id})}}for(C=0;C<y.length;C++)0===y[C].connections.length&&y[C].anchor.isContinuous&&(l[n]||(l[n]={top:[],right:[],bottom:[],left:[]}),m(l[n],-Math.PI/2,0,{endpoints:[y[C],y[C]],paint:function(){}},!1,n,0,!1,y[C].anchor.getDefaultFace(),0,p,g),t.addWithFunction(v,n,function(t){return t===n}));for(C=0;C<v.length;C++)f(v[C],l[v[C]]);for(C=0;C<y.length;C++)y[C].paint({timestamp:s,offset:P,dimensions:P.s,recalc:!0!==d});for(C=0;C<g.length;C++){var F=u.getCachedData(g[C].elementId);g[C].paint({timestamp:null,offset:F,dimensions:F.s})}for(C=0;C<b.length;C++){var L=b[C][1];if(L.anchor.constructor===e.DynamicAnchor){L.paint({elementWithPrecedence:n,timestamp:s}),t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id});for(var N=0;N<L.connections.length;N++)L.connections[N]!==b[C][0]&&t.addWithFunction(p,L.connections[N],function(t){return t.id===L.connections[N].id})}else t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id})}var R=c[n];for(R&&R.paint({timestamp:s,recalc:!1,elId:n}),C=0;C<p.length;C++)p[C].paint({elId:n,timestamp:null,recalc:!1,clearEdits:h})}return{c:p,e:g}};var v=function(e){t.EventGenerator.apply(this),this.type="Continuous",this.isDynamic=!0,this.isContinuous=!0;for(var n=e.faces||["top","right","bottom","left"],i=!(!1===e.clockwise),r={},a={top:"bottom",right:"left",left:"right",bottom:"top"},l={top:"right",right:"bottom",left:"top",bottom:"left"},u={top:"left",right:"top",left:"bottom",bottom:"right"},c=i?l:u,h=i?u:l,d=e.cssClass||"",p=null,f=null,g=["left","right"],m=["top","bottom"],v=null,y=0;y<n.length;y++)r[n[y]]=!0;this.getDefaultFace=function(){return 0===n.length?"top":n[0]},this.isRelocatable=function(){return!0},this.isSnapOnRelocate=function(){return!0},this.verifyEdge=function(t){return r[t]?t:r[a[t]]?a[t]:r[c[t]]?c[t]:r[h[t]]?h[t]:t},this.isEdgeSupported=function(t){return null==v?null==f?!0===r[t]:f===t:-1!==v.indexOf(t)},this.setCurrentFace=function(t,e){p=t,e&&null!=f&&(f=p)},this.getCurrentFace=function(){return p},this.getSupportedFaces=function(){var t=[];for(var e in r)r[e]&&t.push(e);return t},this.lock=function(){f=p},this.unlock=function(){f=null},this.isLocked=function(){return null!=f},this.lockCurrentAxis=function(){null!=p&&(v="left"===p||"right"===p?g:m)},this.unlockCurrentAxis=function(){v=null},this.compute=function(t){return o[t.element.id]||[0,0]},this.getCurrentLocation=function(t){return o[t.element.id]||[0,0]},this.getOrientation=function(t){return s[t.id]||[0,0]},this.getCssClass=function(){return d}};u.continuousAnchorFactory={get:function(t){return new v(t)},clear:function(t){delete o[t]}}},e.AnchorManager.prototype.calculateOrientation=function(t,e,n,i,o,s,r,a,l){var u=["left","top","right","bottom"];if(t===e)return{orientation:"identity",a:["top","top"]};var c=Math.atan2(i.centery-n.centery,i.centerx-n.centerx),h=Math.atan2(n.centery-i.centery,n.centerx-i.centerx),d=[],p={};!function(t,e){for(var n=0;n<t.length;n++)if(p[t[n]]={left:[e[n][0].left,e[n][0].centery],right:[e[n][0].right,e[n][0].centery],top:[e[n][0].centerx,e[n][0].top],bottom:[e[n][0].centerx,e[n][0].bottom]},0!==e[n][1])for(var i in p[t[n]])p[t[n]][i]=jsPlumbUtil.rotatePoint(p[t[n]][i],[e[n][0].centerx,e[n][0].centery],e[n][1])}(["source","target"],[[n,a],[i,l]]);for(var f=0;f<u.length;f++)for(var g=0;g<u.length;g++)d.push({source:u[f],target:u[g],dist:Biltong.lineLength(p.source[u[f]],p.target[u[g]])});d.sort(function(t,e){return t.dist<e.dist?-1:t.dist>e.dist?1:0});for(var m=d[0].source,v=d[0].target,y=0;y<d.length&&(m=o.isContinuous&&o.locked?o.getCurrentFace():!o.isContinuous||o.isEdgeSupported(d[y].source)?d[y].source:null,v=s.isContinuous&&s.locked?s.getCurrentFace():!s.isContinuous||s.isEdgeSupported(d[y].target)?d[y].target:null,null==m||null==v);y++);return o.isContinuous&&o.setCurrentFace(m),s.isContinuous&&s.setCurrentFace(v),{a:[m,v],theta:c,theta2:h}},e.Anchor=function(e){this.x=e.x||0,this.y=e.y||0,this.elementId=e.elementId,this.cssClass=e.cssClass||"",this.orientation=e.orientation||[0,0],this.lastReturnValue=null,this.offsets=e.offsets||[0,0],this.timestamp=null,this._unrotatedOrientation=[this.orientation[0],this.orientation[1]],this.relocatable=!1!==e.relocatable,this.snapOnRelocate=!1!==e.snapOnRelocate,this.locked=!1,t.EventGenerator.apply(this),this.compute=function(t){var e=t.xy,n=t.wh,i=t.timestamp;if(i&&i===this.timestamp)return this.lastReturnValue;var o=[e[0]+this.x*n[0]+this.offsets[0],e[1]+this.y*n[1]+this.offsets[1],this.x,this.y],s=t.rotation;if(null!=s&&0!==s){var r=jsPlumbUtil.rotatePoint(o,[e[0]+n[0]/2,e[1]+n[1]/2],s);this.orientation[0]=Math.round(this._unrotatedOrientation[0]*r[2]-this._unrotatedOrientation[1]*r[3]),this.orientation[1]=Math.round(this._unrotatedOrientation[1]*r[2]+this._unrotatedOrientation[0]*r[3]),this.lastReturnValue=[r[0],r[1],this.x,this.y]}else this.orientation[0]=this._unrotatedOrientation[0],this.orientation[1]=this._unrotatedOrientation[1],this.lastReturnValue=o;return this.timestamp=i,this.lastReturnValue},this.getCurrentLocation=function(t){return t=t||{},null==this.lastReturnValue||null!=t.timestamp&&this.timestamp!==t.timestamp?this.compute(t):this.lastReturnValue},this.setPosition=function(t,e,n,i,o){this.locked&&!o||(this.x=t,this.y=e,this.orientation=[n,i],this.lastReturnValue=null)}},t.extend(e.Anchor,t.EventGenerator,{equals:function(t){if(!t)return!1;var e=t.getOrientation(),n=this.getOrientation();return this.x===t.x&&this.y===t.y&&this.offsets[0]===t.offsets[0]&&this.offsets[1]===t.offsets[1]&&n[0]===e[0]&&n[1]===e[1]},getOrientation:function(){return this.orientation},getCssClass:function(){return this.cssClass}}),e.FloatingAnchor=function(t){e.Anchor.apply(this,arguments);var n=t.reference,i=t.referenceCanvas,o=e.getSize(i),s=null,r=null;this.orientation=null,this.x=0,this.y=0,this.isFloating=!0,this.compute=function(t){var e=t.xy,n=[e[0]+o[0]/2,e[1]+o[1]/2];return r=n,n},this.getOrientation=function(t){if(s)return s;var e=n.getOrientation(t);return[0*Math.abs(e[0])*-1,0*Math.abs(e[1])*-1]},this.over=function(t,e){s=t.getOrientation(e)},this.out=function(){s=null},this.getCurrentLocation=function(t){return null==r?this.compute(t):r}},t.extend(e.FloatingAnchor,e.Anchor);e.DynamicAnchor=function(t){e.Anchor.apply(this,arguments),this.isDynamic=!0,this.anchors=[],this.elementId=t.elementId,this.jsPlumbInstance=t.jsPlumbInstance;for(var n=0;n<t.anchors.length;n++)this.anchors[n]=(i=t.anchors[n],o=this.jsPlumbInstance,s=this.elementId,i.constructor===e.Anchor?i:o.makeAnchor(i,s,o));var i,o,s;this.getAnchors=function(){return this.anchors};var r=this.anchors.length>0?this.anchors[0]:null,a=r,l=function(t,e,n,i,o,s,r){var a=i[0]+t.x*o[0],l=i[1]+t.y*o[1],u=i[0]+o[0]/2,c=i[1]+o[1]/2;if(null!=s&&0!==s){var h=jsPlumbUtil.rotatePoint([a,l],[u,c],s);a=h[0],l=h[1]}return Math.sqrt(Math.pow(e-a,2)+Math.pow(n-l,2))+Math.sqrt(Math.pow(u-a,2)+Math.pow(c-l,2))},u=t.selector||function(t,e,n,i,o,s,r){for(var a=n[0]+i[0]/2,u=n[1]+i[1]/2,c=-1,h=1/0,d=0;d<r.length;d++){var p=l(r[d],a,u,t,e,o);p<h&&(c=d+0,h=p)}return r[c]};this.compute=function(t){var e=t.xy,n=t.wh,i=t.txy,o=t.twh,s=t.rotation,l=t.tRotation;return this.timestamp=t.timestamp,this.locked||null==i||null==o?(this.lastReturnValue=r.compute(t),this.lastReturnValue):(t.timestamp=null,r=u(e,n,i,o,s,l,this.anchors),this.x=r.x,this.y=r.y,r!==a&&this.fire("anchorChanged",r),a=r,this.lastReturnValue=r.compute(t),this.lastReturnValue)},this.getCurrentLocation=function(t){return null!=r?r.getCurrentLocation(t):null},this.getOrientation=function(t){return null!=r?r.getOrientation(t):[0,0]},this.over=function(t,e){null!=r&&r.over(t,e)},this.out=function(){null!=r&&r.out()},this.setAnchor=function(t){r=t},this.getCssClass=function(){return r&&r.getCssClass()||""},this.setAnchorCoordinates=function(t){var e=jsPlumbUtil.findWithFunction(this.anchors,function(e){return e.x===t[0]&&e.y===t[1]});return-1!==e&&(this.setAnchor(this.anchors[e]),!0)}},t.extend(e.DynamicAnchor,e.Anchor);var n=function(t,n,i,o,s,r){e.Anchors[s]=function(e){var a=e.jsPlumbInstance.makeAnchor([t,n,i,o,0,0],e.elementId,e.jsPlumbInstance);return a.type=s,r&&r(a,e),a}};n(.5,0,0,-1,"TopCenter"),n(.5,1,0,1,"BottomCenter"),n(0,.5,-1,0,"LeftMiddle"),n(1,.5,1,0,"RightMiddle"),n(.5,0,0,-1,"Top"),n(.5,1,0,1,"Bottom"),n(0,.5,-1,0,"Left"),n(1,.5,1,0,"Right"),n(.5,.5,0,0,"Center"),n(1,0,0,-1,"TopRight"),n(1,1,0,1,"BottomRight"),n(0,0,0,-1,"TopLeft"),n(0,1,0,1,"BottomLeft"),e.Defaults.DynamicAnchors=function(t){return t.jsPlumbInstance.makeAnchors(["TopCenter","RightMiddle","BottomCenter","LeftMiddle"],t.elementId,t.jsPlumbInstance)},e.Anchors.AutoDefault=function(t){var n=t.jsPlumbInstance.makeDynamicAnchor(e.Defaults.DynamicAnchors(t));return n.type="AutoDefault",n};var i=function(t,n){e.Anchors[t]=function(e){var i=e.jsPlumbInstance.makeAnchor(["Continuous",{faces:n}],e.elementId,e.jsPlumbInstance);return i.type=t,i}};e.Anchors.Continuous=function(t){return t.jsPlumbInstance.continuousAnchorFactory.get(t)},i("ContinuousLeft",["left"]),i("ContinuousTop",["top"]),i("ContinuousBottom",["bottom"]),i("ContinuousRight",["right"]),n(0,0,0,0,"Assign",function(t,e){var n=e.position||"Fixed";t.positionFinder=n.constructor===String?e.jsPlumbInstance.AnchorPositionFinders[n]:n,t.constructorParams=e}),this.jsPlumbInstance.prototype.AnchorPositionFinders={Fixed:function(t,e,n){return[(t.left-e.left)/n[0],(t.top-e.top)/n[1]]},Grid:function(t,e,n,i){var o=t.left-e.left,s=t.top-e.top,r=n[0]/i.grid[0],a=n[1]/i.grid[1],l=Math.floor(o/r),u=Math.floor(s/a);return[(l*r+r/2)/n[0],(u*a+a/2)/n[1]]}},e.Anchors.Perimeter=function(t){var e=(t=t||{}).anchorCount||60,n=t.shape;if(!n)throw new Error("no shape supplied to Perimeter Anchor type");var i=function(){for(var t=2*Math.PI/e,n=0,i=[],o=0;o<e;o++){var s=.5+.5*Math.sin(n),r=.5+.5*Math.cos(n);i.push([s,r,0,0]),n+=t}return i},o=function(t){for(var n=e/t.length,i=[],o=function(t,o,s,r,a,l,u){for(var c=(s-t)/(n=e*a),h=(r-o)/n,d=0;d<n;d++)i.push([t+c*d,o+h*d,null==l?0:l,null==u?0:u])},s=0;s<t.length;s++)o.apply(null,t[s]);return i},s=function(t){for(var e=[],n=0;n<t.length;n++)e.push([t[n][0],t[n][1],t[n][2],t[n][3],1/t.length,t[n][4],t[n][5]]);return o(e)},r=function(){return s([[0,0,1,0,0,-1],[1,0,1,1,1,0],[1,1,0,1,0,1],[0,1,0,0,-1,0]])},a={Circle:i,Ellipse:i,Diamond:function(){return s([[.5,0,1,.5],[1,.5,.5,1],[.5,1,0,.5],[0,.5,.5,0]])},Rectangle:r,Square:r,Triangle:function(){return s([[.5,0,1,1],[1,1,0,1],[0,1,.5,0]])},Path:function(t){for(var e=t.points,n=[],i=0,s=0;s<e.length-1;s++){var r=Math.sqrt(Math.pow(e[s][2]-e[s][0])+Math.pow(e[s][3]-e[s][1]));i+=r,n.push([e[s][0],e[s][1],e[s+1][0],e[s+1][1],r])}for(var a=0;a<n.length;a++)n[a][4]=n[a][4]/i;return o(n)}};if(!a[n])throw new Error("Shape ["+n+"] is unknown by Perimeter Anchor type");var l=a[n](t);t.rotation&&(l=function(t,e){for(var n=[],i=e/180*Math.PI,o=0;o<t.length;o++){var s=t[o][0]-.5,r=t[o][1]-.5;n.push([s*Math.cos(i)-r*Math.sin(i)+.5,s*Math.sin(i)+r*Math.cos(i)+.5,t[o][2],t[o][3]])}return n}(l,t.rotation));var u=t.jsPlumbInstance.makeDynamicAnchor(l);return u.type="Perimeter",u}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil;var t=this.jsPlumb;t.DefaultRouter=function(e){this.jsPlumbInstance=e,this.anchorManager=new t.AnchorManager({jsPlumbInstance:e}),this.sourceOrTargetChanged=function(t,e,n,i,o){this.anchorManager.sourceOrTargetChanged(t,e,n,i,o)},this.reset=function(){this.anchorManager.reset()},this.changeId=function(t,e){this.anchorManager.changeId(t,e)},this.elementRemoved=function(t){this.anchorManager.elementRemoved(t)},this.newConnection=function(t){this.anchorManager.newConnection(t)},this.connectionDetached=function(t,e){this.anchorManager.connectionDetached(t,e)},this.redraw=function(t,e,n,i,o,s){return this.anchorManager.redraw(t,e,n,i,o,s)},this.deleteEndpoint=function(t){this.anchorManager.deleteEndpoint(t)},this.rehomeEndpoint=function(t,e,n){this.anchorManager.rehomeEndpoint(t,e,n)},this.addEndpoint=function(t,e){this.anchorManager.addEndpoint(t,e)}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Biltong;e.Segments={AbstractSegment:function(t){this.params=t,this.findClosestPointOnPath=function(t,e){return{d:1/0,x:null,y:null,l:null}},this.getBounds=function(){return{minX:Math.min(t.x1,t.x2),minY:Math.min(t.y1,t.y2),maxX:Math.max(t.x1,t.x2),maxY:Math.max(t.y1,t.y2)}},this.lineIntersection=function(t,e,n,i){return[]},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.y)}},Straight:function(t){var n,o,s,r,a,l,u;e.Segments.AbstractSegment.apply(this,arguments);this.type="Straight",this.getLength=function(){return n},this.getGradient=function(){return o},this.getCoordinates=function(){return{x1:r,y1:l,x2:a,y2:u}},this.setCoordinates=function(t){r=t.x1,l=t.y1,a=t.x2,u=t.y2,n=Math.sqrt(Math.pow(a-r,2)+Math.pow(u-l,2)),o=i.gradient({x:r,y:l},{x:a,y:u}),s=-1/o},this.setCoordinates({x1:t.x1,y1:t.y1,x2:t.x2,y2:t.y2}),this.getBounds=function(){return{minX:Math.min(r,a),minY:Math.min(l,u),maxX:Math.max(r,a),maxY:Math.max(l,u)}},this.pointOnPath=function(t,e){if(0!==t||e){if(1!==t||e){var o=e?t>0?t:n+t:t*n;return i.pointOnLine({x:r,y:l},{x:a,y:u},o)}return{x:a,y:u}}return{x:r,y:l}},this.gradientAtPoint=function(t){return o},this.pointAlongPathFrom=function(t,e,n){var o=this.pointOnPath(t,n),s=e<=0?{x:r,y:l}:{x:a,y:u};return e<=0&&Math.abs(e)>1&&(e*=-1),i.pointOnLine(o,s,e)};var c=function(t,e,n){return n>=Math.min(t,e)&&n<=Math.max(t,e)},h=function(t,e,n){return Math.abs(n-t)<Math.abs(n-e)?t:e};this.findClosestPointOnPath=function(t,e){var d={d:1/0,x:null,y:null,l:null,x1:r,x2:a,y1:l,y2:u};if(0===o)d.y=l,d.x=c(r,a,t)?t:h(r,a,t);else if(o===1/0||o===-1/0)d.x=r,d.y=c(l,u,e)?e:h(l,u,e);else{var p=l-o*r,f=(e-s*t-p)/(o-s),g=o*f+p;d.x=c(r,a,f)?f:h(r,a,f),d.y=c(l,u,g)?g:h(l,u,g)}var m=i.lineLength([d.x,d.y],[r,l]);return d.d=i.lineLength([t,e],[d.x,d.y]),d.l=m/n,d};var d=function(t,e,n){return n>e?e<=t&&t<=n:e>=t&&t>=n};this.lineIntersection=function(t,e,n,s){var c=Math.abs(i.gradient({x:t,y:e},{x:n,y:s})),h=Math.abs(o),p=h===1/0?r:l-h*r,f=[],g=c===1/0?t:e-c*t;if(c!==h)if(c===1/0&&0===h)d(t,r,a)&&d(l,e,s)&&(f=[t,l]);else if(0===c&&h===1/0)d(e,l,u)&&d(r,t,n)&&(f=[r,e]);else{var m,v;c===1/0?d(m=t,r,a)&&d(v=h*t+p,e,s)&&(f=[m,v]):0===c?d(v=e,l,u)&&d(m=(e-p)/h,t,n)&&(f=[m,v]):(v=h*(m=(g-p)/(h-c))+p,d(m,r,a)&&d(v,l,u)&&(f=[m,v]))}return f},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.h)}},Arc:function(t){e.Segments.AbstractSegment.apply(this,arguments);var n=function(e,n){return i.theta([t.cx,t.cy],[e,n])},o=2*Math.PI;this.radius=t.r,this.anticlockwise=t.ac,this.type="Arc",t.startAngle&&t.endAngle?(this.startAngle=t.startAngle,this.endAngle=t.endAngle,this.x1=t.cx+this.radius*Math.cos(t.startAngle),this.y1=t.cy+this.radius*Math.sin(t.startAngle),this.x2=t.cx+this.radius*Math.cos(t.endAngle),this.y2=t.cy+this.radius*Math.sin(t.endAngle)):(this.startAngle=n(t.x1,t.y1),this.endAngle=n(t.x2,t.y2),this.x1=t.x1,this.y1=t.y1,this.x2=t.x2,this.y2=t.y2),this.endAngle<0&&(this.endAngle+=o),this.startAngle<0&&(this.startAngle+=o);var s=this.endAngle<this.startAngle?this.endAngle+o:this.endAngle;this.sweep=Math.abs(s-this.startAngle),this.anticlockwise&&(this.sweep=o-this.sweep);var r=2*Math.PI*this.radius,a=this.sweep/o,l=r*a;this.getLength=function(){return l},this.getBounds=function(){return{minX:t.cx-t.r,maxX:t.cx+t.r,minY:t.cy-t.r,maxY:t.cy+t.r}};var u=function(t){var e=Math.floor(t),n=Math.ceil(t);return t-e<1e-10?e:n-t<1e-10?n:t};this.pointOnPath=function(e,n){if(0===e)return{x:this.x1,y:this.y1,theta:this.startAngle};if(1===e)return{x:this.x2,y:this.y2,theta:this.endAngle};n&&(e/=l);var i=function(t,e){if(t.anticlockwise){var n=t.startAngle<t.endAngle?t.startAngle+o:t.startAngle;return n-Math.abs(n-t.endAngle)*e}var i=t.endAngle<t.startAngle?t.endAngle+o:t.endAngle,s=Math.abs(i-t.startAngle);return t.startAngle+s*e}(this,e),s=t.cx+t.r*Math.cos(i),r=t.cy+t.r*Math.sin(i);return{x:u(s),y:u(r),theta:i}},this.gradientAtPoint=function(e,n){var o=this.pointOnPath(e,n),s=i.normal([t.cx,t.cy],[o.x,o.y]);return this.anticlockwise||s!==1/0&&s!==-1/0||(s*=-1),s},this.pointAlongPathFrom=function(e,n,i){var o=this.pointOnPath(e,i),s=n/r*2*Math.PI,a=this.anticlockwise?-1:1,l=o.theta+a*s;return{x:t.cx+this.radius*Math.cos(l),y:t.cy+this.radius*Math.sin(l)}}},Bezier:function(n){this.curve=[{x:n.x1,y:n.y1},{x:n.cp1x,y:n.cp1y},{x:n.cp2x,y:n.cp2y},{x:n.x2,y:n.y2}];var i=function(t){var e={x:0,y:0};if(0===t)return this.curve[0];var n=this.curve.length-1;if(1===t)return this.curve[n];var i=this.curve,o=1-t;if(0===n)return this.curve[0];if(1===n)return{x:o*i[0].x+t*i[1].x,y:o*i[0].y+t*i[1].y};if(n<4){var s,r,a,l=o*o,u=t*t,c=0;return 2===n?(i=[i[0],i[1],i[2],e],s=l,r=o*t*2,a=u):3===n&&(s=l*o,r=l*t*3,a=o*u*3,c=t*u),{x:s*i[0].x+r*i[1].x+a*i[2].x+c*i[3].x,y:s*i[0].y+r*i[1].y+a*i[2].y+c*i[3].y}}return e}.bind(this),o=function(){var t;(t=this.curve)[0].x===t[1].x&&t[0].y===t[1].y&&(this.length=0);var e,n,o=function(t){var e=[];t--;for(var n=0;n<=t;n++)e.push(i(n/t));return e}(16);this.length=0;for(var s=0;s<15;s++){var r=o[s],a=o[s+1];this.length+=(e=r,n=a,Math.sqrt(Math.pow(e.x-n.x,2)+Math.pow(e.y-n.y,2)))}}.bind(this);e.Segments.AbstractSegment.apply(this,arguments);this.bounds={minX:Math.min(n.x1,n.x2,n.cp1x,n.cp2x),minY:Math.min(n.y1,n.y2,n.cp1y,n.cp2y),maxX:Math.max(n.x1,n.x2,n.cp1x,n.cp2x),maxY:Math.max(n.y1,n.y2,n.cp1y,n.cp2y)},this.type="Bezier",o();var s=function(e,n,i){return i&&(n=t.jsBezier.locationAlongCurveFrom(e,n>0?0:1,n)),n};this.pointOnPath=function(e,n){return e=s(this.curve,e,n),t.jsBezier.pointOnCurve(this.curve,e)},this.gradientAtPoint=function(e,n){return e=s(this.curve,e,n),t.jsBezier.gradientAtPoint(this.curve,e)},this.pointAlongPathFrom=function(e,n,i){return e=s(this.curve,e,i),t.jsBezier.pointAlongCurveFrom(this.curve,e,n)},this.getLength=function(){return this.length},this.getBounds=function(){return this.bounds},this.findClosestPointOnPath=function(e,n){var i=t.jsBezier.nearestPointOnCurve({x:e,y:n},this.curve);return{d:Math.sqrt(Math.pow(i.point.x-e,2)+Math.pow(i.point.y-n,2)),x:i.point.x,y:i.point.y,l:1-i.location,s:this}},this.lineIntersection=function(e,n,i,o){return t.jsBezier.lineIntersection(e,n,i,o,this.curve)}}},e.SegmentRenderer={getPath:function(t,e){return{Straight:function(e){var n=t.getCoordinates();return(e?"M "+n.x1+" "+n.y1+" ":"")+"L "+n.x2+" "+n.y2},Bezier:function(e){var n=t.params;return(e?"M "+n.x2+" "+n.y2+" ":"")+"C "+n.cp2x+" "+n.cp2y+" "+n.cp1x+" "+n.cp1y+" "+n.x1+" "+n.y1},Arc:function(e){var n=t.params,i=t.sweep>Math.PI?1:0,o=t.anticlockwise?0:1;return(e?"M"+t.x1+" "+t.y1+" ":"")+"A "+t.radius+" "+n.r+" 0 "+i+","+o+" "+t.x2+" "+t.y2}}[t.type](e)}};var o=function(){this.resetBounds=function(){this.bounds={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0}},this.resetBounds()};e.Connectors.AbstractConnector=function(t){o.apply(this,arguments);var s=[],r=0,a=[],l=[],u=t.stub||0,c=n.isArray(u)?u[0]:u,h=n.isArray(u)?u[1]:u,d=t.gap||0,p=n.isArray(d)?d[0]:d,f=n.isArray(d)?d[1]:d,g=null,m=null;this.getPathData=function(){for(var t="",n=0;n<s.length;n++)t+=e.SegmentRenderer.getPath(s[n],0===n),t+=" ";return t},this.findSegmentForPoint=function(t,e){for(var n={d:1/0,s:null,x:null,y:null,l:null},i=0;i<s.length;i++){var o=s[i].findClosestPointOnPath(t,e);o.d<n.d&&(n.d=o.d,n.l=o.l,n.x=o.x,n.y=o.y,n.s=s[i],n.x1=o.x1,n.x2=o.x2,n.y1=o.y1,n.y2=o.y2,n.index=i,n.connectorLocation=a[i][0]+o.l*(a[i][1]-a[i][0]))}return n},this.lineIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].lineIntersection(t,e,n,i));return o},this.boxIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].boxIntersection(t,e,n,i));return o},this.boundingBoxIntersection=function(t){for(var e=[],n=0;n<s.length;n++)e.push.apply(e,s[n].boundingBoxIntersection(t));return e};var v=function(t,e){var n,i,o;if(e&&(t=t>0?t/r:(r+t)/r),1===t)n=s.length-1,o=1;else if(0===t)o=0,n=0;else if(t>=.5){for(n=0,o=0,i=a.length-1;i>-1;i--)if(a[i][1]>=t&&a[i][0]<=t){n=i,o=(t-a[i][0])/l[i];break}}else for(n=a.length-1,o=1,i=0;i<a.length;i++)if(a[i][1]>=t){n=i,o=(t-a[i][0])/l[i];break}return{segment:s[n],proportion:o,index:n}};this.setSegments=function(t){g=[],r=0;for(var e=0;e<t.length;e++)g.push(t[e]),r+=t[e].getLength()},this.getLength=function(){return r};var y=function(t){this.strokeWidth=t.strokeWidth;var e=i.quadrant(t.sourcePos,t.targetPos),n=t.targetPos[0]<t.sourcePos[0],o=t.targetPos[1]<t.sourcePos[1],s=t.strokeWidth||1,r=t.sourceEndpoint.anchor.getOrientation(t.sourceEndpoint),a=t.targetEndpoint.anchor.getOrientation(t.targetEndpoint),l=n?t.targetPos[0]:t.sourcePos[0],u=o?t.targetPos[1]:t.sourcePos[1],d=Math.abs(t.targetPos[0]-t.sourcePos[0]),g=Math.abs(t.targetPos[1]-t.sourcePos[1]);if(0===r[0]&&0===r[1]||0===a[0]&&0===a[1]){var m=d>g?0:1,v=[1,0][m];a=[],(r=[])[m]=t.sourcePos[m]>t.targetPos[m]?-1:1,a[m]=t.sourcePos[m]>t.targetPos[m]?1:-1,r[v]=0,a[v]=0}var y=n?d+p*r[0]:p*r[0],b=o?g+p*r[1]:p*r[1],P=n?f*a[0]:d+f*a[0],x=o?f*a[1]:g+f*a[1],C=r[0]*a[0]+r[1]*a[1],_={sx:y,sy:b,tx:P,ty:x,lw:s,xSpan:Math.abs(P-y),ySpan:Math.abs(x-b),mx:(y+P)/2,my:(b+x)/2,so:r,to:a,x:l,y:u,w:d,h:g,segment:e,startStubX:y+r[0]*c,startStubY:b+r[1]*c,endStubX:P+a[0]*h,endStubY:x+a[1]*h,isXGreaterThanStubTimes2:Math.abs(y-P)>c+h,isYGreaterThanStubTimes2:Math.abs(b-x)>c+h,opposite:-1===C,perpendicular:0===C,orthogonal:1===C,sourceAxis:0===r[0]?"y":"x",points:[l,u,d,g,y,b,P,x],stubs:[c,h]};return _.anchorOrientation=_.opposite?"opposite":_.orthogonal?"orthogonal":"perpendicular",_};return this.getSegments=function(){return s},this.updateBounds=function(t){var e=t.getBounds();this.bounds.minX=Math.min(this.bounds.minX,e.minX),this.bounds.maxX=Math.max(this.bounds.maxX,e.maxX),this.bounds.minY=Math.min(this.bounds.minY,e.minY),this.bounds.maxY=Math.max(this.bounds.maxY,e.maxY)},this.pointOnPath=function(t,e){var n=v(t,e);return n.segment&&n.segment.pointOnPath(n.proportion,!1)||[0,0]},this.gradientAtPoint=function(t,e){var n=v(t,e);return n.segment&&n.segment.gradientAtPoint(n.proportion,!1)||0},this.pointAlongPathFrom=function(t,e,n){var i=v(t,n);return i.segment&&i.segment.pointAlongPathFrom(i.proportion,e,!1)||[0,0]},this.compute=function(t){m=y.call(this,t),r=s.length=a.length=l.length=0,this._compute(m,t),this.x=m.points[0],this.y=m.points[1],this.w=m.points[2],this.h=m.points[3],this.segment=m.segment,function(){for(var t=0,e=0;e<s.length;e++){var n=s[e].getLength();l[e]=n/r,a[e]=[t,t+=n/r]}}()},{addSegment:function(t,n,i){if(i.x1!==i.x2||i.y1!==i.y2){var o=new e.Segments[n](i);s.push(o),r+=o.getLength(),t.updateBounds(o)}},prepareCompute:y,sourceStub:c,targetStub:h,maxStub:Math.max(c,h),sourceGap:p,targetGap:f,maxGap:Math.max(p,f)}},n.extend(e.Connectors.AbstractConnector,o),e.Endpoints.AbstractEndpoint=function(t){return o.apply(this,arguments),{compute:this.compute=function(t,e,n,i){var o=this._compute.apply(this,arguments);return this.x=o[0],this.y=o[1],this.w=o[2],this.h=o[3],this.bounds.minX=this.x,this.bounds.minY=this.y,this.bounds.maxX=this.x+this.w,this.bounds.maxY=this.y+this.h,o},cssClass:t.cssClass}},n.extend(e.Endpoints.AbstractEndpoint,o),e.Endpoints.Dot=function(t){this.type="Dot";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.radius=t.radius||10,this.defaultOffset=.5*this.radius,this.defaultInnerRadius=this.radius/3,this._compute=function(t,e,n,i){this.radius=n.radius||this.radius;var o=t[0]-this.radius,s=t[1]-this.radius,r=2*this.radius,a=2*this.radius;if(n.stroke){var l=n.strokeWidth||1;o-=l,s-=l,r+=2*l,a+=2*l}return[o,s,r,a,this.radius]}},n.extend(e.Endpoints.Dot,e.Endpoints.AbstractEndpoint),e.Endpoints.Rectangle=function(t){this.type="Rectangle";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.width=t.width||20,this.height=t.height||20,this._compute=function(t,e,n,i){var o=n.width||this.width,s=n.height||this.height;return[t[0]-o/2,t[1]-s/2,o,s]}},n.extend(e.Endpoints.Rectangle,e.Endpoints.AbstractEndpoint);var s=function(t){e.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.displayElements=[]};n.extend(s,e.jsPlumbUIComponent,{getDisplayElements:function(){return this._jsPlumb.displayElements},appendDisplayElement:function(t){this._jsPlumb.displayElements.push(t)}}),e.Endpoints.Image=function(i){this.type="Image",s.apply(this,arguments),e.Endpoints.AbstractEndpoint.apply(this,arguments);var o=i.onload,r=i.src||i.url,a=i.cssClass?" "+i.cssClass:"";this._jsPlumb.img=new Image,this._jsPlumb.ready=!1,this._jsPlumb.initialized=!1,this._jsPlumb.deleted=!1,this._jsPlumb.widthToUse=i.width,this._jsPlumb.heightToUse=i.height,this._jsPlumb.endpoint=i.endpoint,this._jsPlumb.img.onload=function(){null!=this._jsPlumb&&(this._jsPlumb.ready=!0,this._jsPlumb.widthToUse=this._jsPlumb.widthToUse||this._jsPlumb.img.width,this._jsPlumb.heightToUse=this._jsPlumb.heightToUse||this._jsPlumb.img.height,o&&o(this))}.bind(this),this._jsPlumb.endpoint.setImage=function(t,e){var n=t.constructor===String?t:t.src;o=e,this._jsPlumb.img.src=n,null!=this.canvas&&this.canvas.setAttribute("src",this._jsPlumb.img.src)}.bind(this),this._jsPlumb.endpoint.setImage(r,o),this._compute=function(t,e,n,i){return this.anchorPoint=t,this._jsPlumb.ready?[t[0]-this._jsPlumb.widthToUse/2,t[1]-this._jsPlumb.heightToUse/2,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse]:[0,0,0,0]},this.canvas=e.createElement("img",{position:"absolute",margin:0,padding:0,outline:0},this._jsPlumb.instance.endpointClass+a),this._jsPlumb.widthToUse&&this.canvas.setAttribute("width",this._jsPlumb.widthToUse),this._jsPlumb.heightToUse&&this.canvas.setAttribute("height",this._jsPlumb.heightToUse),this._jsPlumb.instance.appendElement(this.canvas),this.actuallyPaint=function(t,e,i){if(!this._jsPlumb.deleted){this._jsPlumb.initialized||(this.canvas.setAttribute("src",this._jsPlumb.img.src),this.appendDisplayElement(this.canvas),this._jsPlumb.initialized=!0);var o=this.anchorPoint[0]-this._jsPlumb.widthToUse/2,s=this.anchorPoint[1]-this._jsPlumb.heightToUse/2;n.sizeElement(this.canvas,o,s,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse)}},this.paint=function(e,n){null!=this._jsPlumb&&(this._jsPlumb.ready?this.actuallyPaint(e,n):t.setTimeout(function(){this.paint(e,n)}.bind(this),200))}},n.extend(e.Endpoints.Image,[s,e.Endpoints.AbstractEndpoint],{cleanup:function(t){t&&(this._jsPlumb.deleted=!0,this.canvas&&this.canvas.parentNode.removeChild(this.canvas),this.canvas=null)}}),e.Endpoints.Blank=function(t){e.Endpoints.AbstractEndpoint.apply(this,arguments);this.type="Blank",s.apply(this,arguments),this._compute=function(t,e,n,i){return[t[0],t[1],10,0]};var i=t.cssClass?" "+t.cssClass:"";this.canvas=e.createElement("div",{display:"block",width:"1px",height:"1px",background:"transparent",position:"absolute"},this._jsPlumb.instance.endpointClass+i),this._jsPlumb.instance.appendElement(this.canvas),this.paint=function(t,e){n.sizeElement(this.canvas,this.x,this.y,this.w,this.h)}},n.extend(e.Endpoints.Blank,[e.Endpoints.AbstractEndpoint,s],{cleanup:function(){this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas)}}),e.Endpoints.Triangle=function(t){this.type="Triangle",e.Endpoints.AbstractEndpoint.apply(this,arguments);var n=this;(t=t||{}).width=t.width||55,t.height=t.height||55,this.width=t.width,this.height=t.height,this._compute=function(t,e,i,o){var s=i.width||n.width,r=i.height||n.height;return[t[0]-s/2,t[1]-r/2,s,r]}};var r=e.Overlays.AbstractOverlay=function(t){this.visible=!0,this.isAppendedAtTopLevel=!0,this.component=t.component,this.loc=null==t.location?.5:t.location,this.endpointLoc=null==t.endpointLocation?[.5,.5]:t.endpointLocation,this.visible=!1!==t.visible};r.prototype={cleanup:function(t){t&&(this.component=null,this.canvas=null,this.endpointLoc=null)},reattach:function(t,e){},setVisible:function(t){this.visible=t,this.component.repaint()},isVisible:function(){return this.visible},hide:function(){this.setVisible(!1)},show:function(){this.setVisible(!0)},incrementLocation:function(t){this.loc+=t,this.component.repaint()},setLocation:function(t){this.loc=t,this.component.repaint()},getLocation:function(){return this.loc},updateFrom:function(){}},e.Overlays.Arrow=function(t){this.type="Arrow",r.apply(this,arguments),this.isAppendedAtTopLevel=!1,t=t||{};var o=this;this.length=t.length||20,this.width=t.width||20,this.id=t.id,this.direction=(t.direction||1)<0?-1:1;var s=t.paintStyle||{"stroke-width":1},a=t.foldback||.623;this.computeMaxSize=function(){return 1.5*o.width},this.elementCreated=function(n,i){if(this.path=n,t.events)for(var o in t.events)e.on(n,o,t.events[o])},this.draw=function(t,e){var o,r,l,u;if(t.pointAlongPathFrom){if(n.isString(this.loc)||this.loc>1||this.loc<0){var c=parseInt(this.loc,10),h=this.loc<0?1:0;o=t.pointAlongPathFrom(h,c,!1),r=t.pointAlongPathFrom(h,c-this.direction*this.length/2,!1),l=i.pointOnLine(o,r,this.length)}else if(1===this.loc){if(o=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,-this.length),l=i.pointOnLine(o,r,this.length),-1===this.direction){var d=l;l=o,o=d}}else if(0===this.loc){if(l=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,this.length),o=i.pointOnLine(l,r,this.length),-1===this.direction){var p=l;l=o,o=p}}else o=t.pointAlongPathFrom(this.loc,this.direction*this.length/2),r=t.pointOnPath(this.loc),l=i.pointOnLine(o,r,this.length);var f={hxy:o,tail:u=i.perpendicularLineTo(o,l,this.width),cxy:i.pointOnLine(o,l,a*this.length)},g=s.stroke||e.stroke,m=s.fill||e.stroke;return{component:t,d:f,"stroke-width":s.strokeWidth||e.strokeWidth,stroke:g,fill:m,minX:Math.min(o.x,u[0].x,u[1].x),maxX:Math.max(o.x,u[0].x,u[1].x),minY:Math.min(o.y,u[0].y,u[1].y),maxY:Math.max(o.y,u[0].y,u[1].y)}}return{component:t,minX:0,maxX:0,minY:0,maxY:0}}},n.extend(e.Overlays.Arrow,r,{updateFrom:function(t){this.length=t.length||this.length,this.width=t.width||this.width,this.direction=null!=t.direction?t.direction:this.direction,this.foldback=t.foldback||this.foldback},cleanup:function(){this.path&&this.path.parentNode&&this.path.parentNode.removeChild(this.path)}}),e.Overlays.PlainArrow=function(t){t=t||{};var n=e.extend(t,{foldback:1});e.Overlays.Arrow.call(this,n),this.type="PlainArrow"},n.extend(e.Overlays.PlainArrow,e.Overlays.Arrow),e.Overlays.Diamond=function(t){var n=(t=t||{}).length||40,i=e.extend(t,{length:n/2,foldback:2});e.Overlays.Arrow.call(this,i),this.type="Diamond"},n.extend(e.Overlays.Diamond,e.Overlays.Arrow);var a=function(t,e){return(null==t._jsPlumb.cachedDimensions||e)&&(t._jsPlumb.cachedDimensions=t.getDimensions()),t._jsPlumb.cachedDimensions},l=function(t){e.jsPlumbUIComponent.apply(this,arguments),r.apply(this,arguments);var i=this.fire;this.fire=function(){i.apply(this,arguments),this.component&&this.component.fire.apply(this.component,arguments)},this.detached=!1,this.id=t.id,this._jsPlumb.div=null,this._jsPlumb.initialised=!1,this._jsPlumb.component=t.component,this._jsPlumb.cachedDimensions=null,this._jsPlumb.create=t.create,this._jsPlumb.initiallyInvisible=!1===t.visible,this.getElement=function(){if(null==this._jsPlumb.div){var n=this._jsPlumb.div=e.getElement(this._jsPlumb.create(this._jsPlumb.component));n.style.position="absolute",jsPlumb.addClass(n,this._jsPlumb.instance.overlayClass+" "+(this.cssClass?this.cssClass:t.cssClass?t.cssClass:"")),this._jsPlumb.instance.appendElement(n),this._jsPlumb.instance.getId(n),this.canvas=n;var i="translate(-50%, -50%)";n.style.webkitTransform=i,n.style.mozTransform=i,n.style.msTransform=i,n.style.oTransform=i,n.style.transform=i,n._jsPlumb=this,!1===t.visible&&(n.style.display="none")}return this._jsPlumb.div},this.draw=function(t,e,i){var o=a(this);if(null!=o&&2===o.length){var s={x:0,y:0};if(i)s={x:i[0],y:i[1]};else if(t.pointOnPath){var r=this.loc,l=!1;(n.isString(this.loc)||this.loc<0||this.loc>1)&&(r=parseInt(this.loc,10),l=!0),s=t.pointOnPath(r,l)}else{var u=this.loc.constructor===Array?this.loc:this.endpointLoc;s={x:u[0]*t.w,y:u[1]*t.h}}var c=s.x-o[0]/2,h=s.y-o[1]/2;return{component:t,d:{minx:c,miny:h,td:o,cxy:s},minX:c,maxX:c+o[0],minY:h,maxY:h+o[1]}}return{minX:0,maxX:0,minY:0,maxY:0}}};n.extend(l,[e.jsPlumbUIComponent,r],{getDimensions:function(){return[1,1]},setVisible:function(t){this._jsPlumb.div&&(this._jsPlumb.div.style.display=t?"block":"none",t&&this._jsPlumb.initiallyInvisible&&(a(this,!0),this.component.repaint(),this._jsPlumb.initiallyInvisible=!1))},clearCachedDimensions:function(){this._jsPlumb.cachedDimensions=null},cleanup:function(t){t?null!=this._jsPlumb.div&&(this._jsPlumb.div._jsPlumb=null,this._jsPlumb.instance.removeElement(this._jsPlumb.div)):(this._jsPlumb&&this._jsPlumb.div&&this._jsPlumb.div.parentNode&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div),this.detached=!0)},reattach:function(t,e){null!=this._jsPlumb.div&&t.getContainer().appendChild(this._jsPlumb.div),this.detached=!1},computeMaxSize:function(){var t=a(this);return Math.max(t[0],t[1])},paint:function(t,e){this._jsPlumb.initialised||(this.getElement(),t.component.appendDisplayElement(this._jsPlumb.div),this._jsPlumb.initialised=!0,this.detached&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div)),this._jsPlumb.div.style.left=t.component.x+t.d.minx+"px",this._jsPlumb.div.style.top=t.component.y+t.d.miny+"px"}}),e.Overlays.Custom=function(t){this.type="Custom",l.apply(this,arguments)},n.extend(e.Overlays.Custom,l),e.Overlays.GuideLines=function(){var t=this;t.length=50,t.strokeWidth=5,this.type="GuideLines",r.apply(this,arguments),e.jsPlumbUIComponent.apply(this,arguments),this.draw=function(e,n){var o=e.pointAlongPathFrom(t.loc,t.length/2),s=e.pointOnPath(t.loc),r=i.pointOnLine(o,s,t.length),a=i.perpendicularLineTo(o,r,40),l=i.perpendicularLineTo(r,o,20);return{connector:e,head:o,tail:r,headLine:l,tailLine:a,minX:Math.min(o.x,r.x,l[0].x,l[1].x),minY:Math.min(o.y,r.y,l[0].y,l[1].y),maxX:Math.max(o.x,r.x,l[0].x,l[1].x),maxY:Math.max(o.y,r.y,l[0].y,l[1].y)}}},e.Overlays.Label=function(t){this.labelStyle=t.labelStyle,this.cssClass=null!=this.labelStyle?this.labelStyle.cssClass:null;var n=e.extend({create:function(){return e.createElement("div")}},t);if(e.Overlays.Custom.call(this,n),this.type="Label",this.label=t.label||"",this.labelText=null,this.labelStyle){var i=this.getElement();if(this.labelStyle.font=this.labelStyle.font||"12px sans-serif",i.style.font=this.labelStyle.font,i.style.color=this.labelStyle.color||"black",this.labelStyle.fill&&(i.style.background=this.labelStyle.fill),this.labelStyle.borderWidth>0){var o=this.labelStyle.borderStyle?this.labelStyle.borderStyle:"black";i.style.border=this.labelStyle.borderWidth+"px solid "+o}this.labelStyle.padding&&(i.style.padding=this.labelStyle.padding)}},n.extend(e.Overlays.Label,e.Overlays.Custom,{cleanup:function(t){t&&(this.div=null,this.label=null,this.labelText=null,this.cssClass=null,this.labelStyle=null)},getLabel:function(){return this.label},setLabel:function(t){this.label=t,this.labelText=null,this.clearCachedDimensions(),this.update(),this.component.repaint()},getDimensions:function(){return this.update(),l.prototype.getDimensions.apply(this,arguments)},update:function(){if("function"==typeof this.label){var t=this.label(this);this.getElement().innerHTML=t.replace(/\r\n/g,"<br/>")}else null==this.labelText&&(this.labelText=this.label,this.getElement().innerHTML=this.labelText.replace(/\r\n/g,"<br/>"))},updateFrom:function(t){null!=t.label&&this.setLabel(t.label)}})}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumbUtil,n=t.jsPlumbInstance,i="stop",o="revert",s="_jsPlumbGroup",r="show",a="hide",l=function(t){var n={},i={},o={},l=this;function u(e,n){for(var i=t.getContainer();;){if(null==e||e===i)return!1;if(e===n)return!0;e=e.parentNode}}function c(e,n){for(var i=e.getEl().querySelectorAll(".jtk-managed"),o=0;o<i.length;o++)t[n?r:a](i[o],!0)}t.bind("connection",function(n){var s=t.getGroupFor(n.source),r=t.getGroupFor(n.target);null!=s&&null!=r&&s===r?(i[n.connection.id]=s,o[n.connection.id]=s):(null!=s&&(e.suggest(s.connections.source,n.connection),i[n.connection.id]=s),null!=r&&(e.suggest(r.connections.target,n.connection),o[n.connection.id]=r))}),t.bind("internal.connectionDetached",function(t){!function(t){delete t.proxies;var n,s=i[t.id];null!=s&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete i[t.id]),null!=(s=o[t.id])&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete o[t.id])}(t.connection)}),t.bind("connectionMoved",function(t){var e=(0===t.index?i:o)[t.connection.id];if(e){var n=e.connections[0===t.index?"source":"target"],s=n.indexOf(t.connection);-1!==s&&n.splice(s,1)}}),this.addGroup=function(e){t.addClass(e.getEl(),"jtk-group-expanded"),n[e.id]=e,e.manager=this,p(e),t.fire("group:add",{group:e})},this.addToGroup=function(e,n,i){if(e=this.getGroup(e)){var o=e.getEl();if(n._isJsPlumbGroup)return;var s=n._jsPlumbGroup;if(s!==e){t.removeFromDragSelection(n);var r=t.getOffset(n,!0),a=e.collapsed?t.getOffset(o,!0):t.getOffset(e.getDragArea(),!0);null!=s&&(s.remove(n,!1,i,!1,e),l.updateConnectionsForGroup(s)),e.add(n,i);var u=function(t,n){var i=0===n?1:0;t.each(function(t){t.setVisible(!1),t.endpoints[i].element._jsPlumbGroup===e?(t.endpoints[i].setVisible(!1),d(t,i,e)):(t.endpoints[n].setVisible(!1),h(t,n,e))})};e.collapsed&&(u(t.select({source:n}),0),u(t.select({target:n}),1));var c=t.getId(n);t.dragManager.setParent(n,c,o,t.getId(o),r);var p={left:r.left-a.left,top:r.top-a.top};if(t.setPosition(n,p),t.dragManager.revalidateParent(n,c,r),l.updateConnectionsForGroup(e),t.revalidate(c),!i){var f={group:e,el:n,pos:p};s&&(f.sourceGroup=s),t.fire("group:addMember",f)}}}},this.removeFromGroup=function(t,e,n){if(t=this.getGroup(t)){if(t.collapsed){var i=function(n,i){for(var o=0;o<n.length;o++){var s=n[o];if(s.proxies)for(var r=0;r<s.proxies.length;r++)if(null!=s.proxies[r]){var a=s.proxies[r].originalEp.element;(a===e||u(a,e))&&d(s,i,t)}}};i(t.connections.source.slice(),0),i(t.connections.target.slice(),1)}t.remove(e,null,n)}},this.getGroup=function(t){var i=t;if(e.isString(t)&&null==(i=n[t]))throw new TypeError("No such group ["+t+"]");return i},this.getGroups=function(){var t=[];for(var e in n)t.push(n[e]);return t},this.removeGroup=function(e,i,o,s){e=this.getGroup(e),this.expandGroup(e,!0);var r=e[i?"removeAll":"orphanAll"](o,s);return t.remove(e.getEl()),delete n[e.id],delete t._groups[e.id],t.fire("group:remove",{group:e}),r},this.removeAllGroups=function(t,e,i){for(var o in n)this.removeGroup(n[o],t,e,i)};var h=function(e,n,i){var o=e.endpoints[0===n?1:0].element;if(!o[s]||o[s].shouldProxy()||!o[s].collapsed){var r=i.getEl(),a=t.getId(r);t.proxyConnection(e,n,r,a,function(t,e){return i.getEndpoint(t,e)},function(t,e){return i.getAnchor(t,e)})}};this.collapseGroup=function(e){if(null!=(e=this.getGroup(e))&&!e.collapsed){var n=e.getEl();if(c(e,!1),e.shouldProxy()){var i=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];h(o,n,e)}};i(e.connections.source,0),i(e.connections.target,1)}e.collapsed=!0,t.removeClass(n,"jtk-group-expanded"),t.addClass(n,"jtk-group-collapsed"),t.revalidate(n),t.fire("group:collapse",{group:e})}};var d=function(e,n,i){t.unproxyConnection(e,n,t.getId(i.getEl()))};function p(e){for(var n=e.getMembers().slice(),s=[],r=0;r<n.length;r++)Array.prototype.push.apply(s,n[r].querySelectorAll(".jtk-managed"));Array.prototype.push.apply(n,s);var a=t.getConnections({source:n,scope:"*"},!0),l=t.getConnections({target:n,scope:"*"},!0),u={};e.connections.source.length=0,e.connections.target.length=0;var c=function(n){for(var s=0;s<n.length;s++)if(!u[n[s].id]){u[n[s].id]=!0;var r=t.getGroupFor(n[s].source),a=t.getGroupFor(n[s].target);r===e?(a!==e&&e.connections.source.push(n[s]),i[n[s].id]=e):a===e&&(e.connections.target.push(n[s]),o[n[s].id]=e)}};c(a),c(l)}this.expandGroup=function(e,n){if(null!=(e=this.getGroup(e))&&e.collapsed){var i=e.getEl();if(c(e,!0),e.shouldProxy()){var o=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];d(o,n,e)}};o(e.connections.source,0),o(e.connections.target,1)}e.collapsed=!1,t.addClass(i,"jtk-group-expanded"),t.removeClass(i,"jtk-group-collapsed"),t.revalidate(i),this.repaintGroup(e),n||t.fire("group:expand",{group:e})}},this.repaintGroup=function(e){for(var n=(e=this.getGroup(e)).getMembers(),i=0;i<n.length;i++)t.revalidate(n[i])},this.updateConnectionsForGroup=p,this.refreshAllGroups=function(){for(var e in n)p(n[e]),t.dragManager.updateOffsets(t.getId(n[e].getEl()))}},u=function(n,r){var a=this,l=r.el;this.getEl=function(){return l},this.id=r.id||e.uuid(),l._isJsPlumbGroup=!0;var u=this.getDragArea=function(){var t=n.getSelector(l,"[jtk-group-content]");return t&&t.length>0?t[0]:l},c=!0===r.ghost,h=c||!0===r.constrain,d=!1!==r.revert,p=!0===r.orphan,f=!0===r.prune,g=!0===r.dropOverride,m=!1!==r.proxied,v=[];if(this.connections={source:[],target:[],internal:[]},this.getAnchor=function(t,e){return r.anchor||"Continuous"},this.getEndpoint=function(t,e){return r.endpoint||["Dot",{radius:10}]},this.collapsed=!1,!1!==r.draggable){var y={drag:function(){for(var t=0;t<v.length;t++)n.draw(v[t])},stop:function(t){n.fire("groupDragStop",jsPlumb.extend(t,{group:a}))},scope:"_jsPlumbGroupDrag"};r.dragOptions&&t.jsPlumb.extend(y,r.dragOptions),n.draggable(r.el,y)}!1!==r.droppable&&n.droppable(r.el,{drop:function(t){var e=t.drag.el;if(!e._isJsPlumbGroup){var i=e._jsPlumbGroup;if(i!==a){if(null!=i&&i.overrideDrop(e,a))return;n.getGroupManager().addToGroup(a,e,!1)}}}});var b=function(t,e){for(var n=null==t.nodeType?t:[t],i=0;i<n.length;i++)e(n[i])};function P(t,e){var i=function(t){return t.offsetParent}(t),o=n.getSize(i),s=n.getSize(t),r=e[0],a=r+s[0],l=e[1],u=l+s[1];return a>0&&r<o[0]&&u>0&&l<o[1]}function x(t){var e=n.getId(t),i=n.getOffset(t);return t.parentNode.removeChild(t),n.getContainer().appendChild(t),n.setPosition(t,i),j(t),n.dragManager.clearParent(t,e),[e,i]}function C(t){var e=[];function i(t,e,i){var o=null;if(!P(t,[e,i])){var s=t._jsPlumbGroup;f?n.remove(t):o=x(t),s.remove(t)}return o}for(var o=0;o<t.selection.length;o++)e.push(i(t.selection[o][0],t.selection[o][1].left,t.selection[o][1].top));return 1===e.length?e[0]:e}function _(t){var e=n.getId(t);n.revalidate(t),n.dragManager.revalidateParent(t,e)}function j(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.off(i,C),f||p||!d||(t._katavorioDrag.off(o,_),t._katavorioDrag.setRevert(null)))}function E(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.on(i,C),h&&t._katavorioDrag.setConstrain(!0),c&&t._katavorioDrag.setUseGhostProxy(!0),f||p||!d||(t._katavorioDrag.on(o,_),t._katavorioDrag.setRevert(function(t,e){return!P(t,e)})))}this.overrideDrop=function(t,e){return g&&(d||f||p)},this.add=function(t,e){var i=u();b(t,function(t){if(null!=t._jsPlumbGroup){if(t._jsPlumbGroup===a)return;t._jsPlumbGroup.remove(t,!0,e,!1)}t._jsPlumbGroup=a,v.push(t),n.isAlreadyDraggable(t)&&E(t),t.parentNode!==i&&i.appendChild(t)}),n.getGroupManager().updateConnectionsForGroup(a)},this.remove=function(t,i,o,s,r){b(t,function(t){if(t._jsPlumbGroup===a){if(delete t._jsPlumbGroup,e.removeWithFunction(v,function(e){return e===t}),i)try{a.getDragArea().removeChild(t)}catch(t){jsPlumbUtil.log("Could not remove element from Group "+t)}if(j(t),!o){var s={group:a,el:t};r&&(s.targetGroup=r),n.fire("group:removeMember",s)}}}),s||n.getGroupManager().updateConnectionsForGroup(a)},this.removeAll=function(t,e){for(var i=0,o=v.length;i<o;i++){var s=v[0];a.remove(s,t,e,!0),n.remove(s,!0)}v.length=0,n.getGroupManager().updateConnectionsForGroup(a)},this.orphanAll=function(){for(var t={},e=0;e<v.length;e++){var n=x(v[e]);t[n[0]]=n[1]}return v.length=0,t},this.getMembers=function(){return v},l[s]=this,n.bind("elementDraggable",function(t){t.el._jsPlumbGroup===this&&E(t.el)}.bind(this)),this.shouldProxy=function(){return m},n.getGroupManager().addGroup(this)};n.prototype.addGroup=function(t){var e=this;if(e._groups=e._groups||{},null!=e._groups[t.id])throw new TypeError("cannot create Group ["+t.id+"]; a Group with that ID exists");if(null!=t.el[s])throw new TypeError("cannot create Group ["+t.id+"]; the given element is already a Group");var n=new u(e,t);return e._groups[n.id]=n,t.collapsed&&this.collapseGroup(n),n},n.prototype.addToGroup=function(t,e,n){var i=function(e){var i=this.getId(e);this.manage(i,e),this.getGroupManager().addToGroup(t,e,n)}.bind(this);if(Array.isArray(e))for(var o=0;o<e.length;o++)i(e[o]);else i(e)},n.prototype.removeFromGroup=function(t,e,n){this.getGroupManager().removeFromGroup(t,e,n),this.getContainer().appendChild(e)},n.prototype.removeGroup=function(t,e,n,i){return this.getGroupManager().removeGroup(t,e,n,i)},n.prototype.removeAllGroups=function(t,e,n){this.getGroupManager().removeAllGroups(t,e,n)},n.prototype.getGroup=function(t){return this.getGroupManager().getGroup(t)},n.prototype.getGroups=function(){return this.getGroupManager().getGroups()},n.prototype.expandGroup=function(t){this.getGroupManager().expandGroup(t)},n.prototype.collapseGroup=function(t){this.getGroupManager().collapseGroup(t)},n.prototype.repaintGroup=function(t){this.getGroupManager().repaintGroup(t)},n.prototype.toggleGroup=function(t){null!=(t=this.getGroupManager().getGroup(t))&&this.getGroupManager()[t.collapsed?"expandGroup":"collapseGroup"](t)},n.prototype.getGroupManager=function(){var t=this._groupManager;return null==t&&(t=this._groupManager=new l(this)),t},n.prototype.removeGroupManager=function(){delete this._groupManager},n.prototype.getGroupFor=function(t){if(t=this.getElement(t)){for(var e=this.getContainer(),n=!1,i=null;!n;)null==t||t===e?n=!0:t[s]?(i=t[s],n=!0):t=t.parentNode;return i}}}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.Flowchart=function(e){this.type="Flowchart",(e=e||{}).stub=null==e.stub?30:e.stub;var n,i=t.Connectors.AbstractConnector.apply(this,arguments),o=null==e.midpoint||isNaN(e.midpoint)?.5:e.midpoint,s=!0===e.alwaysRespectStubs,r=null,a=null,l=null!=e.cornerRadius?e.cornerRadius:0,u=(e.loopbackRadius,function(t){return t<0?-1:0===t?0:1}),c=function(t){return[u(t[2]-t[0]),u(t[3]-t[1])]},h=function(t,e,n,i){if(r!==e||a!==n){var o=null==r?i.sx:r,s=null==a?i.sy:a,l=o===e?"v":"h";r=e,a=n,t.push([o,s,e,n,l])}},d=function(t){return Math.sqrt(Math.pow(t[0]-t[2],2)+Math.pow(t[1]-t[3],2))},p=function(t){var e=[];return e.push.apply(e,t),e};this.midpoint=o,this._compute=function(t,e){n=[],r=null,a=null;var u=function(){return[t.startStubX,t.startStubY,t.endStubX,t.endStubY]},f={perpendicular:u,orthogonal:u,opposite:function(e){var n=t,i="x"===e?0:1;return!s&&{x:function(){return 1===n.so[i]&&(n.startStubX>n.endStubX&&n.tx>n.startStubX||n.sx>n.endStubX&&n.tx>n.sx)||-1===n.so[i]&&(n.startStubX<n.endStubX&&n.tx<n.startStubX||n.sx<n.endStubX&&n.tx<n.sx)},y:function(){return 1===n.so[i]&&(n.startStubY>n.endStubY&&n.ty>n.startStubY||n.sy>n.endStubY&&n.ty>n.sy)||-1===n.so[i]&&(n.startStubY<n.endStubY&&n.ty<n.startStubY||n.sy<n.endStubY&&n.ty<n.sy)}}[e]()?{x:[(t.sx+t.tx)/2,t.startStubY,(t.sx+t.tx)/2,t.endStubY],y:[t.startStubX,(t.sy+t.ty)/2,t.endStubX,(t.sy+t.ty)/2]}[e]:[t.startStubX,t.startStubY,t.endStubX,t.endStubY]}}[t.anchorOrientation](t.sourceAxis),g="x"===t.sourceAxis?0:1,m="x"===t.sourceAxis?1:0,v=f[g],y=f[m],b=f[g+2],P=f[m+2];h(n,f[0],f[1],t);var x=t.startStubX+(t.endStubX-t.startStubX)*o,C=t.startStubY+(t.endStubY-t.startStubY)*o,_={x:[0,1],y:[1,0]},j={perpendicular:function(e){var n=t,i={x:[[n.startStubX,n.endStubX],null,[n.endStubX,n.startStubX]],y:[[n.startStubY,n.endStubY],null,[n.endStubY,n.startStubY]]},o={x:[[x,n.startStubY],[x,n.endStubY]],y:[[n.startStubX,C],[n.endStubX,C]]},s={x:[[n.endStubX,n.startStubY]],y:[[n.startStubX,n.endStubY]]},r={x:[[n.startStubX,n.endStubY],[n.endStubX,n.endStubY]],y:[[n.endStubX,n.startStubY],[n.endStubX,n.endStubY]]},a={x:[[n.startStubX,C],[n.endStubX,C],[n.endStubX,n.endStubY]],y:[[x,n.startStubY],[x,n.endStubY],[n.endStubX,n.endStubY]]},l={x:[n.startStubY,n.endStubY],y:[n.startStubX,n.endStubX]},u=_[e][0],c=_[e][1],h=n.so[u]+1,d=n.to[c]+1,p=-1===n.to[c]&&l[e][1]<l[e][0]||1===n.to[c]&&l[e][1]>l[e][0],f=i[e][h][0],g=i[e][h][1],m={x:[[[1,2,3,4],null,[2,1,4,3]],null,[[4,3,2,1],null,[3,4,1,2]]],y:[[[3,2,1,4],null,[2,3,4,1]],null,[[4,1,2,3],null,[1,4,3,2]]]}[e][h][d];return n.segment===m[3]||n.segment===m[2]&&p?o[e]:n.segment===m[2]&&g<f?s[e]:n.segment===m[2]&&g>=f||n.segment===m[1]&&!p?a[e]:n.segment===m[0]||n.segment===m[1]&&p?r[e]:void 0},orthogonal:function(e,n,i,o,s){var r=t,a={x:-1===r.so[0]?Math.min(n,o):Math.max(n,o),y:-1===r.so[1]?Math.min(n,o):Math.max(n,o)}[e];return{x:[[a,i],[a,s],[o,s]],y:[[i,a],[s,a],[s,o]]}[e]},opposite:function(n,o,s,r){var a=t,l={x:"y",y:"x"}[n],u={x:"height",y:"width"}[n],c=a["is"+n.toUpperCase()+"GreaterThanStubTimes2"];if(e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=s+(1-e.sourceEndpoint.anchor[l])*e.sourceInfo[u]+i.maxStub;return{x:[[o,h],[r,h]],y:[[h,o],[h,r]]}[n]}return!c||1===a.so[g]&&o>r||-1===a.so[g]&&o<r?{x:[[o,C],[r,C]],y:[[x,o],[x,r]]}[n]:1===a.so[g]&&o<r||-1===a.so[g]&&o>r?{x:[[x,a.sy],[x,a.ty]],y:[[a.sx,C],[a.tx,C]]}[n]:void 0}}[t.anchorOrientation](t.sourceAxis,v,y,b,P);if(j)for(var E=0;E<j.length;E++)h(n,j[E][0],j[E][1],t);h(n,f[2],f[3],t),h(n,t.tx,t.ty,t),function(t,e,n){for(var o,s,r,a=null,u=0;u<e.length-1;u++){if(a=a||p(e[u]),o=p(e[u+1]),s=c(a),r=c(o),l>0&&a[4]!==o[4]){var h=Math.min(d(a),d(o)),f=Math.min(l,h/2);a[2]-=s[0]*f,a[3]-=s[1]*f,o[0]+=r[0]*f,o[1]+=r[1]*f;var g=s[1]===r[0]&&1===r[0]||s[1]===r[0]&&0===r[0]&&s[0]!==r[1]||s[1]===r[0]&&-1===r[0],m=(o[1]>a[3]?1:-1)==(o[0]>a[2]?1:-1),v=m&&g||!m&&!g?o[0]:a[2],y=m&&g||!m&&!g?a[3]:o[1];i.addSegment(t,"Straight",{x1:a[0],y1:a[1],x2:a[2],y2:a[3]}),i.addSegment(t,"Arc",{r:f,x1:a[2],y1:a[3],x2:o[0],y2:o[1],cx:v,cy:y,ac:g})}else{var b=a[2]===a[0]?0:a[2]>a[0]?n.lw/2:-n.lw/2,P=a[3]===a[1]?0:a[3]>a[1]?n.lw/2:-n.lw/2;i.addSegment(t,"Straight",{x1:a[0]-b,y1:a[1]-P,x2:a[2]+b,y2:a[3]+P})}a=o}null!=o&&i.addSegment(t,"Straight",{x1:o[0],y1:o[1],x2:o[2],y2:o[3]})}(this,n,t)}},e.extend(t.Connectors.Flowchart,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.AbstractBezierConnector=function(e){var n,i=!1!==(e=e||{}).showLoopback,o=(e.curviness,e.margin||5),s=(e.proximityLimit,e.orientation&&"clockwise"===e.orientation),r=e.loopbackRadius||25;return this._compute=function(t,e){var a=e.sourcePos,l=e.targetPos,u=Math.abs(a[0]-l[0]),c=Math.abs(a[1]-l[1]);if(i&&e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=e.sourcePos[0],d=e.sourcePos[1]-o,p=h,f=d-r,g=p-r,m=f-r;u=2*r,c=2*r,t.points[0]=g,t.points[1]=m,t.points[2]=u,t.points[3]=c,n.addSegment(this,"Arc",{loopback:!0,x1:h-g+4,y1:d-m,startAngle:0,endAngle:2*Math.PI,r:r,ac:!s,x2:h-g-4,y2:d-m,cx:p-g,cy:f-m})}else this._computeBezier(t,e,a,l,u,c)},n=t.Connectors.AbstractConnector.apply(this,arguments)},e.extend(t.Connectors.AbstractBezierConnector,t.Connectors.AbstractConnector);var n=function(e){e=e||{},this.type="Bezier";var n=t.Connectors.AbstractBezierConnector.apply(this,arguments),i=e.curviness||150;this.getCurviness=function(){return i},this._findControlPoint=function(t,e,n,o,s,r,a){var l=[];return r[0]!==a[0]||r[1]===a[1]?(0===a[0]?l.push(n[0]<e[0]?t[0]+10:t[0]-10):l.push(t[0]+i*a[0]),0===a[1]?l.push(n[1]<e[1]?t[1]+10:t[1]-10):l.push(t[1]+i*r[1])):(0===r[0]?l.push(e[0]<n[0]?t[0]+10:t[0]-10):l.push(t[0]-i*r[0]),0===r[1]?l.push(e[1]<n[1]?t[1]+10:t[1]-10):l.push(t[1]+i*a[1])),l},this._computeBezier=function(t,e,i,o,s,r){var a,l,u=i[0]<o[0]?s:0,c=i[1]<o[1]?r:0,h=i[0]<o[0]?0:s,d=i[1]<o[1]?0:r;a=this._findControlPoint([u,c],i,o,e.sourceEndpoint,e.targetEndpoint,t.so,t.to),l=this._findControlPoint([h,d],o,i,e.targetEndpoint,e.sourceEndpoint,t.to,t.so),n.addSegment(this,"Bezier",{x1:u,y1:c,x2:h,y2:d,cp1x:a[0],cp1y:a[1],cp2x:l[0],cp2y:l[1]})}};t.Connectors.Bezier=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){e=e||{},this.type="StateMachine";var n,i=t.Connectors.AbstractBezierConnector.apply(this,arguments),o=e.curviness||10,s=e.margin||5,r=e.proximityLimit||80;e.orientation&&e.orientation;this._computeBezier=function(t,e,a,l,u,c){var h=e.sourcePos[0]<e.targetPos[0]?0:u,d=e.sourcePos[1]<e.targetPos[1]?0:c,p=e.sourcePos[0]<e.targetPos[0]?u:0,f=e.sourcePos[1]<e.targetPos[1]?c:0;0===e.sourcePos[2]&&(h-=s),1===e.sourcePos[2]&&(h+=s),0===e.sourcePos[3]&&(d-=s),1===e.sourcePos[3]&&(d+=s),0===e.targetPos[2]&&(p-=s),1===e.targetPos[2]&&(p+=s),0===e.targetPos[3]&&(f-=s),1===e.targetPos[3]&&(f+=s);var g,m,v,y,b,P,x,C,_=(h+p)/2,j=(d+f)/2,E=(P=d,C=f,(b=h)<=(x=p)&&C<=P?1:b<=x&&P<=C?2:x<=b&&C>=P?3:4),S=Math.sqrt(Math.pow(p-h,2)+Math.pow(f-d,2));g=(n=function(t,e,n,i,o,s,r,a,l){return a<=l?[t,e]:1===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:2===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:3===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:4===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:void 0}(_,j,E,e.sourcePos,e.targetPos,o,o,S,r))[0],m=n[0],v=n[1],y=n[1],i.addSegment(this,"Bezier",{x1:p,y1:f,x2:h,y2:d,cp1x:g,cp1y:v,cp2x:m,cp2y:y})}};t.Connectors.StateMachine=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){this.type="Straight";var n=t.Connectors.AbstractConnector.apply(this,arguments);this._compute=function(t,e){n.addSegment(this,"Straight",{x1:t.sx,y1:t.sy,x2:t.startStubX,y2:t.startStubY}),n.addSegment(this,"Straight",{x1:t.startStubX,y1:t.startStubY,x2:t.endStubX,y2:t.endStubY}),n.addSegment(this,"Straight",{x1:t.endStubX,y1:t.endStubY,x2:t.tx,y2:t.ty})}};t.Connectors.Straight=n,e.extend(n,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n={"stroke-linejoin":"stroke-linejoin","stroke-dashoffset":"stroke-dashoffset","stroke-linecap":"stroke-linecap"},i="http://www.w3.org/2000/svg",o=function(t,e){for(var n in e)t.setAttribute(n,""+e[n])},s=function(e,n){return(n=n||{}).version="1.1",n.xmlns=i,t.createElementNS(i,e,null,null,n)},r=function(t){return"position:absolute;left:"+t[0]+"px;top:"+t[1]+"px"},a=function(t){for(var e=t.querySelectorAll(" defs,linearGradient,radialGradient"),n=0;n<e.length;n++)e[n].parentNode.removeChild(e[n])},l=function(t,e,i,o,r){if(e.setAttribute("fill",i.fill?i.fill:"none"),e.setAttribute("stroke",i.stroke?i.stroke:"none"),i.gradient?function(t,e,n,i,o){var r,l="jsplumb_gradient_"+o._jsPlumb.instance.idstamp();a(t),r=n.gradient.offset?s("radialGradient",{id:l}):s("linearGradient",{id:l,gradientUnits:"userSpaceOnUse"});var u=s("defs");t.appendChild(u),u.appendChild(r);for(var c=0;c<n.gradient.stops.length;c++){var h=1===o.segment||2===o.segment?c:n.gradient.stops.length-1-c,d=n.gradient.stops[h][1],p=s("stop",{offset:Math.floor(100*n.gradient.stops[c][0])+"%","stop-color":d});r.appendChild(p)}var f=n.stroke?"stroke":"fill";e.setAttribute(f,"url(#"+l+")")}(t,e,i,0,r):(a(t),e.setAttribute("style","")),i.strokeWidth&&e.setAttribute("stroke-width",i.strokeWidth),i.dashstyle&&i.strokeWidth&&!i["stroke-dasharray"]){var l=-1===i.dashstyle.indexOf(",")?" ":",",u=i.dashstyle.split(l),c="";u.forEach(function(t){c+=Math.floor(t*i.strokeWidth)+l}),e.setAttribute("stroke-dasharray",c)}else i["stroke-dasharray"]&&e.setAttribute("stroke-dasharray",i["stroke-dasharray"]);for(var h in n)i[h]&&e.setAttribute(n[h],i[h])},u=function(t,e,n){t.childNodes.length>n?t.insertBefore(e,t.childNodes[n]):t.appendChild(e)};e.svg={node:s,attr:o,pos:r};var c=function(n){var i=n.pointerEventsSpec||"all",a={};t.jsPlumbUIComponent.apply(this,n.originalArgs),this.canvas=null,this.path=null,this.svg=null,this.bgCanvas=null;var l=n.cssClass+" "+(n.originalArgs[0].cssClass||""),u={style:"",width:0,height:0,"pointer-events":i,position:"absolute"};this.svg=s("svg",u),n.useDivWrapper?(this.canvas=t.createElement("div",{position:"absolute"}),e.sizeElement(this.canvas,0,0,1,1),this.canvas.className=l):(o(this.svg,{class:l}),this.canvas=this.svg),n._jsPlumb.appendElement(this.canvas,n.originalArgs[0].parent),n.useDivWrapper&&this.canvas.appendChild(this.svg);var c=[this.canvas];return this.getDisplayElements=function(){return c},this.appendDisplayElement=function(t){c.push(t)},this.paint=function(t,i,s){if(null!=t){var l,u=[this.x,this.y],c=[this.w,this.h];null!=s&&(s.xmin<0&&(u[0]+=s.xmin),s.ymin<0&&(u[1]+=s.ymin),c[0]=s.xmax+(s.xmin<0?-s.xmin:0),c[1]=s.ymax+(s.ymin<0?-s.ymin:0)),n.useDivWrapper?(e.sizeElement(this.canvas,u[0],u[1],c[0]>0?c[0]:1,c[1]>0?c[1]:1),u[0]=0,u[1]=0,l=r([0,0])):l=r([u[0],u[1]]),a.paint.apply(this,arguments),o(this.svg,{style:l,width:c[0]||1,height:c[1]||1})}},{renderer:a}};e.extend(c,t.jsPlumbUIComponent,{cleanup:function(t){t||null==this.typeId?(this.canvas&&(this.canvas._jsPlumb=null),this.svg&&(this.svg._jsPlumb=null),this.bgCanvas&&(this.bgCanvas._jsPlumb=null),this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.svg=null,this.canvas=null,this.path=null,this.group=null,this._jsPlumb=null):(this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.bgCanvas.parentNode.removeChild(this.bgCanvas))},reattach:function(t){var e=t.getContainer();this.canvas&&null==this.canvas.parentNode&&e.appendChild(this.canvas),this.bgCanvas&&null==this.bgCanvas.parentNode&&e.appendChild(this.bgCanvas)},setVisible:function(t){this.canvas&&(this.canvas.style.display=t?"block":"none")}}),t.ConnectorRenderers.svg=function(e){var n=this;c.apply(this,[{cssClass:e._jsPlumb.connectorClass,originalArgs:arguments,pointerEventsSpec:"none",_jsPlumb:e._jsPlumb}]).renderer.paint=function(i,r,a){var c=n.getSegments(),h=[0,0];if(a.xmin<0&&(h[0]=-a.xmin),a.ymin<0&&(h[1]=-a.ymin),c.length>0){var d={d:n.getPathData(),transform:"translate("+h[0]+","+h[1]+")","pointer-events":e["pointer-events"]||"visibleStroke"},p=null;n.x,n.y,n.w,n.h;if(i.outlineStroke){var f=i.outlineWidth||1,g=i.strokeWidth+2*f;delete(p=t.extend({},i)).gradient,p.stroke=i.outlineStroke,p.strokeWidth=g,null==n.bgPath?(n.bgPath=s("path",d),t.addClass(n.bgPath,t.connectorOutlineClass),u(n.svg,n.bgPath,0)):o(n.bgPath,d),l(n.svg,n.bgPath,p,0,n)}null==n.path?(n.path=s("path",d),u(n.svg,n.path,i.outlineStroke?1:0)):o(n.path,d),l(n.svg,n.path,i,0,n)}}},e.extend(t.ConnectorRenderers.svg,c);var h=t.SvgEndpoint=function(e){c.apply(this,[{cssClass:e._jsPlumb.endpointClass,originalArgs:arguments,pointerEventsSpec:"all",useDivWrapper:!0,_jsPlumb:e._jsPlumb}]).renderer.paint=function(e){var n=t.extend({},e);n.outlineStroke&&(n.stroke=n.outlineStroke),null==this.node?(this.node=this.makeNode(n),this.svg.appendChild(this.node)):null!=this.updateNode&&this.updateNode(this.node),l(this.svg,this.node,n,(this.x,this.y,this.w,this.h),this),r(this.node,(this.x,this.y))}.bind(this)};e.extend(h,c),t.Endpoints.svg.Dot=function(){t.Endpoints.Dot.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("circle",{cx:this.w/2,cy:this.h/2,r:this.radius})},this.updateNode=function(t){o(t,{cx:this.w/2,cy:this.h/2,r:this.radius})}},e.extend(t.Endpoints.svg.Dot,[t.Endpoints.Dot,h]),t.Endpoints.svg.Rectangle=function(){t.Endpoints.Rectangle.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("rect",{width:this.w,height:this.h})},this.updateNode=function(t){o(t,{width:this.w,height:this.h})}},e.extend(t.Endpoints.svg.Rectangle,[t.Endpoints.Rectangle,h]),t.Endpoints.svg.Image=t.Endpoints.Image,t.Endpoints.svg.Blank=t.Endpoints.Blank,t.Overlays.svg.Label=t.Overlays.Label,t.Overlays.svg.Custom=t.Overlays.Custom;var d=function(e,n){e.apply(this,n),t.jsPlumbUIComponent.apply(this,n),this.isAppendedAtTopLevel=!1,this.path=null,this.paint=function(t,e){if(t.component.svg&&e){null==this.path&&(this.path=s("path",{"pointer-events":"all"}),t.component.svg.appendChild(this.path),this.elementCreated&&this.elementCreated(this.path,t.component),this.canvas=t.component.svg);var r=n&&1===n.length&&n[0].cssClass||"",a=[0,0];e.xmin<0&&(a[0]=-e.xmin),e.ymin<0&&(a[1]=-e.ymin),o(this.path,{d:i(t.d),class:r,stroke:t.stroke?t.stroke:null,fill:t.fill?t.fill:null,transform:"translate("+a[0]+","+a[1]+")"})}};var i=function(t){return isNaN(t.cxy.x)||isNaN(t.cxy.y)?"":"M"+t.hxy.x+","+t.hxy.y+" L"+t.tail[0].x+","+t.tail[0].y+" L"+t.cxy.x+","+t.cxy.y+" L"+t.tail[1].x+","+t.tail[1].y+" L"+t.hxy.x+","+t.hxy.y};this.transfer=function(t){t.canvas&&this.path&&this.path.parentNode&&(this.path.parentNode.removeChild(this.path),t.canvas.appendChild(this.path))}},p={cleanup:function(t){null!=this.path&&(t?this._jsPlumb.instance.removeElement(this.path):this.path.parentNode&&this.path.parentNode.removeChild(this.path))},reattach:function(t,e){this.path&&e.canvas&&e.canvas.appendChild(this.path)},setVisible:function(t){null!=this.path&&(this.path.style.display=t?"block":"none")}};e.extend(d,[t.jsPlumbUIComponent,t.Overlays.AbstractOverlay]),t.Overlays.svg.Arrow=function(){d.apply(this,[t.Overlays.Arrow,arguments])},e.extend(t.Overlays.svg.Arrow,[t.Overlays.Arrow,d],p),t.Overlays.svg.PlainArrow=function(){d.apply(this,[t.Overlays.PlainArrow,arguments])},e.extend(t.Overlays.svg.PlainArrow,[t.Overlays.PlainArrow,d],p),t.Overlays.svg.Diamond=function(){d.apply(this,[t.Overlays.Diamond,arguments])},e.extend(t.Overlays.svg.Diamond,[t.Overlays.Diamond,d],p),t.Overlays.svg.GuideLines=function(){var e,n,i=null,r=this;t.Overlays.GuideLines.apply(this,arguments),this.paint=function(t,l){null==i&&(i=s("path"),t.connector.svg.appendChild(i),r.attachListeners(i,t.connector),r.attachListeners(i,r),e=s("path"),t.connector.svg.appendChild(e),r.attachListeners(e,t.connector),r.attachListeners(e,r),n=s("path"),t.connector.svg.appendChild(n),r.attachListeners(n,t.connector),r.attachListeners(n,r));var u=[0,0];l.xmin<0&&(u[0]=-l.xmin),l.ymin<0&&(u[1]=-l.ymin),o(i,{d:a(t.head,t.tail),stroke:"red",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(e,{d:a(t.tailLine[0],t.tailLine[1]),stroke:"blue",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(n,{d:a(t.headLine[0],t.headLine[1]),stroke:"green",fill:null,transform:"translate("+u[0]+","+u[1]+")"})};var a=function(t,e){return"M "+t.x+","+t.y+" L"+e.x+","+e.y}},e.extend(t.Overlays.svg.GuideLines,t.Overlays.GuideLines)}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Katavorio,o=t.Biltong,s=function(t,n){var s="_katavorio_"+(n=n||"main"),r=t[s],a=t.getEventManager();return r||((r=new i({bind:a.on,unbind:a.off,getSize:e.getSize,getConstrainingRectangle:function(t){return[t.parentNode.scrollWidth,t.parentNode.scrollHeight]},getPosition:function(e,n){var i=t.getOffset(e,n,e._katavorioDrag?e.offsetParent:null);return[i.left,i.top]},setPosition:function(t,e){t.style.left=e[0]+"px",t.style.top=e[1]+"px"},addClass:e.addClass,removeClass:e.removeClass,intersects:o.intersects,indexOf:function(t,e){return t.indexOf(e)},scope:t.getDefaultScope(),css:{noSelect:t.dragSelectClass,droppable:"jtk-droppable",draggable:"jtk-draggable",drag:"jtk-drag",selected:"jtk-drag-selected",active:"jtk-drag-active",hover:"jtk-drag-hover",ghostProxy:"jtk-ghost-proxy"}})).setZoom(t.getZoom()),t[s]=r,t.bind("zoom",r.setZoom)),r},r=function(t,e){if(null==e)return[0,0];var n=h(e),i=c(n,0);return[i[t+"X"],i[t+"Y"]]},a=r.bind(this,"page"),l=r.bind(this,"screen"),u=r.bind(this,"client"),c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d=function(t){var e={},n=[],i={},o={},s={};this.register=function(r){var a,l=t.getId(r);e[l]||(e[l]=r,n.push(r),i[l]={});var u=function(e){if(e)for(var n=0;n<e.childNodes.length;n++)if(3!==e.childNodes[n].nodeType&&8!==e.childNodes[n].nodeType){var c=jsPlumb.getElement(e.childNodes[n]),h=t.getId(e.childNodes[n],null,!0);if(h&&o[h]&&o[h]>0){a||(a=t.getOffset(r));var d=t.getOffset(c);i[l][h]={id:h,offset:{left:d.left-a.left,top:d.top-a.top}},s[h]=l}u(e.childNodes[n])}};u(r)},this.updateOffsets=function(e,n){if(null!=e){n=n||{};var o,r=jsPlumb.getElement(e),a=t.getId(r),l=i[a];if(l)for(var u in l)if(l.hasOwnProperty(u)){var c=jsPlumb.getElement(u),h=n[u]||t.getOffset(c);if(null==c.offsetParent&&null!=i[a][u])continue;o||(o=t.getOffset(r)),i[a][u]={id:u,offset:{left:h.left-o.left,top:h.top-o.top}},s[u]=a}}},this.endpointAdded=function(n,r){r=r||t.getId(n);var a=document.body,l=n.parentNode;for(o[r]=o[r]?o[r]+1:1;null!=l&&l!==a;){var u=t.getId(l,null,!0);if(u&&e[u]){var c=t.getOffset(l);if(null==i[u][r]){var h=t.getOffset(n);i[u][r]={id:r,offset:{left:h.left-c.left,top:h.top-c.top}},s[r]=u}break}l=l.parentNode}},this.endpointDeleted=function(t){if(o[t.elementId]&&(o[t.elementId]--,o[t.elementId]<=0))for(var e in i)i.hasOwnProperty(e)&&i[e]&&(delete i[e][t.elementId],delete s[t.elementId])},this.changeId=function(t,e){i[e]=i[t],i[t]={},s[e]=s[t],s[t]=null},this.getElementsForDraggable=function(t){return i[t]},this.elementRemoved=function(t){var e=s[t];e&&(i[e]&&delete i[e][t],delete s[t])},this.reset=function(){e={},n=[],i={},o={}},this.dragEnded=function(e){if(null!=e.offsetParent){var n=t.getId(e),i=s[n];i&&this.updateOffsets(i)}},this.setParent=function(e,n,o,r,a){var l=s[n];i[r]||(i[r]={});var u=t.getOffset(o),c=a||t.getOffset(e);l&&i[l]&&delete i[l][n],i[r][n]={id:n,offset:{left:c.left-u.left,top:c.top-u.top}},s[n]=r},this.clearParent=function(t,e){var n=s[e];n&&(delete i[n][e],delete s[e])},this.revalidateParent=function(e,n,i){var o=s[n];if(o){var r={};r[n]=i,this.updateOffsets(o,r),t.revalidate(o)}},this.getDragAncestor=function(e){var n=jsPlumb.getElement(e),i=t.getId(n),o=s[i];return o?jsPlumb.getElement(o):null}},p=function(t,e,i){e=n.fastTrim(e),void 0!==t.className.baseVal?t.className.baseVal=e:t.className=e;try{var o=t.classList;if(null!=o){for(;o.length>0;)o.remove(o.item(0));for(var s=0;s<i.length;s++)i[s]&&o.add(i[s])}}catch(t){n.log("JSPLUMB: cannot set class list",t)}},f=function(t){return void 0===t.className.baseVal?t.className:t.className.baseVal},g=function(t,e,i){e=null==e?[]:n.isArray(e)?e:e.split(/\s+/),i=null==i?[]:n.isArray(i)?i:i.split(/\s+/);var o=f(t).split(/\s+/),s=function(t,e){for(var n=0;n<e.length;n++)if(t)-1===o.indexOf(e[n])&&o.push(e[n]);else{var i=o.indexOf(e[n]);-1!==i&&o.splice(i,1)}};s(!0,e),s(!1,i),p(t,o.join(" "),o)};t.jsPlumb.extend(t.jsPlumbInstance.prototype,{headless:!1,pageLocation:a,screenLocation:l,clientLocation:u,getDragManager:function(){return null==this.dragManager&&(this.dragManager=new d(this)),this.dragManager},recalculateOffsets:function(t){this.getDragManager().updateOffsets(t)},createElement:function(t,e,n,i){return this.createElementNS(null,t,e,n,i)},createElementNS:function(t,e,n,i,o){var s,r=null==t?document.createElement(e):document.createElementNS(t,e);for(s in n=n||{})r.style[s]=n[s];for(s in i&&(r.className=i),o=o||{})r.setAttribute(s,""+o[s]);return r},getAttribute:function(t,e){return null!=t.getAttribute?t.getAttribute(e):null},setAttribute:function(t,e,n){null!=t.setAttribute&&t.setAttribute(e,n)},setAttributes:function(t,e){for(var n in e)e.hasOwnProperty(n)&&t.setAttribute(n,e[n])},appendToRoot:function(t){document.body.appendChild(t)},getRenderModes:function(){return["svg"]},getClass:f,addClass:function(t,e){jsPlumb.each(t,function(t){g(t,e)})},hasClass:function(t,e){return(t=jsPlumb.getElement(t)).classList?t.classList.contains(e):-1!==f(t).indexOf(e)},removeClass:function(t,e){jsPlumb.each(t,function(t){g(t,null,e)})},toggleClass:function(t,e){jsPlumb.hasClass(t,e)?jsPlumb.removeClass(t,e):jsPlumb.addClass(t,e)},updateClasses:function(t,e,n){jsPlumb.each(t,function(t){g(t,e,n)})},setClass:function(t,e){null!=e&&jsPlumb.each(t,function(t){p(t,e,e.split(/\s+/))})},setPosition:function(t,e){t.style.left=e.left+"px",t.style.top=e.top+"px"},getPosition:function(t){var e=function(e){var n=t.style[e];return n?n.substring(0,n.length-2):0};return{left:e("left"),top:e("top")}},getStyle:function(t,e){return void 0!==window.getComputedStyle?getComputedStyle(t,null).getPropertyValue(e):t.currentStyle[e]},getSelector:function(t,e){return 1===arguments.length?null!=t.nodeType?t:document.querySelectorAll(t):t.querySelectorAll(e)},getOffset:function(t,e,n){t=jsPlumb.getElement(t),n=n||this.getContainer();for(var i={left:t.offsetLeft,top:t.offsetTop},o=e||null!=n&&t!==n&&t.offsetParent!==n?t.offsetParent:null,s=function(t){null!=t&&t!==document.body&&(t.scrollTop>0||t.scrollLeft>0)&&(i.left-=t.scrollLeft,i.top-=t.scrollTop)}.bind(this);null!=o;)i.left+=o.offsetLeft,i.top+=o.offsetTop,s(o),o=e?o.offsetParent:o.offsetParent===n?null:o.offsetParent;if(null!=n&&!e&&(n.scrollTop>0||n.scrollLeft>0)){var r=null!=t.offsetParent?this.getStyle(t.offsetParent,"position"):"static",a=this.getStyle(t,"position");"absolute"!==a&&"fixed"!==a&&"absolute"!==r&&"fixed"!==r&&(i.left-=n.scrollLeft,i.top-=n.scrollTop)}return i},getPositionOnElement:function(t,e,n){var i=void 0!==e.getBoundingClientRect?e.getBoundingClientRect():{left:0,top:0,width:0,height:0},o=document.body,s=document.documentElement,r=window.pageYOffset||s.scrollTop||o.scrollTop,a=window.pageXOffset||s.scrollLeft||o.scrollLeft,l=s.clientTop||o.clientTop||0,u=s.clientLeft||o.clientLeft||0,c=i.top+r-l+0*n,h=i.left+a-u+0*n,d=jsPlumb.pageLocation(t),p=i.width||e.offsetWidth*n,f=i.height||e.offsetHeight*n;return[(d[0]-h)/p,(d[1]-c)/f]},getAbsolutePosition:function(t){var e=function(e){var n=t.style[e];if(n)return parseFloat(n.substring(0,n.length-2))};return[e("left"),e("top")]},setAbsolutePosition:function(t,e,n,i){n?this.animate(t,{left:"+="+(e[0]-n[0]),top:"+="+(e[1]-n[1])},i):(t.style.left=e[0]+"px",t.style.top=e[1]+"px")},getSize:function(t){return[t.offsetWidth,t.offsetHeight]},getWidth:function(t){return t.offsetWidth},getHeight:function(t){return t.offsetHeight},getRenderMode:function(){return"svg"},draggable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this._initDraggableIfNecessary(i.el,!0,e,i.id,!0)}.bind(this)),this},snapToGrid:function(t,e,n){var i=[],o=function(t){var o=this.info(t);if(null!=o.el&&o.el._katavorioDrag){var s=o.el._katavorioDrag.snap(e,n);this.revalidate(o.el),i.push([o.el,s])}}.bind(this);if(1===arguments.length||3===arguments.length)o(t,e,n);else{var s=this.getManagedElements();for(var r in s)o(r,arguments[0],arguments[1])}return i},initDraggable:function(t,e,n){s(this,n).draggable(t,e),t._jsPlumbDragOptions=e},destroyDraggable:function(t,e){s(this,e).destroyDraggable(t),t._jsPlumbDragOptions=null,t._jsPlumbRelatedElement=null},unbindDraggable:function(t,e,n,i){s(this,i).destroyDraggable(t,e,n)},setDraggable:function(t,e){return jsPlumb.each(t,function(t){this.isDragSupported(t)&&(this._draggableStates[this.getAttribute(t,"id")]=e,this.setElementDraggable(t,e))}.bind(this))},_draggableStates:{},toggleDraggable:function(t){var e;return jsPlumb.each(t,function(t){var n=this.getAttribute(t,"id");return e=!(e=null!=this._draggableStates[n]&&this._draggableStates[n]),this._draggableStates[n]=e,this.setDraggable(t,e),e}.bind(this)),e},_initDraggableIfNecessary:function(t,e,i,o,s){if(!jsPlumb.headless&&(null!=e&&e&&jsPlumb.isDragSupported(t,this))){var r=i||this.Defaults.DragOptions;if(r=jsPlumb.extend({},r),jsPlumb.isAlreadyDraggable(t,this))i.force&&this.initDraggable(t,r);else{var a=jsPlumb.dragEvents.drag,l=jsPlumb.dragEvents.stop,u=jsPlumb.dragEvents.start;this.manage(o,t),r[u]=n.wrap(r[u],function(t){var e=t.el._jsPlumbDragOptions,n=!0;return e.canDrag&&(n=e.canDrag()),n&&(this.setHoverSuspended(!0),this.select({source:t.el}).addClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:t.el}).addClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),this.setConnectionBeingDragged(!0)),n}.bind(this)),r[a]=n.wrap(r[a],function(t){var e=this.getUIPosition(arguments,this.getZoom());if(null!=e){var n=t.el._jsPlumbDragOptions;this.draw(t.el,e,null,!0),n._dragging&&this.addClass(t.el,"jtk-dragged"),n._dragging=!0}}.bind(this)),r[l]=n.wrap(r[l],function(t){for(var e,n=t.selection,i=function(n){var i;null!=n[1]&&(e=this.getUIPosition([{el:n[2].el,pos:[n[1].left,n[1].top]}]),i=this.draw(n[2].el,e)),null!=n[0]._jsPlumbDragOptions&&delete n[0]._jsPlumbDragOptions._dragging,this.removeClass(n[0],"jtk-dragged"),this.select({source:n[2].el}).removeClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:n[2].el}).removeClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),t.e._drawResult=t.e._drawResult||{c:[],e:[],a:[]},Array.prototype.push.apply(t.e._drawResult.c,i.c),Array.prototype.push.apply(t.e._drawResult.e,i.e),Array.prototype.push.apply(t.e._drawResult.a,i.a),this.getDragManager().dragEnded(n[2].el)}.bind(this),o=0;o<n.length;o++)i(n[o]);this.setHoverSuspended(!1),this.setConnectionBeingDragged(!1)}.bind(this));var c=this.getId(t);this._draggableStates[c]=!0;var h=this._draggableStates[c];r.disabled=null!=h&&!h,this.initDraggable(t,r),this.getDragManager().register(t),s&&this.fire("elementDraggable",{el:t,options:r})}}},animationSupported:!0,getElement:function(t){return null==t?null:"string"==typeof(t="string"==typeof t?t:null==t.tagName&&null!=t.length&&null==t.enctype?t[0]:t)?document.getElementById(t):t},removeElement:function(t){s(this).elementRemoved(t),this.getEventManager().remove(t)},doAnimate:function(t,i,o){o=o||{};var s=this.getOffset(t),r=function(t,e){var i=function(i){if(null!=e[i]){if(n.isString(e[i])){var o=e[i].match(/-=/)?-1:1,s=e[i].substring(2);return t[i]+o*s}return e[i]}return t[i]};return[i("left"),i("top")]}(s,i),a=r[0]-s.left,l=r[1]-s.top,u=o.duration||250,c=u/15,h=15/u*a,d=15/u*l,p=0,f=setInterval(function(){e.setPosition(t,{left:s.left+h*(p+1),top:s.top+d*(p+1)}),null!=o.step&&o.step(p,Math.ceil(c)),++p>=c&&(window.clearInterval(f),null!=o.complete&&o.complete())},15)},destroyDroppable:function(t,e){s(this,e).destroyDroppable(t)},unbindDroppable:function(t,e,n,i){s(this,i).destroyDroppable(t,e,n)},droppable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],(e=e||{}).allowLoopback=!1,Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this.initDroppable(i.el,e)}.bind(this)),this},initDroppable:function(t,e,n){s(this,n).droppable(t,e)},isAlreadyDraggable:function(t){return null!=t._katavorioDrag},isDragSupported:function(t,e){return!0},isDropSupported:function(t,e){return!0},isElementDraggable:function(t){return(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.isEnabled()},getDragObject:function(t){return t[0].drag.getDragElement()},getDragScope:function(t){return t._katavorioDrag&&t._katavorioDrag.scopes.join(" ")||""},getDropEvent:function(t){return t[0].e},getUIPosition:function(t,e){var n=t[0].el;if(null==n.offsetParent)return null;var i=t[0].finalPos||t[0].pos,o={left:i[0],top:i[1]};if(n._katavorioDrag&&n.offsetParent!==this.getContainer()){var s=this.getOffset(n.offsetParent);o.left+=s.left,o.top+=s.top}return o},setDragFilter:function(t,e,n){t._katavorioDrag&&t._katavorioDrag.setFilter(e,n)},setElementDraggable:function(t,n){(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.setEnabled(n)},setDragScope:function(t,e){t._katavorioDrag&&t._katavorioDrag.k.setDragScope(t,e)},setDropScope:function(t,e){t._katavorioDrop&&t._katavorioDrop.length>0&&t._katavorioDrop[0].k.setDropScope(t,e)},addToPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.addToPosse.apply(o,t)})},setPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.setPosse.apply(o,t)})},removeFromPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.removeFromPosse.apply(o,t)})},removeFromAllPosses:function(t){var n=s(this);e.each(t,function(t){n.removeFromAllPosses(e.getElement(t))})},setPosseState:function(t,n,i){var o=s(this);e.each(t,function(t){o.setPosseState(e.getElement(t),n,i)})},dragEvents:{start:"start",stop:"stop",drag:"drag",step:"step",over:"over",out:"out",drop:"drop",complete:"complete",beforeStart:"beforeStart"},animEvents:{step:"step",complete:"complete"},stopDrag:function(t){t._katavorioDrag&&t._katavorioDrag.abort()},addToDragSelection:function(t){var e=this.getElement(t);null==e||!e._isJsPlumbGroup&&null!=e._jsPlumbGroup||s(this).select(t)},removeFromDragSelection:function(t){s(this).deselect(t)},getDragSelection:function(){return s(this).getSelection()},clearDragSelection:function(){s(this).deselectAll()},trigger:function(t,e,n,i){this.getEventManager().trigger(t,e,n,i)},doReset:function(){for(var t in this)0===t.indexOf("_katavorio_")&&this[t].reset()},getEventManager:function(){return(n=(e=this)._mottle)||(n=e._mottle=new t.Mottle),n;var e,n},on:function(t,e,n){return this.getEventManager().on.apply(this,arguments),this},off:function(t,e,n){return this.getEventManager().off.apply(this,arguments),this}});var m,v;m=e.init,(v=function(){/complete|loaded|interactive/.test(document.readyState)&&void 0!==document.body&&null!=document.body?m():setTimeout(v,9)})()}.call("undefined"!=typeof window?window:s)}(r={exports:{}},r.exports),r.exports),l=(a.jsBezier,a.Biltong,a.Mottle,a.Katavorio,a.jsPlumbUtil,a.jsPlumb);var u=function(t,e,n,i,o,s,r,a,l,u){"boolean"!=typeof r&&(l=a,a=r,r=!1);var c,h="function"==typeof n?n.options:n;if(t&&t.render&&(h.render=t.render,h.staticRenderFns=t.staticRenderFns,h._compiled=!0,o&&(h.functional=!0)),i&&(h._scopeId=i),s?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),e&&e.call(this,l(t)),t&&t._registeredComponents&&t._registeredComponents.add(s)},h._ssrRegister=c):e&&(c=r?function(){e.call(this,u(this.$root.$options.shadowRoot))}:function(t){e.call(this,a(t))}),c)if(h.functional){var d=h.render;h.render=function(t,e){return c.call(e),d(t,e)}}else{var p=h.beforeCreate;h.beforeCreate=p?[].concat(p,c):[c]}return n},c="undefined"!=typeof navigator&&/msie [6-9]\\b/.test(navigator.userAgent.toLowerCase());var h=document.head||document.getElementsByTagName("head")[0],d={};var p=function(t){return function(t,e){return function(t,e){var n=c?e.media||"default":t,i=d[n]||(d[n]={ids:new Set,styles:[]});if(!i.ids.has(t)){i.ids.add(t);var o=e.source;if(e.map&&(o+="\n/*# sourceURL="+e.map.sources[0]+" */",o+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(e.map))))+" */"),i.element||(i.element=document.createElement("style"),i.element.type="text/css",e.media&&i.element.setAttribute("media",e.media),h.appendChild(i.element)),"styleSheet"in i.element)i.styles.push(o),i.element.styleSheet.cssText=i.styles.filter(Boolean).join("\n");else{var s=i.ids.size-1,r=document.createTextNode(o),a=i.element.childNodes;a[s]&&i.element.removeChild(a[s]),a.length?i.element.insertBefore(r,a[s]):i.element.appendChild(r)}}}(t,e)}},f=u({render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("div",{staticClass:"palette-panel"},[t._t("palette",function(){return[t._m(0)]})],2)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("ul",{staticClass:"palette-group"},[e("li",[e("div",{staticClass:"palette-default-item startpoint",attrs:{"data-type":"startpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item endpoint",attrs:{"data-type":"endpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item tasknode",attrs:{"data-type":"tasknode"}})]),e("li",[e("div",{staticClass:"palette-default-item gateway",attrs:{"data-type":"gateway"}})])])}]},function(t){t&&t("data-v-c4aa9bae_0",{source:".palette-group{margin:0;padding:0;background:#fcfcfc;text-align:center;list-style:none}.palette-group>li{padding:14px 0}.palette-default-item{display:inline-block;width:40px;height:40px;font-size:12px;color:#888;border:1px solid #999;border-radius:2px;cursor:pointer;user-select:none}.palette-default-item:hover{box-shadow:0 0 8px rgba(50,50,50,.3)}.startpoint{border-radius:50%;border:4px solid #6a6c8a}.endpoint{border-radius:50%;background:#6a6c8a}.tasknode{height:30px;border:2px solid #33d0c6}.gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}",map:void 0,media:void 0})},{name:"PalettePanel",props:["selector"],data:function(){return{}}},void 0,!1,void 0,p,void 0),g=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"tool-panel"},t._l(t.tools,function(e,i){return n("div",{key:i,class:["tool-item",e.cls,{actived:"frameSelect"===e.type&&t.isFrameSelecting}],on:{click:function(n){return t.onToolClick(e)}}},[t._v("\n        "+t._s(e.name)+"\n    ")])}),0)},staticRenderFns:[]},function(t){t&&t("data-v-286a6fd7_0",{source:".tool-item{display:inline-block;margin-right:10px;user-select:none;cursor:pointer}.tool-item:last-child{margin-right:0}.tool-item.actived{color:#3a84ff}",map:void 0,media:void 0})},{name:"ToolPanel",props:["tools","isFrameSelecting"],data:function(){return{}},methods:{onToolClick:function(t){this.$emit("onToolClick",t)}}},void 0,!1,void 0,p,void 0),m=u({render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"bk-flow-location",on:{mousedown:this.onMouseDown,mouseup:this.onMouseUp}},["startpoint"===this.node.type?e("div",{staticClass:"circle-node startpoint"}):"endpoint"===this.node.type?e("div",{staticClass:"circle-node endpoint"}):"tasknode"===this.node.type?e("div",{staticClass:"tasknode"}):"gateway"===this.node.type?e("div",{staticClass:"gateway"}):e("div",{staticClass:"node-default"})])},staticRenderFns:[]},function(t){t&&t("data-v-6db820eb_0",{source:".bk-flow-location .circle-node{width:30px;height:30px;border-radius:50%;text-align:center}.bk-flow-location .startpoint{border:4px solid #6a6c8a}.bk-flow-location .endpoint{background:#6a6c8a}.bk-flow-location .tasknode{width:80px;height:50px;border:2px solid #33d0c6}.bk-flow-location .gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}.bk-flow-location .node-default{width:120px;height:80px;line-height:80px;border:1px solid #ccc;border-radius:2px;text-align:center}.bk-flow-location .node-default.selected{border:1px solid #3a84ff}",map:void 0,media:void 0})},{name:"NodeTemplate",props:{node:{type:Object,default:function(){return{}}}},data:function(){return{moveFlag:{x:0,y:0,moved:!1}}},methods:{onMouseDown:function(t){this.moveFlag={x:t.pageX,y:t.pageY,moved:!1},this.$el.addEventListener("mousemove",this.mouseMoveHandler)},onMouseUp:function(t){var e=t.pageX,n=t.pageY;this.moveFlag.x=e,this.moveFlag.y=n,this.moveFlag.moved?(console.log("drag event"),this.moveFlag.moved=!1):console.log("click event"),this.$el.removeEventListener("mousemove",this.mouseMoveHandler)},mouseMoveHandler:function(t){var e=t.pageX,n=t.pageY;(Math.abs(e-this.moveFlag.x)>2||Math.abs(n-this.moveFlag.y)>2)&&(this.moveFlag.moved=!0)}}},void 0,!1,void 0,p,void 0);function v(t){return"touches"in t?t.touches[0]:t}var y={grid:[5,5]},b={connector:["Bezier",{curviness:30}],paintStyle:{strokeWidth:2,stroke:"#567567",outlineStroke:"tranparent",outlineWidth:6},hoverPaintStyle:{fill:"transparent",stroke:"#3a84ff"}},P={endpoint:"Dot",connector:["Flowchart",{stub:[1,6],alwaysRespectStub:!0,gap:8,cornerRadius:2}],connectorOverlays:[["PlainArrow",{width:8,length:6,location:1,id:"arrow"}]],paintStyle:{fill:"#3a84ff",radius:5},anchor:["Left","Right","Top","Bottom"],isSource:!0,isTarget:!0};function x(){for(var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e="",n=0;n<7;n++)e+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return t+e}var C={showPalette:{type:Boolean,default:!0},showTool:{type:Boolean,default:!0},tools:{type:Array,default:function(){return[{type:"zoomIn",name:"放大",cls:"tool-item"},{type:"zoomOut",name:"缩小",cls:"tool-item"},{type:"resetPosition",name:"重置",cls:"tool-item"}]}},editable:{type:Boolean,default:!0},selector:{type:String,default:"palette-default-item"},data:{type:Object,default:function(){return{nodes:[],lines:[]}}},nodeOptions:{type:Object,default:function(){return e({},y)}},connectorOptions:{type:Object,default:function(){return e({},b)}},endpointOptions:{type:Object,default:function(){return e({},P)}}},_={mousedown:"ontouchstart"in document.documentElement?"touchstart":"mousedown",mousemove:"ontouchmove"in document.documentElement?"touchmove":"mousemove",mouseup:"ontouchend"in document.documentElement?"touchend":"mouseup"},j=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{class:["jsflow",{editable:t.editable}]},[n("div",{staticClass:"canvas-area"},[t.showTool?n("div",{staticClass:"tool-panel-wrap"},[t._t("toolPanel",function(){return[n("tool-panel",{attrs:{tools:t.tools,"is-frame-selecting":t.isFrameSelecting},on:{onToolClick:t.onToolClick}})]})],2):t._e(),t.showPalette?n("div",{ref:"palettePanel",staticClass:"palette-panel-wrap"},[t._t("palettePanel",function(){return[n("palette-panel",{attrs:{selector:t.selector}})]})],2):t._e(),n("div",{ref:"canvasFlowWrap",staticClass:"canvas-flow-wrap",style:t.canvasWrapStyle,on:t._d({},[t.mousedown,t.onCanvasMouseDown,t.mouseup,t.onCanvasMouseUp])},[n("div",{ref:"canvasFlow",staticClass:"canvas-flow",attrs:{id:"canvas-flow"}},[t._l(t.nodes,function(e){return n("div",{key:e.id},[n("div",{staticClass:"jsflow-node canvas-node",attrs:{id:e.id},on:{mouseenter:function(n){return t.toggleHighLight(e,!0)},mouseleave:function(n){return t.toggleHighLight(e,!1)}}},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:e}})]},{node:e})],2)])}),n("div",{staticClass:"reference-line-vertical"}),n("div",{staticClass:"reference-line-horizontal"})],2),t.isFrameSelecting?n("div",{staticClass:"canvas-frame-selector",style:t.frameSelectorStyle}):t._e()]),t.showAddingNode?n("div",{staticClass:"jsflow-node adding-node",style:t.setNodeInitialPos(t.addingNodeConfig)},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:t.addingNodeConfig}})]},{node:t.addingNodeConfig})],2):t._e()])])},staticRenderFns:[]},function(t){t&&t("data-v-9d24605c_0",{source:".jsflow{height:100%;border:1px solid #ccc}.jsflow .canvas-area{position:relative;height:100%}.jsflow .tool-panel-wrap{position:absolute;top:20px;left:70px;padding:10px 20px;background:#c4c6cc;opacity:.65;border-radius:4px;z-index:4}.jsflow .palette-panel-wrap{float:left;width:60px;height:100%;border-right:1px solid #ccc}.jsflow .canvas-flow-wrap{position:relative;height:100%;overflow:hidden}.jsflow .canvas-flow{position:relative;min-width:100%;min-height:100%}.jsflow .canvas-frame-selector{position:absolute;border:1px solid #3a84ff;background:rgba(58,132,255,.15)}.jsflow .jsflow-node{position:absolute;user-select:none}.jsflow .jtk-endpoint{z-index:1;cursor:pointer}.jsflow .adding-node{opacity:.8}.jsflow .jtk-endpoint.jtk-dragging{z-index:0}.jsflow .jtk-connector{cursor:pointer}.jsflow .reference-line-vertical{display:none;position:absolute;top:-100000px;bottom:-100000px;left:0;width:2px;background:rgba(30,144,255,.8);z-index:1}.jsflow .reference-line-horizontal{display:none;position:absolute;left:-100000px;right:-100000px;top:0;height:2px;background:rgba(30,144,255,.8);z-index:1}",map:void 0,media:void 0})},{name:"JsFlow",components:{PalettePanel:f,ToolPanel:g,NodeTemplate:m},model:{prop:"data",event:"change"},props:C,data:function(){var t=this.data;return e({nodes:t.nodes,lines:t.lines,canvasGrabbing:!1,isFrameSelecting:!1,frameMoving:null,mouseDownPos:{},canvasPos:{x:0,y:0},canvasOffset:{x:0,y:0},frameSelectorPos:{x:0,y:0},frameSelectorRect:{width:0,height:0},selectedNodes:[],showAddingNode:!1,addingNodeConfig:{},addingNodeRect:{},canvasRect:{},paletteRect:{},zoom:1,moveTimer:null},_)},computed:{canvasWrapStyle:function(){return{cursor:this.isFrameSelecting?"crosshair":this.canvasGrabbing?"-webkit-grabbing":"-webkit-grab"}},frameSelectorStyle:function(){return{left:"".concat(this.frameSelectorPos.x,"px"),top:"".concat(this.frameSelectorPos.y,"px"),width:"".concat(this.frameSelectorRect.width,"px"),height:"".concat(this.frameSelectorRect.height,"px")}}},watch:{"data.nodes":{handler:function(t){this.nodes=t},deep:!0},editable:function(t){var e=this.$el.querySelectorAll(".canvas-node");this.toggleNodeDraggable(e,t)}},mounted:function(){this.initCanvas(),this.registerEvent(),this.renderData(),this.$refs.palettePanel&&(this.paletteRect=this.$refs.palettePanel.getBoundingClientRect(),this.registerPaletteEvent())},beforeDestroy:function(){this.$refs.palettePanel&&this.$refs.palettePanel.removeEventListener(this.mousedown,this.nodeCreateHandler),this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler)},methods:{initCanvas:function(){var t={},n=e(e({},this.endpointOptions),this.connectorOptions);for(var i in n){var o=i[0].toUpperCase();t["".concat(o).concat(i.slice(1))]=n[i]}console.log(this.$refs.canvasFlow.$el),this.instance=l.getInstance(e({Container:this.$refs.canvasFlow},t))},registerEvent:function(){var t=this;this.instance.bind("beforeDrag",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrag||t.$listeners.onBeforeDrag(e))}),this.instance.bind("connectionDrag",function(e){"function"==typeof t.$listeners.onConnectionDrag&&t.$emit("onConnectionDrag",e)}),this.instance.bind("beforeDrop",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrop||t.$listeners.onBeforeDrop(e))}),this.instance.bind("connection",function(e){"function"==typeof t.$listeners.onConnection&&t.$emit("onConnection",e)}),this.instance.bind("connectionDragStop",function(e,n){if(!e.target||!e.target.classList.contains("jsflow-node")){var i=t.getNodeByEvent(n.target);if(i){var o=t.nodes.find(function(t){return i.id===t.id});if("function"==typeof t.$listeners.onConnectionDragStop){var s={id:e.source.id,arrow:e.endpoints[0].anchor.type||e.endpoints[0].anchor.cssClass};t.$emit("onConnectionDragOnNode",s,o.id,n)}}"function"==typeof t.$listeners.onConnectionDragStop&&t.$emit("onConnectionDragStop",e)}}),this.instance.bind("beforeDetach",function(e){return"function"!=typeof t.$listeners.onBeforeDetach||t.$listeners.onBeforeDetach(e)}),this.instance.bind("connectionDetached",function(e,n){var i=t.lines.filter(function(t){return t.source.id!==e.sourceId&&t.target.id!==e.targetId});t.lines=i,"function"==typeof t.$listeners.onConnectionDetached&&t.$emit("onConnectionDetached",e)}),this.instance.bind("connectionMoved",function(e,n){"function"==typeof t.$listeners.onConnectionMoved&&t.$emit("onConnectionMoved",lines)}),this.instance.bind("click",function(e,n){"function"==typeof t.$listeners.onConnectionClick&&t.$emit("onConnectionClick",e,n)}),this.instance.bind("dblclick",function(e,n){"function"==typeof t.$listeners.onConnectionDbClick&&t.$emit("onConnectionDbClick",e,n)}),this.instance.bind("endpointClick",function(e,n){"function"==typeof t.$listeners.onEndpointClick&&t.$emit("onEndpointClick",e,n)}),this.instance.bind("endpointDblClick",function(e,n){"function"==typeof t.$listeners.onEndpointDbClick&&t.$emit("onEndpointDbClick",e,n)})},renderData:function(){var t=this;this.instance.batch(function(){t.nodes.forEach(function(e){t.initNode(e)}),t.lines.forEach(function(e){t.createConnector(e,t.connectorOptions)})})},updateCanvas:function(t){this.removeAllConnector(),this.lines=t.lines,this.nodes=t.nodes,this.renderData()},createNode:function(t){var e=this;("function"!=typeof this.$listeners.onCreateNodeBefore||this.$listeners.onCreateNodeBefore(t))&&(this.nodes.push(t),this.$nextTick(function(){e.initNode(t)}))},initNode:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.setNodeDraggable(t,this.nodeOptions),this.setNodeEndPoint(t,this.endpointOptions),"function"==typeof this.$listeners.onCreateNodeAfter&&this.$emit("onCreateNodeAfter",t)},removeNode:function(t){var e=this.nodes.findIndex(function(e){return e.id===t.id});this.nodes.splice(e,1),this.instance.remove(t.id)},setNodeEndPoint:function(t,n){var i=this,o=n.anchors||{Top:[.5,0,0,-1,"Top"],Right:[1,.5,1,0,"Right"],Bottom:[.5,1,0,1,"Bottom"],Left:[0,.5,-1,0,"Left"]};Object.keys(o).forEach(function(s){var r=o[s],a=i.instance.addEndpoint(i.$el.querySelector("#".concat(t.id)),e({anchor:r,uuid:s+t.id},n));a&&a.endpoint.canvas&&(a.endpoint.canvas.dataset.pos=s)})},setNodeDraggable:function(t,n){if(this.editable){var o=this;this.instance.draggable(t.id,e({grid:[20,20],drag:function(e){var n=o.instance.getDragSelection().map(function(t){return t.el.id}),i=o.nodes.find(function(e){return t.id===e.id}),s=Object.assign({},i);if(o.toggleHighLight(t,!1),0===n.length)o.setReferenceLine(t.id,e),o.setBoundaryOffset(e);else if(n.some(function(e){return e===t.id})){var r;if(!o.frameMoving){var a,l,u=Math.min.apply(null,o.selectedNodes.map(function(t){return t.x})),c=Math.min.apply(null,o.selectedNodes.map(function(t){return t.y}));o.selectedNodes.some(function(t){if(t.x===u)return a=t,!0}),o.selectedNodes.some(function(t){if(t.y===c)return l=t,!0}),o.frameMoving={left:a,top:l}}(null===(r=o.frameMoving.left)||void 0===r?void 0:r.id)===t.id&&o.setFrameReferLine()}else o.cancelFrameSelectorHandler();o.$emit("onNodeMoving",s,e)},stop:function(e){var n=-1,s=i(e.pos,2),r=s[0],a=s[1],l=o.nodes.find(function(e,i){if(e.id===t.id)return n=i,!0}),u=Object.assign({},l,{x:r,y:a});o.nodes.splice(n,1,u),o.frameMoving=null,o.$emit("onNodeMoveStop",u,e);var c=o.$refs.canvasFlow.querySelector(".reference-line-vertical"),h=o.$refs.canvasFlow.querySelector(".reference-line-horizontal");c.setAttribute("style","display: none; left: 0"),h.setAttribute("style","display: none; top: 0"),clearTimeout(this.moveTimer)}},n))}},setReferenceLine:function(t,e){var n=this,o=e.el,s=o.clientWidth,r=o.clientHeight,a=i(e.pos,2),l=[a[0]+s/2,a[1]+r/2],u=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),c=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");u.setAttribute("style","display: none; left: 0"),c.setAttribute("style","display: none; top: 0");var h=!1,d=!1;this.data.nodes.some(function(e){if(e.id!==t){var i=n.$refs.canvasFlow.querySelector("#".concat(e.id)),o=window.getComputedStyle(i),s=o.width,r=o.height,a=[e.x+Number(s.replace("px",""))/2,e.y+Number(r.replace("px",""))/2];return h||a[0]!==l[0]||(u.setAttribute("style","display: inline-block; left: ".concat(a[0]-1,"px;")),h=!0),d||a[1]!==l[1]||(c.setAttribute("style","display: inline-block; top: ".concat(a[1]-1,"px;")),d=!0),!(!h||!d)||void 0}})},setFrameReferLine:function(){var t=this,e=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.left.id)),n=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.top.id)),i=Number(window.getComputedStyle(e).left.replace("px","")),o=Number(window.getComputedStyle(n).top.replace("px","")),s=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),r=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");s.setAttribute("style","display: none; left: 0"),r.setAttribute("style","display: none; top: 0");var a=!1,l=!1;this.data.nodes.some(function(e){if(!t.selectedNodes.find(function(t){return t.id===e.id})){var n=[e.x,e.y];return a||n[0]!==i||(s.setAttribute("style","display: inline-block; left: ".concat(i,"px;")),a=!0),l||n[1]!==o||(r.setAttribute("style","display: inline-block; top: ".concat(o,"px;")),l=!0),!(!a||!l)||void 0}})},setBoundaryOffset:function(t){var e=this.$refs.canvasFlowWrap.getBoundingClientRect(),n=e.left,i=e.top,o=e.width,s=e.height;t.e.pageX<n&&this.intervalMoveCanvas("horizontal",20),t.e.pageX>n+o&&this.intervalMoveCanvas("horizontal",-20),t.e.pageY<i&&this.intervalMoveCanvas("vertical",20),t.e.pageY>i+s&&this.intervalMoveCanvas("vertical",-20)},intervalMoveCanvas:function(t,e){var n=this;this.moveTimer&&clearTimeout(this.moveTimer),this.moveTimer=setTimeout(function(){var i=n.canvasOffset,o=i.x,s=i.y;"horizontal"===t?o+=e:s+=e,n.setCanvasPosition(o,s),n.moveTimer||n.intervalMoveCanvas(t,e)},16)},setNodePosition:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.instance.revalidate(e)},toggleNodeDraggable:function(t,e){this.instance.setDraggable(t,e)},setNodeInitialPos:function(t){var e={left:"".concat(t.x,"px"),top:"".concat(t.y,"px"),visibility:t.visible?"initial":"hidden"};return 1!==this.zoom&&(e.transform="matrix(".concat(this.zoom,", 0, 0, ").concat(this.zoom,", 0, 0)")),console.log(this.zoom,t.x,t.y),e},createConnector:function(t,n){var i=t.options||{};return this.instance.connect({source:this.$el.querySelector("#".concat(t.source.id)),target:this.$el.querySelector("#".concat(t.target.id)),uuids:[t.source.arrow+t.source.id,t.target.arrow+t.target.id]},e(e({},n),i))},setConnector:function(t,e,n){var i=this;this.instance.getAllConnections().filter(function(n){return n.sourceId===t&&n.targetId===e}).forEach(function(t){t.setConnector(n),i.endpointOptions&&i.endpointOptions.connectorOverlays&&i.endpointOptions.connectorOverlays.forEach(function(e){t.addOverlay(e)})})},removeConnector:function(t){var e=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){e.instance.deleteConnection(t)})},removeAllConnector:function(){this.instance.deleteEveryConnection(),this.lines=[]},getConnectorsByNodeId:function(t){return this.instance.getAllConnections().filter(function(e){return e.sourceId===t||e.targetId===t})},getNodeByEvent:function(t){var e=t.parentNode;return!(!e||"HTML"===e.nodeName)&&(e.classList.contains("jsflow-node")?e:this.getNodeByEvent(e))},addLineOverlay:function(t,e){var n=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.addOverlay([e.type,{label:e.name,location:e.location,cssClass:e.cls,id:e.id,events:{click:function(t,e){n.$emit("onOverlayClick",t,e)}}}])})},removeLineOverlay:function(t,e){this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.removeOverlay(e)})},onCanvasMouseDown:function(t){"touchstart"!==t.type&&0!==t.button||(t=v(t),this.isFrameSelecting?this.frameSelectHandler(t):(this.canvasGrabbing=!0,this.mouseDownPos={x:t.pageX,y:t.pageY},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.canvasFlowMoveHandler,!1)))},canvasFlowMoveHandler:function(t){t=v(t),this.canvasOffset={x:this.canvasPos.x+t.pageX-this.mouseDownPos.x,y:this.canvasPos.y+t.pageY-this.mouseDownPos.y},this.$refs.canvasFlow.style.left="".concat(this.canvasOffset.x,"px"),this.$refs.canvasFlow.style.top="".concat(this.canvasOffset.y,"px"),this.$emit("onCanvasMove",{left:this.canvasOffset.x,top:this.canvasOffset.y})},onCanvasMouseUp:function(t){this.isFrameSelecting?this.frameSelectEndHandler(t):(this.canvasGrabbing=!1,this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.canvasFlowMoveHandler),this.canvasPos={x:this.canvasOffset.x,y:this.canvasOffset.y})},registerPaletteEvent:function(){this.$refs.palettePanel.addEventListener(this.mousedown,this.nodeCreateHandler,!1)},nodeCreateHandler:function(t){var n=this,i=function t(e,n){return 1===e.nodeType&&e.classList.contains(n)?e:"HTML"!==e.parentNode.nodeName?t(e.parentNode,n):null}(t.target,this.selector);if(i){var o=i.dataset.type?i.dataset.type:"",s={};for(var r in i.dataset){var a=r.match(/(config)(\w*)/);if(a&&""!==a[2]){var l=a[2],u=l[0].toLowerCase()+l.slice(1);s[u]=i.dataset[r]}}this.showAddingNode=!0,this.addingNodeConfig.id=x("node"),this.addingNodeConfig.type=o,this.$nextTick(function(){var i=n.$el.querySelector(".adding-node");n.addingNodeRect=i.getBoundingClientRect();var r=n.getAddingNodePos(t);n.addingNodeConfig=e({id:x("node"),type:o,x:r.x,y:r.y,adding:!0,visible:!1},s),n.$el.addEventListener(n.mousemove,n.nodeMovingHandler,!1),document.addEventListener(n.mouseup,n.nodeMoveEndHandler,!1)})}},nodeMovingHandler:function(t){var e=this.getAddingNodePos(t);console.log("e.pageX, e.pageY: ",t.pageX,t.pageY),this.$set(this.addingNodeConfig,"x",e.x),this.$set(this.addingNodeConfig,"y",e.y),this.$set(this.addingNodeConfig,"visible",!0),"function"==typeof this.$listeners.onAddNodeMoving&&this.$emit("onAddNodeMoving",{type:this.addingNodeConfig.type,x:e.x,y:e.y})},nodeMoveEndHandler:function(t){if(this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler),this.showAddingNode=!1,t.pageX>this.paletteRect.left+this.paletteRect.width){var e=(this.addingNodeConfig.x-this.paletteRect.width-this.canvasOffset.x+this.addingNodeRect.width*(1-this.zoom)/2)/this.zoom,n=(this.addingNodeConfig.y-this.canvasOffset.y+this.addingNodeRect.height*(1-this.zoom)/2)/this.zoom;console.log("zoom: ",this.zoom),console.log("nodeX nodeY: ",e,n),this.$set(this.addingNodeConfig,"x",e),this.$set(this.addingNodeConfig,"y",n),delete this.addingNodeConfig.adding,delete this.addingNodeConfig.visible,this.createNode(this.addingNodeConfig)}this.addingNodeConfig={},this.addingNodeRect={}},getAddingNodePos:function(t){return console.log(t.pageX,this.paletteRect.left,this.addingNodeRect.width),console.log(t.pageY,this.paletteRect.top,this.addingNodeRect.height),{x:t.pageX-this.paletteRect.left-this.addingNodeRect.width/this.zoom/2,y:t.pageY-this.paletteRect.top-this.addingNodeRect.height/this.zoom/2}},toggleHighLight:function(t){var e=this,n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(this.editable){var i=this.$el.querySelector("#".concat(t.id));this.instance.selectEndpoints({source:i}).each(function(t){var i;n?(i=e.endpointOptions.hoverPaintStyle,t.endpoint.canvas.classList.add("jtk-endpoint-highlight")):(i=e.endpointOptions.paintStyle,t.endpoint.canvas.classList.remove("jtk-endpoint-highlight")),i&&t.setStyle(i)})}},onToolClick:function(t){"function"==typeof this[t.type]&&this[t.type](),this.$emit("onToolClick",t)},setZoom:function(t,e,n){this.instance.setContainer(this.$refs.canvasFlow),this.$refs.canvasFlow.style.transform="matrix("+t+",0,0,"+t+","+e+","+n+")",this.$refs.canvasFlow.style.transformOrigin="0 0",this.$refs.canvasFlow.zoom=t,this.zoom=t,this.instance.setZoom(t)},zoomIn:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1.1,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i>2||this.setZoom(i,o,s)},zoomOut:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:.9,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i<.1||this.setZoom(i,o,s)},resetPosition:function(){this.setZoom(1,0,0),this.setCanvasPosition(0,0)},setCanvasPosition:function(t,e){this.canvasOffset={x:t,y:e},this.canvasPos={x:t,y:e},this.$refs.canvasFlow.style.left=this.canvasOffset.x+"px",this.$refs.canvasFlow.style.top=this.canvasOffset.y+"px"},frameSelect:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.isFrameSelecting=t},onOpenFrameSelect:function(){this.frameSelect()},onCloseFrameSelect:function(){this.frameSelect(!1)},frameSelectHandler:function(t){this.canvasRect=this.$refs.canvasFlowWrap.getBoundingClientRect(),this.mouseDownPos={x:t.clientX-this.canvasRect.left,y:t.clientY-this.canvasRect.top},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.frameSelectMovingHandler,!1)},frameSelectMovingHandler:function(t){var e=t.clientX-this.mouseDownPos.x-this.canvasRect.left,n=t.clientY-this.mouseDownPos.y-this.canvasRect.top;this.frameSelectorRect={width:Math.abs(e),height:Math.abs(n)},this.frameSelectorPos={x:e>0?this.mouseDownPos.x:this.mouseDownPos.x+e,y:n>0?this.mouseDownPos.y:this.mouseDownPos.y+n}},frameSelectEndHandler:function(t){this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.frameSelectMovingHandler),this.$refs.canvasFlowWrap.removeEventListener(this.mouseup,this.frameSelectEndHandler),document.addEventListener(this.mousedown,this.cancelFrameSelectorHandler,{capture:!1,once:!0});var e=this.getSelectedNodes(),n=e.map(function(t){return t.id}),i=this.mouseDownPos,o=i.x,s=i.y;this.isFrameSelecting=!1,this.frameSelectorPos={x:0,y:0},this.frameSelectorRect={width:0,height:0},this.selectedNodes=e,this.clearNodesDragSelection(),this.addNodesToDragSelection(n),this.$emit("onFrameSelectEnd",e.slice(0),o,s)},getSelectedNodes:function(){var t=this,e=this.frameSelectorPos,n=e.x,i=e.y,o=this.frameSelectorRect,s=o.width,r=o.height;return this.nodes.filter(function(e){var o=t.$el.querySelector("#".concat(e.id)).getBoundingClientRect(),a=o.left-t.canvasRect.left,l=o.top-t.canvasRect.top;if(n<a&&n+s>a&&i<l&&i+r>l)return!0})},cancelFrameSelectorHandler:function(t){this.selectedNodes=[],this.clearNodesDragSelection(),this.$emit("onCloseFrameSelect")},addNodesToDragSelection:function(t){var e=this;t.forEach(function(t){var n=e.$el.querySelector("#".concat(t));n&&n.classList.add("selected")}),this.instance.addToDragSelection(t)},clearNodesDragSelection:function(){this.$el.querySelectorAll(".jsflow-node.selected").forEach(function(t){t.classList.remove("selected")}),this.instance.clearDragSelection()}}},void 0,!1,void 0,p,void 0);"undefined"!=typeof window&&"Vue"in window&&window.Vue.component("js-flow",j);export default j;
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
index 36b3f92c0c..3dde9af1a2 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
@@ -20,7 +20,7 @@
             { 'actived': node.isActived }
         ]">
         <div class="node-status-block">
-            <i class="node-icon-font common-icon-subflow-mark"></i>
+            <i class="node-icon-font common-icon-sub-process"></i>
             <div v-if="node.stage_name" class="stage-name">{{ node.stage_name }}</div>
         </div>
         <div class="node-name" :title="node.name">
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 44cffd3dd4..e11bd7ce29 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1751,7 +1751,9 @@ const cn = {
     '确认删除执行方案【n】?': '确认删除执行方案【{n}】？',
     '取消设为默认方案': '取消设为默认方案',
     'tagCodeEditorTips': '脚本内容{0}全局变量。检测到疑似 {1} 处引用，建议使用脚本参数传入。',
-    '不再支持': '不再支持'
+    '不再支持': '不再支持',
+    '执行结果': '执行结果',
+    '最大化': '最大化'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index e8102a661c..8feec4f759 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1785,7 +1785,9 @@ const en = {
     '取消设为默认方案': 'Unset as Default',
     'tagCodeEditorTips': 'Script content {0} global variable. A suspected reference to {1} was detected, and it is recommended to use script parameters to pass in.',
     '不再支持': 'no supported',
-    '添加收藏': 'Collection'
+    '添加收藏': 'Collection',
+    '执行结果': 'Results',
+    '最大化': 'Max'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index e581c2afd5..64bd17a854 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -11,167 +11,198 @@
 */
 <template>
     <div class="parameter-details">
-        <div class="details-wrapper">
+        <bk-resize-layout class="details-wrapper" placement="left" :max="500" :initial-divide="403" :min="400">
             <NodeTree
-                class="nodeTree"
+                slot="aside"
                 :data="nodeData"
-                :node-nav="nodeNav"
                 :node-display-status="nodeDisplayStatus"
-                :selected-flow-path="selectedFlowPath"
                 :default-active-id="defaultActiveId"
-                :is-condition="isCondition"
-                @onOpenGatewayInfo="onOpenGatewayInfo"
-                @onNodeClick="onNodeClick"
                 @onSelectNode="onSelectNode">
             </NodeTree>
-            <div
-                v-if="location"
-                :class="['execute-info', { 'loading': loading }]"
-                v-bkloading="{ isLoading: loading, opacity: 1, zIndex: 100 }">
+            <div slot="main" class="execute-content">
                 <div class="execute-head">
                     <span class="node-name">{{isCondition ? conditionData.name : executeInfo.name}}</span>
+                    <bk-divider direction="vertical"></bk-divider>
                     <div class="node-state">
                         <span :class="displayStatus"></span>
                         <span class="status-text-messages">{{nodeState}}</span>
                     </div>
                 </div>
-                <bk-tab
-                    :key="nodeDetailConfig.node_id"
-                    :active.sync="curActiveTab"
-                    type="unborder-card"
-                    ext-cls="execute-info-tab"
-                    @tab-change="onTabChange">
-                    <bk-tab-panel name="record" v-if="!isCondition" :label="$t('执行记录')"></bk-tab-panel>
-                    <bk-tab-panel name="config" v-if="isCondition || (['tasknode', 'subflow'].includes(location.type))" :label="$t('配置快照')"></bk-tab-panel>
-                    <bk-tab-panel name="history" v-if="!isCondition" :label="$t('操作历史')"></bk-tab-panel>
-                    <bk-tab-panel name="log" v-if="!isCondition" :label="$t('调用日志')"></bk-tab-panel>
-                </bk-tab>
-                <div class="scroll-area" :key="randomKey">
-                    <task-condition
-                        v-if="isCondition"
-                        ref="conditionEdit"
-                        :is-readonly="true"
-                        :is-show.sync="isShow"
-                        :gateways="gateways"
-                        :condition-data="conditionData"
-                        @close="close">
-                    </task-condition>
-                    <template v-else>
-                        <section class="execute-time-section" v-if="isExecuteTimeShow">
-                            <div class="cycle-wrap" v-if="loop > 1">
-                                <span>{{$t('第')}}</span>
-                                <bk-select
-                                    :clearable="false"
-                                    :value="theExecuteTime"
-                                    @selected="onSelectExecuteTime">
-                                    <bk-option
-                                        v-for="index in loop"
-                                        :key="index"
-                                        :id="index"
-                                        :name="index">
-                                    </bk-option>
-                                </bk-select>
-                                <span>{{$t('次循环')}}</span>
-                            </div>
-                            <span class="divid-line" v-if="loop > 1 && historyInfo.length > 1"></span>
-                            <div class="time-wrap" v-if="historyInfo.length > 1">
-                                <span>{{$t('第')}}</span>
-                                <bk-select
-                                    :clearable="false"
-                                    :value="theExecuteRecord"
-                                    @selected="onSelectExecuteRecord">
-                                    <bk-option
-                                        v-for="index in historyInfo.length"
-                                        :key="index"
-                                        :id="index"
-                                        :name="index">
-                                    </bk-option>
-                                </bk-select>
-                                <span>{{$t('次执行')}}</span>
-                            </div>
-                        </section>
-                        <ExecuteRecord
-                            v-if="curActiveTab === 'record'"
-                            :admin-view="adminView"
-                            :loading="loading"
-                            :location="location"
-                            :is-ready-status="isReadyStatus"
-                            :node-activity="nodeActivity"
-                            :execute-info="executeRecord"
-                            :node-detail-config="nodeDetailConfig"
-                            :is-sub-process-node="isSubProcessNode">
-                        </ExecuteRecord>
-                        <ExecuteInfoForm
-                            v-else-if="curActiveTab === 'config'"
-                            :node-activity="nodeActivity"
-                            :execute-info="executeInfo"
-                            :node-detail-config="nodeDetailConfig"
-                            :constants="constants"
-                            :is-third-party-node="isThirdPartyNode"
-                            :third-party-node-code="thirdPartyNodeCode"
-                            :is-sub-process-node="isSubProcessNode">
-                        </ExecuteInfoForm>
-                        <section class="info-section" data-test-id="taskExcute_form_operatFlow" v-else-if="curActiveTab === 'history'">
-                            <NodeOperationFlow :locations="pipelineData.location" :node-id="executeInfo.id"></NodeOperationFlow>
-                        </section>
-                        <NodeLog
-                            v-else-if="curActiveTab === 'log'"
-                            ref="nodeLog"
-                            :admin-view="adminView"
-                            :node-detail-config="nodeDetailConfig"
-                            :execute-info="executeRecord"
-                            :third-party-node-code="thirdPartyNodeCode"
-                            :engine-ver="engineVer">
-                        </NodeLog>
-                    </template>
-                </div>
-                <div class="action-wrapper" v-if="isShowActionWrap">
-                    <template v-if="realTimeState.state === 'RUNNING' && !isSubProcessNode">
-                        <bk-button
-                            v-if="nodeDetailConfig.component_code === 'pause_node'"
-                            theme="primary"
-                            data-test-id="taskExcute_form_resumeBtn"
-                            @click="onResumeClick">
-                            {{ $t('继续执行') }}
-                        </bk-button>
-                        <bk-button
-                            v-else-if="nodeDetailConfig.component_code === 'bk_approve'"
-                            theme="primary"
-                            data-test-id="taskExcute_form_approvalBtn"
-                            @click="$emit('onApprovalClick', nodeDetailConfig.node_id)">
-                            {{ $t('审批') }}
-                        </bk-button>
-                        <bk-button
-                            v-else
-                            data-test-id="taskExcute_form_mandatoryFailBtn"
-                            @click="mandatoryFailure">
-                            {{ $t('强制终止') }}
-                        </bk-button>
-                    </template>
-                    <template v-if="isShowRetryBtn || isShowSkipBtn">
-                        <bk-button
-                            theme="primary"
-                            v-if="isShowRetryBtn"
-                            data-test-id="taskExcute_form_retryBtn"
-                            @click="onRetryClick">
-                            {{ $t('重试') }}
-                        </bk-button>
-                        <bk-button
-                            theme="default"
-                            v-if="isShowSkipBtn"
-                            data-test-id="taskExcute_form_skipBtn"
-                            @click="onSkipClick">
-                            {{ $t('跳过') }}
-                        </bk-button>
-                    </template>
+                <div :class="['scroll-box', { 'subprocess-scroll': subProcessPipeline }]">
+                    <div
+                        :class="['sub-process', { 'canvas-expand': canvasExpand }]"
+                        v-if="subProcessPipeline">
+                        <TemplateCanvas
+                            ref="subProcessCanvas"
+                            class="sub-flow"
+                            :show-palette="false"
+                            :show-tool="false"
+                            :editable="false"
+                            :canvas-data="canvasData">
+                        </TemplateCanvas>
+                        <div class="flow-option">
+                            <i
+                                class="bk-icon icon-narrow-line"
+                                v-bk-tooltips.top="$t('缩小')"
+                                @click="onZoomOut">
+                            </i>
+                            <i
+                                class="bk-icon icon-enlarge-line"
+                                v-bk-tooltips.top="$t('放大')"
+                                @click="onZoomIn">
+                            </i>
+                            <i
+                                :class="canvasExpand ? 'common-icon-partial-screen' : 'common-icon-full-screen'"
+                                v-bk-tooltips.top="$t(canvasExpand ? '收起' : '最大化')"
+                                @click="canvasExpand = !canvasExpand">
+                            </i>
+                        </div>
+                    </div>
+                    <div
+                        v-if="location"
+                        :key="randomKey"
+                        :class="['execute-info', { 'loading': loading }]"
+                        v-bkloading="{ isLoading: loading, opacity: 1, zIndex: 100 }">
+                        <bk-tab
+                            :active.sync="curActiveTab"
+                            type="unborder-card"
+                            ext-cls="execute-info-tab"
+                            @tab-change="onTabChange">
+                            <bk-tab-panel name="record" v-if="!isCondition" :label="$t('执行记录')"></bk-tab-panel>
+                            <bk-tab-panel name="config" v-if="isCondition || (!loading && ['tasknode', 'subflow'].includes(location.type))" :label="$t('配置快照')"></bk-tab-panel>
+                            <bk-tab-panel name="history" v-if="!isCondition" :label="$t('操作历史')"></bk-tab-panel>
+                            <bk-tab-panel name="log" v-if="!isCondition" :label="$t('调用日志')"></bk-tab-panel>
+                        </bk-tab>
+                        <div class="scroll-area">
+                            <task-condition
+                                v-if="isCondition"
+                                ref="conditionEdit"
+                                :is-readonly="true"
+                                :is-show.sync="isShow"
+                                :gateways="gateways"
+                                :condition-data="conditionData"
+                                @close="close">
+                            </task-condition>
+                            <template v-else>
+                                <section class="execute-time-section" v-if="isExecuteTimeShow">
+                                    <div class="cycle-wrap" v-if="loop > 1">
+                                        <span>{{$t('第')}}</span>
+                                        <bk-select
+                                            :clearable="false"
+                                            :value="theExecuteTime"
+                                            @selected="onSelectExecuteTime">
+                                            <bk-option
+                                                v-for="index in loop"
+                                                :key="index"
+                                                :id="index"
+                                                :name="index">
+                                            </bk-option>
+                                        </bk-select>
+                                        <span>{{$t('次循环')}}</span>
+                                    </div>
+                                    <span class="divid-line" v-if="loop > 1 && historyInfo.length > 1"></span>
+                                    <div class="time-wrap" v-if="historyInfo.length > 1">
+                                        <span>{{$t('第')}}</span>
+                                        <bk-select
+                                            :clearable="false"
+                                            :value="theExecuteRecord"
+                                            @selected="onSelectExecuteRecord">
+                                            <bk-option
+                                                v-for="index in historyInfo.length"
+                                                :key="index"
+                                                :id="index"
+                                                :name="index">
+                                            </bk-option>
+                                        </bk-select>
+                                        <span>{{$t('次执行')}}</span>
+                                    </div>
+                                </section>
+                                <ExecuteRecord
+                                    v-if="curActiveTab === 'record'"
+                                    :admin-view="adminView"
+                                    :loading="loading"
+                                    :location="location"
+                                    :is-ready-status="isReadyStatus"
+                                    :node-state="nodeState"
+                                    :node-activity="nodeActivity"
+                                    :execute-info="executeRecord"
+                                    :node-detail-config="nodeDetailConfig"
+                                    :is-sub-process-node="isSubProcessNode">
+                                </ExecuteRecord>
+                                <ExecuteInfoForm
+                                    v-else-if="curActiveTab === 'config'"
+                                    :node-activity="nodeActivity"
+                                    :execute-info="executeInfo"
+                                    :node-detail-config="nodeDetailConfig"
+                                    :constants="pipelineData.constants"
+                                    :is-third-party-node="isThirdPartyNode"
+                                    :third-party-node-code="thirdPartyNodeCode"
+                                    :is-sub-process-node="isSubProcessNode">
+                                </ExecuteInfoForm>
+                                <section class="info-section" data-test-id="taskExcute_form_operatFlow" v-else-if="curActiveTab === 'history'">
+                                    <NodeOperationFlow :locations="pipelineData.location" :node-id="executeInfo.id"></NodeOperationFlow>
+                                </section>
+                                <NodeLog
+                                    v-else-if="curActiveTab === 'log'"
+                                    ref="nodeLog"
+                                    :admin-view="adminView"
+                                    :node-detail-config="nodeDetailConfig"
+                                    :execute-info="executeRecord"
+                                    :third-party-node-code="thirdPartyNodeCode"
+                                    :engine-ver="engineVer">
+                                </NodeLog>
+                            </template>
+                        </div>
+                        <div class="action-wrapper" v-if="isShowActionWrap">
+                            <template v-if="executeInfo.state === 'RUNNING' && !isSubProcessNode">
+                                <bk-button
+                                    v-if="nodeDetailConfig.component_code === 'pause_node'"
+                                    theme="primary"
+                                    data-test-id="taskExcute_form_resumeBtn"
+                                    @click="onResumeClick">
+                                    {{ $t('继续执行') }}
+                                </bk-button>
+                                <bk-button
+                                    v-else-if="nodeDetailConfig.component_code === 'bk_approve'"
+                                    theme="primary"
+                                    data-test-id="taskExcute_form_approvalBtn"
+                                    @click="$emit('onApprovalClick', nodeDetailConfig.node_id)">
+                                    {{ $t('审批') }}
+                                </bk-button>
+                                <bk-button
+                                    v-else
+                                    data-test-id="taskExcute_form_mandatoryFailBtn"
+                                    @click="mandatoryFailure">
+                                    {{ $t('强制终止') }}
+                                </bk-button>
+                            </template>
+                            <template v-if="isShowRetryBtn || isShowSkipBtn">
+                                <bk-button
+                                    theme="primary"
+                                    v-if="isShowRetryBtn"
+                                    data-test-id="taskExcute_form_retryBtn"
+                                    @click="onRetryClick">
+                                    {{ $t('重试') }}
+                                </bk-button>
+                                <bk-button
+                                    theme="default"
+                                    v-if="isShowSkipBtn"
+                                    data-test-id="taskExcute_form_skipBtn"
+                                    @click="onSkipClick">
+                                    {{ $t('跳过') }}
+                                </bk-button>
+                            </template>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
+        </bk-resize-layout>
     </div>
 </template>
 <script>
     import i18n from '@/config/i18n/index.js'
-    import { mapState, mapActions } from 'vuex'
+    import TemplateCanvas from '@/components/common/TemplateCanvas/index.vue'
+    import { mapState, mapMutations, mapActions } from 'vuex'
     import tools from '@/utils/tools.js'
     import atomFilter from '@/utils/atomFilter.js'
     import { TASK_STATE_DICT, NODE_DICT } from '@/constants/index.js'
@@ -190,7 +221,8 @@
             ExecuteRecord,
             NodeLog,
             ExecuteInfoForm,
-            taskCondition
+            taskCondition,
+            TemplateCanvas
         },
         props: {
             adminView: {
@@ -207,18 +239,6 @@
                     return []
                 }
             },
-            selectedFlowPath: {
-                type: Array,
-                default () {
-                    return []
-                }
-            },
-            nodeNav: {
-                type: Array,
-                default () {
-                    return []
-                }
-            },
             defaultActiveId: {
                 type: String,
                 default: ''
@@ -253,6 +273,10 @@
             isReadonly: {
                 type: Boolean,
                 default: false
+            },
+            smallMapImg: {
+                type: String,
+                default: ''
             }
         },
         data () {
@@ -280,10 +304,16 @@
                 isShowRetryBtn: false,
                 curActiveTab: 'record',
                 theExecuteRecord: 0,
-                executeRecord: {}
+                executeRecord: {},
+                subFlowData: {},
+                subCanvasData: {},
+                canvasExpand: false
             }
         },
         computed: {
+            ...mapMutations('template/', [
+                'setLine'
+            ]),
             ...mapState({
                 'atomFormConfig': state => state.atomForm.config,
                 'atomOutputConfig': state => state.atomForm.outputConfig,
@@ -361,23 +391,87 @@
             isShowActionWrap () {
                 // 任务终止时禁止节点操作
                 return this.state !== 'REVOKED' && ((this.realTimeState.state === 'RUNNING' && !this.isSubProcessNode) || this.isShowRetryBtn || this.isShowSkipBtn)
+            },
+            isLegacySubProcess () { // 是否为旧版子流程
+                return !this.isSubProcessNode && this.nodeActivity && this.nodeActivity.type === 'SubProcess'
+            },
+            subProcessPipeline () {
+                let pipelineData
+                if (this.isSubProcessNode || this.isLegacySubProcess) {
+                    if (this.nodeActivity.pipeline) {
+                        pipelineData = this.nodeActivity.pipeline
+                    } else {
+                        let { data: componentData } = this.nodeActivity.component
+                        componentData = componentData && componentData.subprocess
+                        componentData = componentData && componentData.value
+                        componentData = componentData && componentData.pipeline
+                        pipelineData = componentData || pipelineData
+                    }
+                } else if (this.nodeDetailConfig.root_node) {
+                    pipelineData = this.pipelineData
+                }
+                return pipelineData
+            },
+            canvasData () {
+                if (!this.subProcessPipeline) return {}
+                const { line, location, gateways, activities } = this.subProcessPipeline
+                const branchConditions = {}
+                for (const gKey in gateways) {
+                    const item = gateways[gKey]
+                    if (item.conditions) {
+                        branchConditions[item.id] = Object.assign({}, item.conditions)
+                    }
+                    if (item.default_condition) {
+                        const nodeId = item.default_condition.flow_id
+                        branchConditions[item.id][nodeId] = item.default_condition
+                    }
+                }
+                return {
+                    lines: line,
+                    locations: location.map(item => {
+                        const code = item.type === 'tasknode' ? activities[item.id].component.code : ''
+                        return { ...item, mode: 'execute', checked: true, code, ready: true }
+                    }),
+                    branchConditions
+                }
             }
         },
         watch: {
-            'nodeDetailConfig.node_id': {
+            nodeDetailConfig: {
                 handler (val) {
-                    if (val !== undefined) {
-                        this.loop = 1
-                        this.theExecuteTime = undefined
-                        this.curActiveTab = 'record'
+                    if (val.node_id !== undefined) {
                         this.loadNodeInfo()
                     }
+                    if (val.component_code === 'subprocess_plugin') {
+                        this.subCanvasData = val.componentData.subprocess.value.pipeline
+                        const { lines, locations: nodes } = this.subCanvasData
+                        this.subFlowData = {
+                            lines,
+                            nodes
+                        }
+                    }
                 },
                 deep: true
+            },
+            nodeDisplayStatus: {
+                handler (val) {
+                    this.updateNodeInfo()
+                },
+                deep: true,
+                immediate: true
             }
         },
         mounted () {
             this.loadNodeInfo()
+            if (this.subProcessPipeline) {
+                this.$nextTick(() => {
+                    const flowDom = this.$el.querySelector('.sub-flow')
+                    const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
+                    let jsFlowInstance = this.$refs.subProcessCanvas
+                    jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                    jsFlowInstance && jsFlowInstance.zoomOut(0.75, width / 2, height / 2)
+                })
+            }
         },
         methods: {
             ...mapActions('task/', [
@@ -449,12 +543,6 @@
                     this.loading = false
                 }
             },
-            onNodeClick (id, type, event) {
-                this.$emit('onNodeClick', id, type)
-            },
-            onOpenGatewayInfo (data, isCondition) {
-                this.$emit('onOpenGatewayInfo', data, isCondition)
-            },
             close () {
                 this.$emit('close')
             },
@@ -486,15 +574,13 @@
                 let constants = {}
                 let inputsInfo = inputs
                 let failInfo = ''
-                // 判断是否为旧版子流程
-                const islegacySubProcess = !this.isSubProcessNode && this.nodeActivity && this.nodeActivity.type === 'SubProcess'
                 // 添加插件输出表单所需上下文
                 $.context.input_form.inputs = inputs
                 $.context.output_form.outputs = outputs
                 $.context.output_form.state = state
                 // 获取子流程配置详情
-                if (componentCode === 'subprocess_plugin' || islegacySubProcess) {
-                    const { constants } = islegacySubProcess ? this.pipelineData : this.componentValue.pipeline
+                if (componentCode === 'subprocess_plugin' || this.isLegacySubProcess) {
+                    const { constants } = this.isLegacySubProcess ? this.pipelineData : this.componentValue.pipeline
                     this.renderConfig = await this.getSubflowInputsConfig(constants)
                 } else if (componentCode) { // 任务节点需要加载标准插件
                     await this.getNodeConfig(componentCode, version, inputs.plugin_version)
@@ -512,7 +598,7 @@
                         }
                         return acc
                     }, {})
-                } else if (islegacySubProcess) {
+                } else if (this.isLegacySubProcess) {
                     /**
                      * 兼容旧版本子流程节点输入数据
                      * 获取子流程输入参数 (subflow_detail_var 标识当前为子流程节点详情)
@@ -560,7 +646,7 @@
                                 outputsInfo.push(info)
                             }
                         })
-                    } else if (islegacySubProcess) {
+                    } else if (this.isLegacySubProcess) {
                         // 兼容旧版本子流程节点输出数据
                         outputsInfo = outputs.reduce((acc, cur) => {
                             const { value, key } = cur
@@ -594,7 +680,6 @@
             },
             async getTaskNodeDetail () {
                 try {
-                    if (this.nodeDetailConfig.root_node) return
                     let query = Object.assign({}, this.nodeDetailConfig, { loop: this.theExecuteTime })
                     let res
 
@@ -784,15 +869,92 @@
                 }
                 this.randomKey = new Date().getTime()
             },
+            onZoomOut () {
+                const flowDom = this.$el.querySelector('.sub-flow')
+                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
+                this.$refs.subProcessCanvas.onZoomOut({ x: width / 2, y: height / 2 })
+            },
+            onZoomIn () {
+                const flowDom = this.$el.querySelector('.sub-flow')
+                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
+                this.$refs.subProcessCanvas.onZoomIn({ x: width / 2, y: height / 2 })
+            },
             onTabChange (name) {
                 this.curActiveTab = name
                 if (['record', 'log'].includes(name)) {
                     this.onSelectExecuteRecord(this.theExecuteRecord)
                 }
+                if (this.canvasExpand) {
+                    const scrollBoxDom = document.querySelector('.scroll-box')
+                    const subProcessCanvasDom = document.querySelector('.sub-process')
+                    const { height = 0 } = subProcessCanvasDom.getBoundingClientRect()
+                    scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
+                }
             },
-            onSelectNode (nodeHeirarchy, selectNodeId, nodeType) {
+            onSelectNode (node) {
                 this.loading = true
-                this.$emit('onClickTreeNode', nodeHeirarchy, selectNodeId, nodeType)
+                if (this.subProcessPipeline) {
+                    this.onUpdateNodeInfo(this.nodeDetailConfig.node_id, { isActived: false })
+                }
+                if ((node.isSubProcess || node.parentId) && !this.subProcessPipeline) {
+                    this.$nextTick(() => {
+                        let jsFlowInstance = this.$refs.subProcessCanvas
+                        jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                        jsFlowInstance && jsFlowInstance.zoomOut(0.75)
+                    })
+                }
+                this.$emit('onClickTreeNode', node)
+                this.$nextTick(() => {
+                    if (node.parentId) {
+                        this.onUpdateNodeInfo(node.id, { isActived: true })
+                    }
+                    this.updateNodeInfo()
+                })
+            },
+            updateNodeInfo () {
+                if (!this.subProcessPipeline) return
+                const { root_node, node_id } = this.nodeDetailConfig
+                const parentId = root_node?.split('-') || [node_id]
+                let nodes = this.nodeDisplayStatus.children
+                parentId.forEach(id => {
+                    if (nodes[id]) {
+                        nodes = nodes[id].children
+                    }
+                })
+                for (const id in nodes) {
+                    let code, skippable, retryable, errorIgnorable, autoRetry
+                    const currentNode = nodes[id]
+                    const nodeActivities = this.subProcessPipeline.activities[id]
+
+                    if (nodeActivities) {
+                        code = nodeActivities.component ? nodeActivities.component.code : ''
+                        skippable = nodeActivities.isSkipped || nodeActivities.skippable
+                        retryable = nodeActivities.can_retry || nodeActivities.retryable
+                        errorIgnorable = nodeActivities.error_ignorable
+                        autoRetry = nodeActivities.auto_retry
+                    }
+                    const data = {
+                        code,
+                        skippable,
+                        retryable,
+                        loop: currentNode.loop,
+                        status: currentNode.state,
+                        skip: currentNode.skip,
+                        retry: currentNode.retry,
+                        error_ignored: currentNode.error_ignored,
+                        error_ignorable: errorIgnorable,
+                        auto_retry: autoRetry,
+                        ready: false,
+                        task_state: this.state // 任务状态
+                    }
+
+                    this.$nextTick(() => {
+                        this.onUpdateNodeInfo(id, data)
+                    })
+                }
+            },
+            onUpdateNodeInfo (id, info) {
+                this.$refs.subProcessCanvas && this.$refs.subProcessCanvas.onUpdateNodeInfo(id, info)
             },
             onRetryClick () {
                 this.$emit('onRetryClick', this.nodeDetailConfig.node_id)
@@ -835,16 +997,22 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    .nodeTree{
-        border-right: 1px solid #DCDEE5;
-    }
     .details-wrapper {
         display: flex;
         flex: 1;
         height: calc(100% - 48px);
         border-bottom: 1px solid $commonBorderColor;
     }
+    .bk-resize-layout-border {
+        border: none;
+        .bk-resize-layout-aside {
+            width: 280;
+        }
+    }
     .action-wrapper {
+        width: 100%;
+        position: fixed;
+        bottom: 0;
         padding-left: 20px;
         height: 48px;
         line-height: 48px;
@@ -857,38 +1025,19 @@
         }
     }
 }
-.execute-info {
-    flex: 1;
+.execute-content {
+    height: 100%;
     display: flex;
     flex-direction: column;
-    padding-bottom: 0;
-    width: 500px;
-    height: 100%;
-    color: #313238;
-    &.loading {
-        overflow: hidden;
-    }
-    &.admin-view {
-        .code-block-wrap {
-            background: #313238;
-            padding: 10px;
-            /deep/ .vjs-tree {
-                color: #ffffff;
-            }
-        }
-    }
-    /deep/ .vjs-tree {
-        font-size: 12px;
-    }
     .execute-head {
         display: flex;
         align-items: center;
-        justify-content: space-between;
         line-height: 20px;
         font-size: 14px;
-        padding: 15px 16px 16px;
+        padding: 15px 24px 16px 15px;
         .node-name {
             font-weight: 600;
+            padding-right: 4px;
             word-break: break-all;
         }
         .node-state {
@@ -898,105 +1047,208 @@
                 margin: 2px 5px 0;
             }
         }
+        .common-icon-dark-circle-ellipsis {
+            font-size: 14px;
+            color: #3a84ff;
+        }
+        .common-icon-dark-circle-pause {
+            font-size: 14px;
+            color: #f8B53f;
+        }
+        .icon-check-circle-shape {
+            font-size: 14px;
+            color: #30d878;
+        }
+        .common-icon-dark-circle-close {
+            font-size: 14px;
+            color: #ff5757;
+        }
+        .common-icon-waitting {
+            font-size: 16px;
+            color: #dcdee5;
+        }
+        .common-icon-fail-skip {
+            font-size: 14px;
+            color: #f7b6b6;
+        }
+        .icon-circle-shape {
+            display: inline-block;
+            height: 14px;
+            width: 14px;
+            background: #f0f1f5;
+            border: 1px solid #c4c6cc;
+            border-radius: 50%;
+            &::before {
+                content: initial;
+            }
+        }
     }
-    /deep/.execute-info-tab .bk-tab-section{
-        padding: 0;
+    .sub-process {
+        flex-shrink: 0;
+        height: 160px;
+        margin: 0 25px 8px 15px;
+        position: relative;
+        background: #e1e4e8;
+        .sub-flow {
+            height: 100%;
+            border: 0;
+            background: #e1e4e8;
+            /deep/.canvas-flow {
+                .actived {
+                    box-shadow: none;
+                    &::before {
+                        content: '';
+                        display: block;
+                        height: calc(100% + 8px);
+                        width: calc(100% + 8px);
+                        position: absolute;
+                        top: -4.5px;
+                        left: -5px;
+                        z-index: -1;
+                        background: #e1ecff;
+                        border: 1px solid #699df4;
+                        border-radius: 2px;
+                    }
+                }
+            }
+        }
+        .flow-option {
+            width: 96px;
+            height: 32px;
+            position: absolute;
+            bottom: 16px;
+            right: 16px;
+            z-index: 5;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 16px;
+            color: #979ba5;
+            background: #fff;
+            box-shadow: 0 2px 4px 0 #0000001a;
+            border-radius: 2px;
+            i {
+                cursor: pointer;
+                &:nth-child(2) {
+                    margin: 0 14px;
+                }
+                &:last-child {
+                    font-size: 14px;
+                }
+                &:hover {
+                    color: #3a84ff;
+                }
+            }
+        }
+        &.canvas-expand {
+            height: calc(100% - 125px);
+        }
     }
-    .scroll-area {
-        flex: 1;
+    .execute-info {
+        height: 100%;
         display: flex;
         flex-direction: column;
-        overflow-y: auto;
-        padding: 16px 24px 16px 16px;
-        @include scrollbar;
-    }
-    .execute-time-section {
-        display: flex;
-        align-items: center;
-        height: 40px;
-        font-size: 12px;
-        padding: 8px 16px;
-        background: #f5f7fa;
-        margin-bottom: 24px;
-        .cycle-wrap,
-        .time-wrap {
+        padding-bottom: 0;
+        color: #313238;
+        &.loading {
+            overflow: hidden;
+        }
+        &.admin-view {
+            .code-block-wrap {
+                background: #313238;
+                padding: 10px;
+                /deep/ .vjs-tree {
+                    color: #ffffff;
+                }
+            }
+        }
+        /deep/ .vjs-tree {
+            font-size: 12px;
+        }
+        /deep/.execute-info-tab .bk-tab-section{
+            padding: 0;
+        }
+        .scroll-area {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            overflow-y: auto;
+            padding: 16px 24px 66px 15px;
+            @include scrollbar;
+        }
+        .execute-time-section {
             display: flex;
             align-items: center;
-            /deep/.bk-select {
-                width: 64px;
-                height: 24px;
-                line-height: 22px !important;
-                margin: 0 8px;
-                .bk-select-angle {
-                    top: 0;
-                }
-                .bk-select-name {
+            height: 40px;
+            font-size: 12px;
+            padding: 8px 16px;
+            background: #f5f7fa;
+            margin-bottom: 24px;
+            .cycle-wrap,
+            .time-wrap {
+                display: flex;
+                align-items: center;
+                /deep/.bk-select {
+                    width: 64px;
                     height: 24px;
+                    line-height: 22px !important;
+                    margin: 0 8px;
+                    .bk-select-angle {
+                        top: 0;
+                    }
+                    .bk-select-name {
+                        height: 24px;
+                    }
                 }
             }
+            .divid-line {
+                display: inline-block;
+                width: 1px;
+                height: 16px;
+                margin: 0 16px;
+                background: #dcdee5;
+            }
         }
-        .divid-line {
-            display: inline-block;
-            width: 1px;
-            height: 16px;
-            margin: 0 16px;
-            background: #dcdee5;
+        .panel-title {
+            margin: 0;
+            color: #313238;
+            font-size: 14px;
+            font-weight: 600;
         }
-    }
-    .panel-title {
-        margin: 0;
-        color: #313238;
-        font-size: 14px;
-        font-weight: 600;
-    }
-    /deep/.common-section-title {
-        color: #313238;
-        font-weight: 600;
-        line-height: 18px;
-        font-size: 12px;
-        margin-bottom: 16px;
-        &::before {
-            height: 18px;
-            top: 0;
+        /deep/.common-section-title {
+            color: #313238;
+            font-weight: 600;
+            line-height: 18px;
+            font-size: 12px;
+            margin-bottom: 16px;
+            &::before {
+                height: 18px;
+                top: 0;
+            }
         }
-    }
-    .common-icon-dark-circle-ellipsis {
-        font-size: 14px;
-        color: #3a84ff;
-    }
-    .common-icon-dark-circle-pause {
-        font-size: 14px;
-        color: #f8B53f;
-    }
-    .icon-check-circle-shape {
-        font-size: 14px;
-        color: #30d878;
-    }
-    .common-icon-dark-circle-close {
-        font-size: 14px;
-        color: #ff5757;
-    }
-    .common-icon-waitting {
-        font-size: 16px;
-        color: #dcdee5;
-    }
-    .common-icon-fail-skip {
-        font-size: 14px;
-        color: #f7b6b6;
-    }
-    .icon-circle-shape {
-        display: inline-block;
-        height: 14px;
-        width: 14px;
-        background: #f0f1f5;
-        border: 1px solid #c4c6cc;
-        border-radius: 50%;
-        &::before {
-            content: initial;
+        /deep/ .primary-value.code-editor {
+            height: 300px;
         }
     }
-    /deep/ .primary-value.code-editor {
-        height: 300px;
+    .scroll-box {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+        &::-webkit-scrollbar {
+            width: 6px;
+            height: 6px;
+            &-thumb {
+                border-radius: 20px;
+                background: #dcdee5;
+                box-shadow: inset 0 0 6px hsla(0,0%,80%,.3);
+            }
+        }
+        &.subprocess-scroll {
+            .scroll-area {
+                overflow-y: initial;
+            }
+        }
     }
 }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 16735eee92..7b94139a00 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -611,7 +611,7 @@
             color: #63656e;
             border-bottom: 1px solid #dcdee5;
             .th {
-                width: 140px;
+                width: 20%;
                 font-weight: 400;
                 color: #313238;
                 padding-left: 12px;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
index 1b57d89379..f96af19ef4 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
@@ -1,33 +1,28 @@
 <template>
     <div class="execute-record">
         <template v-if="Object.keys(executeInfo).length">
-            <section class="info-section abnormal-section" data-test-id="taskExcute_form_exceptionInfo">
-                <h4 class="common-section-title">{{ $t('异常信息') }}</h4>
-                <div class="fail-text" v-if="executeInfo.ex_data">
-                    <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
-                    <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
-                    <span class="expand-btn" v-if="isExpandTextShow" @click="isExpand = !isExpand">{{ isExpand ? $t('收起') : $t('显示全部') }}</span>
-                </div>
-                <p class="not-fail" v-else>{{ $t('暂无异常') }}</p>
+            <section class="info-section abnormal-section" data-test-id="taskExecute_form_exceptionInfo" v-if="executeInfo.ex_data">
+                <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
+                <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
+                <span class="expand-btn" v-if="isExpandTextShow" @click="isExpand = !isExpand">{{ isExpand ? $t('收起') : $t('显示全部') }}</span>
             </section>
-            <section class="info-section" data-test-id="taskExcute_form_excuteInfo">
-                <h4 class="common-section-title">{{ $t('执行信息') }}</h4>
-                <div class="subprocee-link" v-if="isReadyStatus && isSubProcessNode" @click="onSkipSubProcess">
-                    <i class="common-icon-box-top-right-corner"></i>
-                    {{ $t('子流程详情') }}
-                </div>
+            <section class="info-section" data-test-id="taskExecute_form_executeInfo">
                 <ul class="operation-table" v-if="isReadyStatus">
                     <li>
-                        <span class="th">{{ $t('开始时间') }}</span>
-                        <span class="td">{{ executeInfo.start_time || '--' }}</span>
+                        <p class="th">{{ $t('执行结果') }}</p>
+                        <p class="td">{{ nodeState || '--' }}</p>
                     </li>
                     <li>
-                        <span class="th">{{ $t('结束时间') }}</span>
-                        <span class="td">{{ executeInfo.finish_time || '--' }}</span>
+                        <p class="th">{{ $t('开始时间') }}</p>
+                        <p class="td">{{ executeInfo.start_time || '--' }}</p>
                     </li>
                     <li>
-                        <span class="th">{{ $t('耗时') }}</span>
-                        <span class="td">{{ getLastTime(executeInfo.elapsed_time) || '--' }}</span>
+                        <p class="th">{{ $t('结束时间') }}</p>
+                        <p class="td">{{ executeInfo.finish_time || '--' }}</p>
+                    </li>
+                    <li>
+                        <p class="th">{{ $t('耗时') }}</p>
+                        <p class="td">{{ getLastTime(executeInfo.elapsed_time) || '--' }}</p>
                     </li>
                 </ul>
                 <NoData v-else :message="$t('暂无执行信息')"></NoData>
@@ -82,6 +77,10 @@
                 type: Boolean,
                 default: false
             },
+            nodeState: {
+                type: String,
+                default: ''
+            },
             executeInfo: {
                 type: Object,
                 default: () => ({})
@@ -126,9 +125,11 @@
 
 <style lang="scss" scoped>
 .execute-record {
-    /deep/.fail-text {
+    /deep/.abnormal-section {
         position: relative;
         font-size: 12px;
+        padding: 8px 16px;
+        margin-bottom: 8px !important;
         color: #313238;
         background: #fff3e1;
         border: 1px solid #ffb848;
@@ -169,25 +170,29 @@
         padding-left: 15px;
     }
     .operation-table {
-        font-size: 12px;
-        border: 1px solid #dcdee5;
-        border-bottom: none;
+        display: flex;
+        align-items: center;
+        padding: 12px 24px;
+        margin-bottom: 24px;
+        border: none;
+        border-radius: 2px;
+        background: #fafbfd;
         li {
-            display: flex;
-            height: 42px;
-            line-height: 41px;
-            color: #63656e;
-            border-bottom: 1px solid #dcdee5;
+            width: 30%;
+            font-size: 12px;
+            line-height: 26px;
             .th {
-                width: 140px;
                 font-weight: 400;
-                color: #313238;
-                padding-left: 12px;
-                border-right: 1px solid #dcdee5;
+                color: #979ba5;
+                margin-bottom: 2px;
                 background: #fafbfd;
             }
             .td {
-                padding-left: 12px;
+                color: #313238;
+            }
+            &:first-child,
+            &:last-child {
+                width: 20%;
             }
         }
     }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
index cffcf8c333..ec1d27b8d6 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
@@ -174,7 +174,6 @@
         flex: 1;
         display: flex;
         flex-direction: column;
-        max-width: 682px;
         border: 1px solid #dcdee5;
         border-bottom: none;
         border-radius: 2px;
@@ -190,7 +189,7 @@
             }
             .input-name {
                 line-height: 20px;
-                width: 30%;
+                width: 40%;
             }
         }
         /deep/.render-form {
@@ -201,7 +200,7 @@
                 width: 100% !important;
                 border-bottom: 1px solid #dcdee5;
                 label {
-                    width: 30%;
+                    width: 40%;
                     text-align: left;
                     padding-left: 13px;
                     color: #63656e;
@@ -210,7 +209,7 @@
                     }
                 }
                 >.rf-tag-form {
-                    margin-left: 30%;
+                    margin-left: 40%;
                     padding-left: 13px;
                     padding-right: 15px;
                 }
@@ -235,7 +234,7 @@
                 width: 100% !important;
                 border-bottom: 1px solid #dcdee5;
                 label {
-                    width: 30% !important;
+                    width: 40% !important;
                     text-align: left;
                     padding-left: 13px;
                     color: #63656e;
@@ -244,7 +243,7 @@
                     }
                 }
                 >.bk-form-content {
-                    margin-left: 30% !important;
+                    margin-left: 40% !important;
                     padding-left: 13px;
                     padding-right: 15px;
                 }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
index 512d4721a8..14f5e2e9ed 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
@@ -11,37 +11,22 @@
 */
 <template>
     <div class="node-tree-wrapper">
-        <div class="tree-item" v-for="tree in treeData" :key="tree.id" data-test-id="taskExcute_tree_nodeTree">
-            <div v-if="!tree.children || tree.name === $t('汇聚网关') || tree.type === 'SubProcess'" :class="['tree-item-info', tree.isGateway ? 'gateway' : '']">
-                <div class="tree-line"></div>
-                <div class="tree-item-status">
-                    <span class="tree-item-expanded"></span>
-                    <span v-if="tree.type === 'ConvergeGateway'" class="commonicon-icon common-icon-node-convergegateway"></span>
-                    <span v-else :class="['default-node', nodeStateMap[tree.state]]"></span>
-                </div>
-                <div :class="['tree-item-name', curSelectId === tree.id ? 'active-name' : '']" @click="onClickNode(tree)">{{ tree.name }}</div>
-            </div>
-            <div v-else class="tree-item-children">
-                <bk-tree
-                    class="node-tree"
-                    :data="[tree]"
-                    :show-icon="showIcon"
-                    :tpl="tpl"
-                    :has-border="true">
-                </bk-tree>
-            </div>
-        </div>
+        <NodeTreeItem
+            :active-id="activeId"
+            :node-list="treeData"
+            @click="handleClickNode">
+        </NodeTreeItem>
     </div>
 </template>
 <script>
 
-    import { bkTree } from 'bk-magic-vue'
     import tools from '@/utils/tools.js'
+    import NodeTreeItem from './NodeTreeItem'
 
     export default {
         name: 'NodeTree',
         components: {
-            bkTree
+            NodeTreeItem
         },
         props: {
             data: {
@@ -50,26 +35,6 @@
                     return []
                 }
             },
-            nodeNav: {
-                type: Array,
-                default () {
-                    return []
-                }
-            },
-            selectedFlowPath: {
-                type: Array,
-                default () {
-                    return []
-                }
-            },
-            heirarchy: {
-                type: String,
-                default: ''
-            },
-            level: {
-                type: Number,
-                default: 1
-            },
             defaultActiveId: {
                 type: String,
                 default: ''
@@ -78,63 +43,20 @@
                 type: Object,
                 default: {},
                 required: true
-            },
-            isCondition: Boolean
+            }
         },
         data () {
-            const gatewayType = {
-                'EmptyStartEvent': 'commonicon-icon common-icon-node-startpoint-en',
-                'EmptyEndEvent': 'commonicon-icon common-icon-node-endpoint-en',
-                'ParallelGateway': 'commonicon-icon common-icon-node-parallelgateway-shortcut',
-                'ExclusiveGateway': 'commonicon-icon common-icon-node-branchgateway',
-                'ConvergeGateway': 'commonicon-icon common-icon-node-convergegateway conver',
-                'ConditionalParallelGateway': 'commonicon-icon common-icon-node-conditionalparallelgateway'
-            }
-            const stateColor = {
-                FINISHED: 'color:#61c861;',
-                FAILED: 'color:#da443c;',
-                WAIT: 'color:#dedfe6;',
-                BLOCKED: 'color:#4b81f7;',
-                RUNNING: 'color:#4d83f7;',
-                SKIP: 'color: #edbbb8',
-                SUSPENDED: 'color: #699df4'
-            }
-            const nodeStateMap = {
-                FINISHED: 'finished',
-                FAILED: 'failed',
-                WAIT: 'wait',
-                RUNNING: 'running',
-                SKIP: 'skip',
-                SUSPENDED: 'running'
-            }
             return {
-                curSelectId: '',
-                treeData: [],
-                subTreeData: [],
-                showIcon: false,
-                allNodeDate: {},
-                gatewayType,
-                stateColor,
-                nodeStateMap,
-                cacheSubflowSelectNode: {},
-                curSelectTreeId: '',
-                setDefaultGateway: false
+                activeId: this.defaultActiveId,
+                treeData: []
             }
         },
         watch: {
             data: {
                 handler (value) {
-                    const nodeNavLength = this.nodeNav.length
-                    if (nodeNavLength === 1) {
-                        this.treeData = tools.deepClone(value[0].children)
-                    } else {
-                        const cur = this.findSubChildren(value[0].children, this.nodeNav[nodeNavLength - 1].id)
-                        this.treeData = tools.deepClone(cur[0].subChildren)
-                    }
-                    this.$nextTick(() => {
-                        this.nodeAddStatus(this.treeData, this.nodeDisplayStatus.children)
-                        this.setDefaultActiveId(this.treeData, this.treeData, this.defaultActiveId)
-                    })
+                    const treeData = tools.deepClone(value)
+                    this.nodeAddStatus(this.treeData, this.nodeDisplayStatus.children)
+                    this.treeData = treeData
                 },
                 deep: true,
                 immediate: true
@@ -145,486 +67,57 @@
                 },
                 deep: true,
                 immediate: true
-            },
-            nodeNav: {
-                handler (val, old) {
-                    // 当为面包屑数量不为根节点时重新渲染结构
-                    const cur = this.findSubChildren(this.data[0].children, val[val.length - 1].id)
-                    this.curSelectTreeId = val[val.length - 1].nodeId
-                    if (val) {
-                        if (cur.length === 0) this.setDefaultGateway = true // 从画布点击自动网关、条件展开
-                        if (val.length === 1 && old && val.length !== old.length) {
-                            this.treeData = tools.deepClone(this.cacheSubflowSelectNode[this.curSelectTreeId] || this.data[0].children)
-                            this.curSelectId = '' // 返回时清除选中
-                        } else {
-                            this.$nextTick(() => {
-                                if (this.cacheSubflowSelectNode[cur[0]] && this.cacheSubflowSelectNode[cur[0]].id) this.$set(cur[0], 'subChildren', this.cacheSubflowSelectNode[cur[0].id])
-                                this.renderSubProcessData(cur[0])
-                            })
-                            this.nodeAddStatus(this.data[0].children, this.nodeDisplayStatus.children)
-                        }
-                    }
-                },
-                deep: true,
-                immediate: true
             }
         },
         mounted () {
             if (this.defaultActiveId) {
-                this.setDefaultActiveId(this.treeData, this.treeData, this.defaultActiveId)
+                this.setDefaultActiveId(this.treeData, this.defaultActiveId)
             }
         },
         methods: {
-            findSubChildren (data, id, node = []) {
-                data.forEach(item => {
-                    if (item.type === 'SubProcess') {
-                        if (item.id === id) {
-                            node.push(item)
-                        } else {
-                            this.findSubChildren(item.subChildren, id, node)
-                        }
-                    } else {
-                        if (item.children) {
-                            this.findSubChildren(item.children, id, node)
-                        }
-                    }
-                })
-                return node
-            },
-            onClickNode (node) {
-                this.setDefaultGateway = false
-                if (node.children && node.children.length === 0) return
-                this.$emit('onOpenGatewayInfo', this.cachecallbackData, false)
-                node.expanded = !node.expanded
-                this.curSelectId = node.id
-                const nodeType = node.type === 'SubProcess'
-                if (nodeType) {
-                    this.cacheSubflowSelectNode[this.curSelectTreeId] = tools.deepClone(this.treeData)
-                    this.$emit('onNodeClick', node.id, 'subflow')
-                    this.renderSubProcessData(node)
-                } else {
-                    const parentIds = this.nodeNav.slice(1).map(item => item.id).toString().split(',').join('.')
-                    const nodeHeirarchy = parentIds ? parentIds + '.' + node.id : node.id
-                    this.$emit('onSelectNode', nodeHeirarchy, node.id, 'tasknode')
-                }
-            },
-            renderSubProcessData (node) {
-                if (node) {
-                    this.$nextTick(() => {
-                        this.treeData = node.subChildren
-                    })
-                }
-            },
-            nodeAddStatus (data, states) {
-                if (data) {
-                    data.forEach(item => {
-                        if (item.id && states[item.id]) {
-                            item.state = states[item.id].skip ? 'SKIP' : states[item.id].state
-                        } else {
-                            item.state = 'WAIT'
-                        }
-                        if (item.isGateway) {
-                            item.state = 'Gateway'
-                        }
-                        if (item.type === 'SubProcess') {
-                            this.nodeAddStatus(item.subChildren, states)
+            handleClickNode (node) {
+                this.activeId = node.id
+                this.$emit('onSelectNode', node)
+            },
+            nodeAddStatus (treeData = [], states) {
+                treeData.forEach(node => {
+                    const { id, conditionType, isSubProcess, children } = node
+                    if (conditionType) {
+                        if (children?.length) {
+                            this.nodeAddStatus(children, states)
                         }
-                        if (item.children && item.children.length !== 0) {
-                            this.nodeAddStatus(item.children, states)
-                        }
-                    })
-                }
-            },
-            tpl (node) {
-                if (!this.allNodeDate[node.id] && node.id !== 'undefined') {
-                    this.allNodeDate[node.id] = node
-                }
-                // 退回节点
-                const callbackTip = node.isLoop ? this.$t('退回节点：') + node.callbackName : ''
-                const iconClass = this.gatewayType[node.type]
-                // 并行、条件分支样式
-                let conditionClass = node.title !== '默认' ? 'condition' : 'default-conditon'
-                if (node.isLoop) conditionClass = 'callback-condition'
-                // 选中样式
-                const isActive = this.curSelectId === node.id ? 'is-node-active' : 'default-tpl-node'
-                // 节点样式
-                const nodeClass = node.parent !== null ? `node ${this.nodeStateMap[node.state]} ` : `root-node ${this.nodeStateMap[node.state]}`
-                // 处理条件分支
-                if (node.isGateway) {
-                    return <span class={conditionClass}>
-                        <span class={'commonicon-icon common-icon-return-arrow callback'} onClick={(e) => this.onSelectNode(e, node, 'callback')} v-bk-tooltips={callbackTip}></span>
-                        <span class={isActive} style={'font-size:12px'} data-node-id={node.id} domPropsInnerHTML={node.title} onClick={(e) => this.onSelectNode(e, node, 'gateway')}></span>
-                    </span>
-                } else if (this.gatewayType[node.type]) {
-                    return <span style={'font-size: 16px'}>
-                        <span class={iconClass} style={this.stateColor[node.state]}></span>
-                        <span class={isActive} data-node-id={node.id} data-gateway-type={node.gatewayType} domPropsInnerHTML={node.name} onClick={(e) => this.onSelectNode(e, node, 'gateway')}></span>
-                    </span>
-                } else {
-                    return <span style={'font-size: 10px'}>
-                        <span class={nodeClass}></span>
-                        <span class={isActive} data-node-id={node.id} domPropsInnerHTML={node.name} onClick={(e) => this.onSelectNode(e, node, 'node')}></span>
-                    </span>
-                }
-            },
-            setDefaultActiveId (data, nodes, id) {
-                this.curSelectId = id
-                if (nodes) {
-                    nodes.forEach(node => {
-                        if (node.id === id) {
-                            this.$set(node, 'selected', true)
-                            if (this.setDefaultGateway) {
-                                this.$set(node, 'expanded', true)
-                            }
-                            if (node.parent) {
-                                node.parent.expanded = true
-                                this.setExpand(node.parent)
-                            }
-                        } else {
-                            this.$set(node, 'selected', false)
-                        }
-                        if (node.children) {
-                            this.setDefaultActiveId(data, node.children, id)
-                        }
-                    })
-                }
-            },
-            setExpand (node) {
-                if (node.parent) {
-                    node.parent.expanded = true
-                    this.setExpand(node.parent)
-                }
-            },
-            getNodeActivedState (id) {
-                const len = this.selectedFlowPath.length
-                if (this.selectedFlowPath[len - 1].id === id) {
-                    return true
-                }
-                return false
-            },
-            onSelectNode (e, node, type) {
-                // 当父节点展开且未选中、 节点为并行、网关条件时阻止冒泡
-                this.setDefaultGateway = false
-                if (node.selected && node.type === 'SubProcess') {
-                    node.selected = false
-                    node.parent.expanded = true
-                }
-                if (node.expanded && !node.selected) e.stopPropagation()
-                if ((node.conditionType === 'parallel' || node.conditionType === 'default') && type === 'gateway') {
-                    node.expanded = !node.expanded
-                    e.stopPropagation()
-                    return
-                }
-                this.$emit('onOpenGatewayInfo', node.callbackData, false)
-                if (type === 'gateway') {
-                    // 分支条件没有id,使用name 代替
-                    if (node.state === 'Gateway') {
-                        this.curSelectId = node.id || node.name
-                        this.$emit('onOpenGatewayInfo', node.callbackData, true)
                         return
                     }
-                }
-                if (type === 'node' || type === 'callback') {
-                    const treeNodes = Array.from(document.querySelectorAll('.tree-node'))
-                    if (node.parent) {
-                        const curNodeIndex = node.parent.children.findIndex(item => item.id === node.id)
-                        node.parent.children.forEach((item, index) => {
-                            if (item.type === 'ConvergeGateway') {
-                                const converge = treeNodes.filter(dom => dom.dataset.gatewayType === 'converge')
-                                if (index > curNodeIndex) {
-                                    if (!node.expanded) {
-                                        converge.forEach(cdom => {
-                                            cdom.style.display = 'block'
-                                        })
-                                    } else {
-                                        converge.forEach(cdom => {
-                                            cdom.style.display = 'none'
-                                        })
-                                    }
-                                }
-                            }
-                        })
-                    }
-                    if (type === 'callback') {
-                        node.cacheId = node.id // 选择打回节点前缓存id
-                        node.id = node.callbackData ? node.callbackData.id : node.id
+                    if (!states[id]) return
+                    let nodeState = 'READY'
+                    nodeState = states[id].skip ? 'SKIP' : states[id].state
+                    if (children) {
+                        const newStates = isSubProcess ? Object.assign({}, states, states[id].children) : states
+                        this.nodeAddStatus(children, newStates)
                     }
-                }
-                if (this.curSelectId === node.id) {
-                    // 画布节点参数入口 子流程选中状态可点击
-                    if (node.type === 'SubProcess') {
-                        this.cacheSubflowSelectNode[this.curSelectTreeId] = tools.deepClone(this.treeData)
-                        this.$emit('onNodeClick', node.id, 'subflow')
-                        this.renderSubProcessData(node)
-                        return
-                    }
-                    // 当打回节点选中时，还原该条件id
-                    node.id = node.cacheId ? node.cacheId : node.id
-                    return
-                }
-                this.curSelectId = node.id
-                const nodeType = node.type === 'ServiceActivity' ? 'tasknode' : (node.type === 'SubProcess' ? 'subflow' : 'controlNode')
-                node.selected = nodeType !== 'subflow'
-                if (nodeType === 'subflow') {
-                    this.$emit('onNodeClick', node.id, 'subflow')
-                    this.cacheSubflowSelectNode[this.curSelectTreeId] = tools.deepClone(this.treeData)
-                    this.renderSubProcessData(node)
-                    return
-                }
-                let rootNode = node
-                let nodeHeirarchy = ''
-                if (!rootNode.id) return
-                while (rootNode.parent) {
-                    if (nodeHeirarchy) {
-                        nodeHeirarchy += '.' + rootNode.parent.id
-                    } else {
-                        nodeHeirarchy += rootNode.parent.id
+                    this.$set(node, 'state', nodeState)
+                })
+            },
+            setDefaultActiveId (treeData = [], id) {
+                return treeData.some(item => {
+                    if (item.id === id) {
+                        return true
+                    } else if (item.children?.length) {
+                        item.expanded = this.setDefaultActiveId(item.children, id)
+                        return item.expanded
                     }
-                    rootNode = rootNode.parent
-                }
-                const parentIds = this.nodeNav.slice(1).map(item => item.id).toString().split(',').join('.')
-                // 最外层网关为null时传递id
-                nodeHeirarchy = node.parent ? nodeHeirarchy.split('.').reverse()[0] : node.id
-                this.setDefaultActiveId(this.treeData, this.treeData, node.id)
-                this.$emit('onSelectNode', parentIds ? parentIds + '.' + nodeHeirarchy : nodeHeirarchy, node.id, nodeType)
-                // 取缓存id
-                node.id = node.cacheId ? node.cacheId : node.id
-                node.selected = node.id === this.curSelectId
-                // 选中后,非tree列表切换到已展开tree时默认展开
-                if (node.selected) {
-                    this.$set(node, 'expanded', true)
-                    e.stopPropagation()
-                }
+                })
             }
         }
     }
 </script>
-<style lang="scss">
-.bk-tree .tree-drag-node .tree-expanded-icon {
-    margin-right: 3px;
-    z-index: 99;
-}
-</style>
 <style lang="scss" scoped>
-@import '@/scss/config.scss';
 @import '@/scss/mixins/scrollbar.scss';
-.finished {
-    background-color: #e5f6ea !important;
-    border: 1px solid #3fc06d !important;
-}
-.failed {
-    background-color: #ecbbb7 !important;
-    border: 1px solid #ecbbb7 !important;
-}
-.wait {
-    background-color: #e0e1e9 !important;
-    border: 1px solid #e0e1e9 !important;
-}
-.running {
-    background-color: #7ea2f0 !important;
-    border: 1px solid #4d83f7 !important;
-}
-.skip {
-    background-color: #f8c4c1 !important;
-    border: 1px solid #da635f !important;
-}
-.conver {
-    margin-left: -20px;
-    background: #fff;
-    position: relative;
-    z-index: 99;
-}
 .node-tree-wrapper {
-    display: inline-block;
-    width: 237px;
-    // min-width: 229px;
-    padding: 8px;
+    width: 100%;
+    padding: 16px 16px 0 8px;
     height: 100%;
-    white-space: nowrap;
     overflow-x: auto;
     @include scrollbar;
 }
-.tree-item {
-    position: relative;
-    min-height: 28px;
-    margin: 9px 0;
-    font-size: 14px;
-    color: #63656E;
-    line-height: 28px;
-    .tree-item-info {
-        
-        display: flex;
-        align-items: center;
-       
-        .tree-item-status {
-            display: flex;
-            align-items: center;
-            width: 36px;
-            height: 16px;
-            position: relative;
-            .tree-item-expanded {
-                width: 14px;
-                height: 14px;
-                cursor: pointer;
-            }
-            .default-node {
-                line-height: 28px;
-                display: block;
-                width: 8px;
-                height: 8px;
-                background: #E5F6EA;
-                border: 1px solid #3FC06D;
-                border-radius: 4px;
-                margin: 0 4px;
-                
-            }
-        }
-        
-        .tree-item-name {
-            width: 160px;
-            max-width: 100px;
-            height: 28px;
-            cursor: pointer;
-            user-select: none;
-        }
-        .tree-line {
-            display: inline-block;
-            position: relative;
-            width: 1px;
-            height: 16px;
-            ::before {
-                content: "";
-                position: absolute;
-                border-width: 1px;
-                border-left: 1px dashed #c3cdd7;
-            }
-        }
-    }
-    .tree-item-children {
-        // width: 100px;
-        min-height: 28px;
-        // background-color: #3FC06D;
-    }
-    .gateway {
-        height: 20px;
-        background: #FBF9E2;
-        border: 1px solid #CCC79E;
-        border-radius: 1px;
-        width: 100px;
-        &::after {
-            content: '';
-            width: 1px;
-            height: 10px;
-            position: absolute;
-            right: auto;
-            border-width: 1px;
-            border-left: 1px dashed #c3cdd7;
-            bottom: 50px;
-            top: -14px;
-            left: 7px;
-        }
-        .tree-item-status {
-            width: 16px;
-        }
-    }
-}
-.active-name {
-    color: #3a84ff !important;
-}
-.is-node-active {
-    color: #3a84ff !important;
-    font-size: 14px;
-    padding: 0 4px;
-    cursor: pointer;
-    user-select: none;
-}
-.activity-node {
-    display: inline-block;
-    border: 2px solid #81d79f;
-    width: 8px;
-    height: 8px;
-    margin: 0 4px;
-    border-radius: 4px;
-    background: #e5f6ea;
-    user-select: none;
-}
-.callback-condition {
-    font-size: 10px;
-    background: #FBF9E2;
-    border: 1px solid #CCC79E;
-    border-radius: 1px;
-    color: #968E4D;
-    position: relative;
-    padding:0 4px;
-    cursor: pointer;
-    margin-left: -20px;
-    z-index: 999;
-    user-select: none;
-    .callback {
-        display: inline-block;
-        height: 17px;
-        width: 17px;
-        line-height: 20px;
-        padding: 0px 0px;
-        color: #c0c4cc;
-    }
-}
-.condition {
-    font-size: 10px;
-    background: #FBF9E2;
-    border: 1px solid #CCC79E;
-    border-radius: 1px;
-    color: #968E4D;
-    position: relative;
-    padding-right: 4px;
-    cursor: pointer;
-    user-select: none;
-    left: -20px;
-    padding-left: 20px;
-    z-index: 88;
-    .callback {
-        display: none;
-    }
-}
-.default-conditon {
-    font-size: 10px;
-    background: #F0F1F5;
-    border: 1px solid #C4C6CC;
-    border-radius: 1px;
-    color: #968E4D;
-    position: relative;
-    padding-right: 4px;
-    user-select: none;
-    left: -20px;
-    padding-left: 20px;
-    z-index: 88;
-    .callback {
-        display: none;
-    }
-}
-.tpl-gateway {
-    font-size: 10px;
-}
-.root-node {
-    display: none;
-    color: #7ea2f0;
-}
-.node {
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    background: #E5F6EA;
-    border: 1px solid #3FC06D;
-    border-radius: 4px;
-    margin:0 3px;
-    font-size: 10px;
-    padding: 0 2px;
-    cursor: pointer;
-}
-.default-tpl-node {
-    font-size: 14px;
-    padding: 0 4px;
-    cursor: pointer;
-    user-select: none;
-}
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
new file mode 100644
index 0000000000..1fb76f1bd8
--- /dev/null
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -0,0 +1,306 @@
+<template>
+    <ul class="node-tree">
+        <li
+            v-for="(node,index) in nodeList"
+            :key="index"
+            :style="node.style"
+            :class="[
+                'tree-node-container',
+                {
+                    'branch-condition-container': node.conditionType,
+                    'parallel-gateway-container': node.type === 'ParallelGateway',
+                    'gateway-border-line': node.isGateway && node.expanded && node.type !== 'ConvergeGateway',
+                    'subprocess-border-line': node.isSubProcess && node.expanded
+                }
+            ]">
+            <div
+                :class="['tree-node-item', { 'node-active': node.id === activeId }]"
+                @click="handleClickNode(node)">
+                <!-- 左侧图标 -->
+                <div :class="['node-flex-start', { expanded: node.expanded }]">
+                    <!--子流程展开/收起-->
+                    <span
+                        v-if="node.isSubProcess"
+                        class="common-icon-next-triangle-shape gateway-triangle"
+                        @click.stop="toggleExpanded(node)">
+                    </span>
+                    <!--分支条件图标-->
+                    <span
+                        v-else-if="node.conditionType"
+                        class="branch-condition-box"
+                        :class="{ 'default-condition': node.conditionType === 'default' }"
+                        @click.stop="toggleExpanded(node)">
+                        <i v-if="node.children && node.children.length" class="common-icon-next-triangle-shape"></i>
+                    </span>
+                    <!--空的占位符-->
+                    <span v-else-if="!node.parentId" class="empty-div"></span>
+                    <!--打回图标-->
+                    <span
+                        v-if="node.isCallback"
+                        class="callback-box"
+                        v-bk-tooltips.top="$t('退回节点：') + node.callbackInfo.name"
+                        @click.stop="handleClickNode(node.callbackInfo)">
+                        <i class="common-icon-reback-branch"></i>
+                    </span>
+                    <!--网关图标-->
+                    <span
+                        v-else-if="nodeType[node.type]"
+                        :class="[
+                            nodeType[node.type],
+                            nodeStateMap[node.state]
+                        ]"
+                        @click.stop="toggleExpanded(node)">
+                    </span>
+                    <!--开始/结束/普通任务图标-->
+                    <span v-else-if="!node.conditionType" class="default-node" :class="nodeStateMap[node.state]"></span>
+                </div>
+                <!-- 节点名称 -->
+                <span v-bk-overflow-tips class="node-name">{{ node.title }}</span>
+            </div>
+            <NodeTreeItem
+                v-if="node.expanded && node.children && node.children.length"
+                v-show="node.expanded"
+                :active-id="activeId"
+                :node-list="node.children"
+                @click="handleClickNode">
+            </NodeTreeItem>
+        </li>
+    </ul>
+</template>
+
+<script>
+    export default {
+        name: 'NodeTreeItem',
+        components: { },
+        props: {
+            nodeList: {
+                type: Array,
+                default: () => ([]),
+                required: true
+            },
+            activeId: {
+                type: String,
+                default: ''
+            }
+        },
+        data () {
+            const nodeType = {
+                'SubProcess': 'subprocess-icon common-icon-sub-process',
+                'ParallelGateway': 'gateway-icon common-icon-parallel-gateway',
+                'ExclusiveGateway': 'gateway-icon common-icon-branch-gateway',
+                'ConvergeGateway': 'gateway-icon common-icon-converge-gateway',
+                'ConditionalParallelGateway': 'gateway-icon common-icon-node-conditionalparallelgateway'
+            }
+            const nodeStateMap = {
+                FINISHED: 'finished',
+                FAILED: 'failed',
+                READY: 'ready',
+                RUNNING: 'running',
+                SKIP: 'skip',
+                SUSPENDED: 'running'
+            }
+            return {
+                nodeType,
+                nodeStateMap
+            }
+        },
+        methods: {
+            toggleExpanded (node) {
+                node.expanded = !node.expanded
+                if (!node.expanded) {
+                    node.children.forEach(item => {
+                        item.expanded = false
+                    })
+                }
+            },
+            handleClickNode (node) {
+                const { conditionType, children } = node
+                if (conditionType) {
+                    if (conditionType === 'parallel') {
+                        node.expanded = true
+                        return
+                    }
+                    if (children.length === 0) {
+                        return
+                    }
+                }
+                if (!node.expanded) {
+                    node.expanded = true
+                }
+                this.$emit('click', node)
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+.node-tree {
+    width: 100%;
+
+    .tree-node-container {
+        position: relative;
+        .tree-node-item {
+            position: relative;
+            display: flex;
+            align-items: center;
+            height: 32px;
+            font-size: 14px;
+            color: #63656e;
+            cursor: pointer;
+            &:hover {
+                background-color: #f0f1f5;
+            }
+            .node-flex-start {
+                display: flex;
+                align-items: center;
+                flex-shrink: 0;
+                font-size: 16px;
+                margin-right: 6px;
+                .gateway-triangle {
+                    font-size: 14px;
+                    color: #c3c6cc;
+                    margin-right: 4px;
+                }
+                .empty-div {
+                    height: 14px;
+                    width: 18px;
+                }
+                .common-icon-next-triangle-shape {
+                    font-size: 14px;
+                    color: #c3c6cc;
+                }
+                .callback-box,
+                .branch-condition-box {
+                    width: 16px;
+                    height: 16px;
+                    font-size: 12px;
+                    text-align: center;
+                    background: #fbf9e2;
+                    border: 1px solid #ccc79e;
+                    border-radius: 1px;
+                    .common-icon-reback-branch,
+                    .common-icon-next-triangle-shape {
+                        display: inline-block;
+                        position: relative;
+                        top: -2px;
+                        font-size: 12px;
+                        color: #c3c6cc;
+                    }
+                    &.default-condition {
+                        background: #f0f1f5;
+                        border-color: #c4c6cc;
+                    }
+
+                }
+                .subprocess-icon,
+                .gateway-icon {
+                    margin-top: 2px;
+                    &.finished {
+                        color: #2dcb56;
+                    }
+                    &.failed {
+                        color: #ea3636;
+                    }
+                    &.ready {
+                        color: #c4c6cc;
+                    }
+                    &.running {
+                        color: #4d83f7;
+                    }
+                    &.skip {
+                        color: #da635f;
+                    }
+                }
+                .default-node {
+                    display: inline-block;
+                    width: 8px;
+                    height: 8px;
+                    background: #f0f4f5;
+                    border: 1px solid #c4c6cc;
+                    border-radius: 4px;
+                    margin: 1px 4px 0;
+                    &.finished {
+                        background: #e5f6ea;
+                        border-color: #3fc06d;
+                    }
+                    &.failed {
+                        background: #ecbbb7;
+                        border-color: #ecbbb7;
+                    }
+                    &.ready {
+                        background: #f0f4f5;
+                        border-color: #c4c6cc;
+                    }
+                    &.running {
+                        background: #f0f5ff;
+                        border-color: #699df4;
+                    }
+                    &.skip {
+                        background: #f8c4c1;
+                        border-color: #da635f;
+                    }
+                }
+                &.expanded {
+                    .common-icon-next-triangle-shape {
+                        transform: rotate(90deg);
+                        transition: transform .2s;
+                    }
+                }
+            }
+
+            .node-name {
+                flex: 1;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+        }
+        .node-active {
+            background: #e1ecff;
+            .node-name {
+                color: #3a84ff;
+            }
+        }
+    }
+    .gateway-border-line {
+        &::before {
+            content: '';
+            display: block;
+            height: calc(100% - 25px);
+            position: absolute;
+            top: 28px;
+            left: 25.5px;
+            width: 1px;
+            border-left: 1px solid #dcdee5;
+        }
+        >.node-tree {
+            >.branch-condition-container::before {
+                content: '';
+                display: block;
+                position: absolute;
+                top: 15.5px;
+                left: -7px;
+                width: 7px;
+                height: 1px;
+                border-top: 1px solid #dcdee5;
+            }
+        }
+        &.parallel-gateway-container::before {
+            height: calc(100% - 44px);
+        }
+    }
+    .subprocess-border-line {
+        &::before {
+            content: '';
+            display: block;
+            height: calc(100% - 25px);
+            position: absolute;
+            top: 28px;
+            left: 25.5px;
+            width: 1px;
+            border-left: 1px dashed #dcdee5;
+        }
+    }
+}
+</style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index c086f5b2f0..0db63fa158 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -70,23 +70,15 @@
                 </TemplateCanvas>
             </div>
         </div>
-        <bk-sideslider :is-show.sync="isNodeInfoPanelShow" :width="960" :quick-close="true" @hidden="onHiddenSideslider" :before-close="onBeforeClose">
+        <bk-sideslider
+            :is-show.sync="isNodeInfoPanelShow"
+            :width="['viewNodeDetails', 'executeInfo'].includes(nodeInfoType) ? 1300 : 960"
+            :quick-close="true"
+            :before-close="onBeforeClose"
+            @hidden="onHiddenSideslider">
             <div slot="header">
                 <div class="header">
                     <span>{{sideSliderTitle}}</span>
-                    <div class="bread-crumbs-wrapper" v-if="['executeInfo', 'viewNodeDetails'].includes(nodeInfoType)">
-                        <span
-                            :class="['path-item', { 'name-ellipsis': nodeNav.length > 1 }]"
-                            v-for="(path, index) in nodeNav"
-                            :key="path.id"
-                            :title="showNodeList.includes(index) ? path.name : ''">
-                            <span v-if="!!index && showNodeList.includes(index) || index === 1">/</span>
-                            <span v-if="showNodeList.includes(index)" class="node-name" :title="path.name" @click="onSelectSubflow(path.id)">
-                                {{path.name}}
-                            </span>
-                            <span class="node-ellipsis" v-else-if="index === 1">...</span>
-                        </span>
-                    </div>
                     <div class="sub-title" v-if="nodeInfoType === 'modifyParams' && retryNodeId">
                         {{ previewData.activities[retryNodeId] && previewData.activities[retryNodeId].name }}
                     </div>
@@ -110,10 +102,8 @@
                     v-if="nodeInfoType === 'executeInfo' || nodeInfoType === 'viewNodeDetails'"
                     :state="state"
                     :node-data="nodeData"
-                    :node-nav="nodeNav"
                     :engine-ver="engineVer"
                     :node-display-status="nodeDisplayStatus"
-                    :selected-flow-path="selectedFlowPath"
                     :admin-view="adminView"
                     :pipeline-data="nodePipelineData"
                     :default-active-id="defaultActiveId"
@@ -124,7 +114,6 @@
                     :constants="pipelineData.constants"
                     :gateways="pipelineData.gateways"
                     :condition-data="conditionData"
-                    @onOpenGatewayInfo="onOpenConditionEdit"
                     @close="onCloseConfigPanel"
                     @onRetryClick="onRetryClick"
                     @onSkipClick="onSkipClick"
@@ -132,7 +121,6 @@
                     @onModifyTimeClick="onModifyTimeClick"
                     @onForceFail="onForceFailClick"
                     @onApprovalClick="onApprovalClick"
-                    @onNodeClick="onNodeClick"
                     @onClickTreeNode="onClickTreeNode">
                 </ExecuteInfo>
                 <RetryNode
@@ -399,7 +387,9 @@
                 isCondition: false,
                 conditionOutgoing: [],
                 unrenderedCoverNode: [],
-                renderedCoverNode: []
+                convergeInfo: {},
+                nodeSourceMaps: {},
+                nodeTargetMaps: {}
             }
         },
         computed: {
@@ -450,14 +440,8 @@
                 return this.templateSource !== 'project'
             },
             nodeData () {
-                const data = this.getOrderedTree(this.completePipelineData)
-                return [{
-                    id: this.instance_id,
-                    name: this.instanceName,
-                    title: this.instanceName,
-                    expanded: true,
-                    children: data
-                }]
+                this.convergeInfo = {}
+                return this.getOrderedTree(this.completePipelineData)
             },
             taskState () {
                 return TASK_STATE_DICT[this.state]
@@ -1347,321 +1331,414 @@
                         break
                 }
             },
-            getOrderedTree (data) {
+            getOrderedTree (data, pipelineInfo = {}) {
                 const startNode = tools.deepClone(data.start_event)
                 const endNode = tools.deepClone(data.end_event)
                 const fstLine = startNode.outgoing
+                const nodeId = data.flows[fstLine].target
+                const { parentId, parentLevel, lastLevelStyle } = pipelineInfo
+                let marginLeft
+                if (lastLevelStyle) {
+                    marginLeft = lastLevelStyle.match(/[0-9]+/g)[0]
+                    marginLeft = Number(marginLeft)
+                    marginLeft = marginLeft + 42
+                } else {
+                    marginLeft = 0
+                }
                 const orderedData = [Object.assign({}, startNode, {
                     title: this.$t('开始节点'),
                     name: this.$t('开始节点'),
-                    expanded: false
+                    nodeLevel: 1,
+                    parentId,
+                    expanded: false,
+                    style: `margin-left: ${marginLeft}px`
                 })]
                 const endEvent = Object.assign({}, endNode, {
                     title: this.$t('结束节点'),
                     name: this.$t('结束节点'),
-                    expanded: false
+                    nodeLevel: 1,
+                    parentId,
+                    expanded: false,
+                    style: `margin-left: ${marginLeft}px`
                 })
-                this.retrieveLines(data, fstLine, orderedData)
+                this.getNodeTargetMaps(data)
+                this.getNodeSourceMaps(data)
+                const nodeInfo = { id: nodeId, parentId, parentLevel, lastLevelStyle }
+                this.retrieveLines(data, nodeInfo, orderedData)
                 orderedData.push(endEvent)
-                this.renderConverGateway(this.unrenderedCoverNode, orderedData, data)
                 // 过滤root最上层汇聚网关
                 return orderedData
             },
             /**
              * 根据节点连线遍历任务节点，返回按广度优先排序的节点数据
              * @param {Object} data 画布数据
-             * @param {Array} lineId 连线ID
+             * @param {Object} nodeInfo 节点属性
              * @param {Array} ordered 排序后的节点数据
-             * @param {Boolean} isLoop 条件网关节点是否有循环
+             * @param {Array} parentOrdered 父级排序
              *
              */
-            retrieveLines (data, lineId, ordered, isLoop = false) {
-                const { end_event, activities, gateways, flows } = data
-                const currentNode = flows[lineId].target
-                const endEvent = end_event.id === currentNode ? tools.deepClone(end_event) : undefined
-                const activity = tools.deepClone(activities[currentNode])
-                const gateway = tools.deepClone(gateways[currentNode])
-                const node = endEvent || activity || gateway
-                if (node && !this.nodeIds.includes(node.id)) {
-                    let outgoing
-                    if (Array.isArray(node.outgoing)) {
-                        outgoing = node.outgoing
+            retrieveLines (data, nodeInfo, ordered, parentOrdered) {
+                const { id, gatewayId, branchId, nodeLevel = 1, parentId, parentLevel, lastLevelStyle, lastId } = nodeInfo
+                const { activities, gateways, flows } = data
+                const nodeConfig = activities[id] || gateways[id]
+                if (this.nodeIds.includes(id)) {
+                    const isBack = this.judgeNodeBack(id, id)
+                    if (isBack) { // 打回节点
+                        const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
+                        const existNode = this.getMatchOrderedNode(ordered, id, false)
+                        lastNode.isCallback = true
+                        lastNode.callbackInfo = {
+                            ...existNode,
+                            children: []
+                        }
                     } else {
-                        outgoing = node.outgoing ? [node.outgoing] : []
+                        const isConverge = Object.values(this.convergeInfo).find(item => item.convergeNode === id)
+                        if (isConverge) { // 网关汇聚
+                            return
+                        } else { // 分支汇聚
+                            const existNode = this.getMatchOrderedNode(ordered, id, false)
+                            const isSameLevel = existNode && existNode.nodeLevel === nodeLevel
+                            if (isSameLevel) { // 同层次汇聚
+                                const gatewayOrdered = this.getMatchOrderedNode(ordered, gatewayId, false)
+                                const convergeIndex = gatewayOrdered.children.findIndex(item => item.id === id)
+                                const branchIndex = gatewayOrdered.children.findIndex(item => item.id === branchId)
+                                const branchInfo = gatewayOrdered.children.splice(branchIndex, 1)
+                                gatewayOrdered.children.splice(convergeIndex, 0, branchInfo[0])
+                            } else if (existNode) { // 跨层级汇聚
+                                parentOrdered.push({
+                                    ...existNode,
+                                    isDifferLevelConverge: true
+                                })
+                            }
+                        }
                     }
-                    if (gateway) { // 网关节点
-                        const name = NODE_DICT[gateway.type.toLowerCase()]
-                        const allNodeList = Object.assign({}, activities, gateways)
-                        let renderNodelist = [] // 渲染的节点列表
-                        let renderNodeOutgoing = [] // 渲染的节点outgoing
+                }
+                if (nodeConfig && !this.nodeIds.includes(id)) {
+                    const targetNodes = this.nodeTargetMaps[id]
+                    const taskAndGwNodeMap = Object.assign({}, activities, gateways)
+                    const treeItem = {
+                        id: id,
+                        type: nodeConfig.type,
+                        parentId,
+                        expanded: false,
+                        nodeLevel: parentLevel ? parentLevel + nodeLevel : nodeLevel
+                    }
+                    let marginLeft = 0
+                    if (treeItem.nodeLevel === 1) {
+                        marginLeft = 0
+                    } else if (lastLevelStyle) {
+                        marginLeft = lastLevelStyle.match(/[0-9]+/g)[0]
+                        marginLeft = Number(marginLeft)
+                        if (treeItem.parentId) {
+                            marginLeft = marginLeft + 42
+                        } else {
+                            marginLeft = marginLeft + 33
+                        }
+                    }
+                    treeItem.style = `margin-left: ${marginLeft}px`
+                    let conditions = []
 
-                        gateway.title = name
-                        gateway.name = name
-                        gateway.expanded = false
-                        gateway.children = []
-                        if (gateway.conditions || gateway.default_condition) {
-                            this.nodeIds.push(gateway.id)
+                    if (id in gateways) { // 网关节点
+                        const name = NODE_DICT[nodeConfig.type.toLowerCase()]
+                        treeItem.title = name
+                        treeItem.name = name
+                        treeItem.isGateway = true
+                        treeItem.children = []
+                        // 分支，条件并行
+                        if (['ExclusiveGateway', 'ConditionalParallelGateway'].includes(nodeConfig.type)) {
+                            treeItem.gatewayId = parentOrdered ? gatewayId : id
+                            this.getGatewayConvergeNodes(id, id, this.convergeInfo)
                             const loopList = [] // 需要打回的node的incoming
-                            outgoing.forEach(item => {
-                                const curNode = activities[flows[item].target] || gateways[flows[item].target]
+                            targetNodes.forEach(item => {
+                                const curNode = taskAndGwNodeMap[item]
                                 if (curNode && this.nodeIds.find(ite => ite === curNode.id)) {
                                     loopList.push(...curNode.incoming)
                                 }
                             })
-                            const conditions = Object.keys(gateway.conditions).map((item, index) => {
-                                // 给需要打回的条件添加节点id
-                                const nodeList = Object.assign({}, activities, gateways)
-                                const callback = loopList.includes(item) ? nodeList[flows[item].target] : ''
-                                const { evaluate, tag } = gateway.conditions[item]
-                                const callbackData = {
-                                    id: callback.id,
-                                    name: gateway.conditions[item].name,
-                                    nodeId: gateway.id,
-                                    overlayId: 'condition' + item,
-                                    tag,
-                                    value: evaluate
-                                }
+                            conditions = Object.keys(nodeConfig.conditions).map((key, index) => {
+                                const { name: branchName } = nodeConfig.conditions[key]
                                 return {
-                                    id: gateway.conditions[item].name + '-' + item,
-                                    conditionsId: '',
-                                    callbackName: callback.name,
-                                    name: gateway.conditions[item].name + '-' + item,
-                                    title: gateway.conditions[item].name,
-                                    isGateway: true,
+                                    id: id + '-' + key,
+                                    name: branchName + '-' + key,
+                                    title: branchName,
+                                    nodeLevel: treeItem.nodeLevel + 1,
+                                    parentId,
                                     conditionType: 'condition', // 条件、条件并行网关
                                     expanded: false,
-                                    outgoing: item,
-                                    children: [],
-                                    isLoop: loopList.includes(item),
-                                    callbackData
+                                    target: flows[key].target,
+                                    gatewayId: id,
+                                    children: []
                                 }
                             })
                             // 添加条件分支默认节点
-                            if (gateway.default_condition) {
-                                const defaultCondition = [
-                                    {
-                                        id: gateway.default_condition.name + '-' + gateway.default_condition.flow_id,
-                                        name: gateway.default_condition.name + '-' + gateway.default_condition.flow_id,
-                                        title: gateway.default_condition.name,
-                                        isGateway: true,
-                                        conditionType: 'default',
-                                        expanded: false,
-                                        outgoing: gateway.default_condition.flow_id,
-                                        children: []
-                                    }
-                                ]
-                                conditions.unshift(...defaultCondition)
-                            }
-                            
-                            conditions.forEach(item => {
-                                this.retrieveLines(data, item.outgoing, item.children, item.isLoop)
-                                if (item.children.length === 0) this.conditionOutgoing.push(item.outgoing)
-                                item.children.forEach(i => {
-                                    if (!this.nodeIds.includes(i.id)) {
-                                        this.nodeIds.push(i.id)
-                                    }
-                                })
-                            })
-                            gateway.children.push(...conditions)
-                            ordered.push(gateway)
-                            outgoing.forEach(line => {
-                                this.retrieveLines(data, line, ordered)
-                            })
-                            if (ordered[ordered.findLastIndex(order => order.type !== 'ServiceActivity')]) {
-                                renderNodelist = []
-                                renderNodeOutgoing = []
-                                this.nodeIds.forEach(item => {
-                                    if (allNodeList[item]) {
-                                        renderNodelist.push(allNodeList[item])
-                                    }
-                                })
-                                renderNodelist.forEach(item => {
-                                    if (Array.isArray(item.outgoing)) {
-                                        item.outgoing.forEach(ite => {
-                                            renderNodeOutgoing.push(ite)
-                                        })
-                                    } else {
-                                        renderNodeOutgoing.push(item.outgoing)
-                                    }
-                                })
-                                const convers = Object.keys(gateways).filter(conver => gateways[conver].type === 'ConvergeGateway')
-                                convers.forEach(item => {
-                                    if (gateways[item].incoming.every(item => renderNodeOutgoing.includes(item))) {
-                                        const curOutgoing = Array.isArray(gateways[item].outgoing) ? gateways[item].outgoing : [gateways[item].outgoing]
-                                        curOutgoing.forEach(line => {
-                                            this.retrieveLines(data, line, ordered)
-                                        })
-                                    }
+                            if (nodeConfig.default_condition) {
+                                const { name: branchName, flow_id } = nodeConfig.default_condition
+                                // 默认条件置顶
+                                conditions.unshift({
+                                    id: id + '-' + flow_id,
+                                    name: branchName + '-' + flow_id,
+                                    title: branchName,
+                                    nodeLevel: treeItem.nodeLevel + 1,
+                                    parentId,
+                                    conditionType: 'default',
+                                    expanded: false,
+                                    target: flows[flow_id].target,
+                                    gatewayId: id,
+                                    children: []
                                 })
                             }
-                        } else if (gateway.type === 'ParallelGateway') {
+                        } else if (nodeConfig.type === 'ParallelGateway') {
+                            treeItem.gatewayId = gatewayId || id
+                            this.getGatewayConvergeNodes(id, id, this.convergeInfo)
                             // 添加并行默认条件
-                            const defaultCondition = gateway.outgoing.map((item, index) => {
+                            conditions = nodeConfig.outgoing.map((key, index) => {
+                                const branchName = this.$t('并行') + (index + 1)
                                 return {
-                                    name: this.$t('并行') + (index + 1),
+                                    id: branchName + '-' + id,
+                                    name,
                                     title: this.$t('并行'),
-                                    isGateway: true,
+                                    nodeLevel: treeItem.nodeLevel + 1,
+                                    parentId,
                                     expanded: false,
                                     conditionType: 'parallel',
-                                    outgoing: item,
+                                    target: flows[key].target,
+                                    gatewayId: id,
                                     children: []
                                 }
                             })
-                            gateway.children.push(...defaultCondition)
-                            defaultCondition.forEach(item => {
-                                this.retrieveLines(data, item.outgoing, item.children)
-                                item.children.forEach(i => {
-                                    if (!this.nodeIds.includes(i.id)) {
-                                        this.nodeIds.push(i.id)
-                                    }
-                                })
-                            })
-                            ordered.push(gateway)
-                            this.nodeIds.push(gateway.id)
-                            outgoing.forEach(line => {
-                                this.retrieveLines(data, line, ordered)
-                            })
-                            if (ordered[ordered.findLastIndex(order => order.type === 'ParallelGateway')]) {
-                                renderNodelist = []
-                                renderNodeOutgoing = []
-                                this.nodeIds.forEach(item => {
-                                    if (allNodeList[item]) {
-                                        renderNodelist.push(allNodeList[item])
-                                    }
-                                })
-                                renderNodelist.forEach(item => {
-                                    if (Array.isArray(item.outgoing)) {
-                                        item.outgoing.forEach(ite => {
-                                            renderNodeOutgoing.push(ite)
-                                        })
-                                    } else {
-                                        renderNodeOutgoing.push(item.outgoing)
-                                    }
-                                })
-                                const convers = Object.keys(gateways).filter(conver => gateways[conver].type === 'ConvergeGateway')
-                                convers.forEach(item => {
-                                    if (gateways[item].incoming.every(item => renderNodeOutgoing.includes(item))) {
-                                        const curOutgoing = Array.isArray(gateways[item].outgoing) ? gateways[item].outgoing : [gateways[item].outgoing]
-                                        curOutgoing.forEach(line => {
-                                            this.retrieveLines(data, line, ordered)
-                                        })
-                                    }
-                                })
-                            }
+                            this.nodeIds.push(id)
                         }
-                        if (gateway.type === 'ConvergeGateway') {
-                            // 判断ordered中 汇聚网关的incoming是否存在
-                            const list = []
-                            const converList = Object.assign({}, activities, gateways)
-                            this.nodeIds.forEach(item => {
-                                if (converList[item]) {
-                                    list.push(converList[item])
-                                }
-                            })
-                            const outgoingList = []
-                            list.forEach(item => {
-                                if (Array.isArray(item.outgoing)) {
-                                    item.outgoing.forEach(ite => {
-                                        outgoingList.push(ite)
-                                    })
-                                } else {
-                                    outgoingList.push(item.outgoing)
-                                }
-                            })
-                            if (gateway.incoming.every(item => outgoingList.concat(this.conditionOutgoing).includes(item))) {
-                                // 汇聚网关push在最近的条件网关下
-                                const prev = ordered[ordered.findLastIndex(order => order.type !== 'ServiceActivity' && order.type !== 'ConvergeGateway')]
-                                // 独立子流程的children为 subChildren
-                                this.nodeIds.push(gateway.id)
-                                if (prev && prev.children && !prev.children.find(item => item.id === gateway.id) && !this.converNodeList.includes(gateway.id)) {
-                                    this.converNodeList.push(gateway.id)
-                                    gateway.gatewayType = 'converge'
-                                    // prev.children.push(gateway)
-                                    outgoing.forEach(line => {
-                                        this.retrieveLines(data, line, ordered)
-                                    })
-                                } else {
-                                    this.unrenderedCoverNode.push(gateway.id)
+                    } else { // 任务节点
+                        if (nodeConfig.type === 'SubProcess') {
+                            const parentInfo = {
+                                parentId: parentId ? parentId + '-' + id : id,
+                                parentLevel: nodeLevel,
+                                lastLevelStyle: treeItem.style
+                            }
+                            // 兼容旧数据
+                            if (nodeConfig.pipeline) {
+                                this.getNodeTargetMaps(nodeConfig.pipeline)
+                                this.getNodeSourceMaps(nodeConfig.pipeline)
+                                treeItem.children = this.getOrderedTree(nodeConfig.pipeline, parentInfo)
+                            } else {
+                                let { data: componentData } = nodeConfig.component
+                                componentData = componentData && componentData.subprocess
+                                componentData = componentData && componentData.value
+                                componentData = componentData && componentData.pipeline
+                                if (componentData) {
+                                    this.getNodeTargetMaps(componentData)
+                                    this.getNodeSourceMaps(componentData)
+                                    treeItem.children = this.getOrderedTree(componentData, parentInfo)
                                 }
                             }
+                            treeItem.isSubProcess = true
                         }
-                    } else if (activity) { // 任务节点
-                        if (isLoop) return
-                        if (activity.type === 'SubProcess') {
-                            if (activity.pipeline) {
-                                activity.subChildren = this.getOrderedTree(activity.pipeline)
+                        treeItem.gatewayId = gatewayId
+                        treeItem.name = nodeConfig.name
+                        treeItem.title = nodeConfig.name
+                    }
+                    this.nodeIds.push(id)
+                    const nextNodeInfo = { ...nodeInfo }
+                    let newOrdered = parentOrdered
+                    if (parentOrdered) {
+                        if (nodeConfig.incoming.length > 1) {
+                            let result
+                            const convergeNode = Object.values(this.convergeInfo).find(item => item.convergeNode === id)
+                            if (convergeNode) {
+                                result = this.getMatchOrderedNode(ordered, convergeNode.id, true)
+                                const { gatewayId, nodeLevel } = result[0]
+                                treeItem.nodeLevel = nodeLevel
+                                result.push(treeItem)
+                                newOrdered = result
+                                nextNodeInfo.gatewayId = gatewayId
+                                nextNodeInfo.nodeLevel = nodeLevel
                             } else {
-                                if (activity.component.data && activity.component.data.subprocess) {
-                                    activity.subChildren = this.getOrderedTree(activity.component.data.subprocess.value.pipeline)
+                                result = this.getMatchOrderedNode(ordered, gatewayId, false)
+                                if (result) {
+                                    treeItem.nodeLevel = result.children[0].nodeLevel
+                                    result.children.push(treeItem)
+                                    newOrdered = result.children
+                                    nextNodeInfo.gatewayId = result.gatewayId
+                                    nextNodeInfo.nodeLevel = treeItem.nodeLevel
+                                } else {
+                                    parentOrdered.push(treeItem)
                                 }
                             }
+                            // 汇聚节点层级会提高
+                            if (treeItem.nodeLevel === 1) {
+                                treeItem.style = 'margin-left: 0px'
+                            }
+                        } else {
+                            parentOrdered.push(treeItem)
                         }
-                        activity.title = activity.name
-                        activity.expanded = activity.pipeline
-                        ordered.push(activity)
-                        if (!this.nodeIds.includes(activity.id)) {
-                            this.nodeIds.push(activity.id)
-                        }
-                        outgoing.forEach(line => {
-                            this.retrieveLines(data, line, ordered)
+                    } else {
+                        ordered.push(treeItem)
+                        newOrdered = null
+                    }
+                    
+                    if (conditions.length) {
+                        conditions.forEach(item => {
+                            item.style = `margin-left: ${marginLeft + 33}px`
+                            treeItem.children.push(item)
+                            this.retrieveLines(
+                                data,
+                                {
+                                    id: item.target,
+                                    branchId: item.id,
+                                    nodeLevel: item.nodeLevel,
+                                    parentId,
+                                    gatewayId: id,
+                                    lastId: item.id
+                                },
+                                ordered,
+                                item.children
+                            )
+                        })
+                    } else {
+                        targetNodes.forEach(node => {
+                            this.retrieveLines(
+                                data,
+                                {
+                                    ...nextNodeInfo,
+                                    id: node,
+                                    lastId: id
+                                },
+                                ordered,
+                                newOrdered
+                            )
                         })
                     }
                 }
             },
-            renderConverGateway (ids, ordered, data) {
-                const allNode = Object.assign({}, data.activities, data.gateways)
-                ids.forEach(id => {
-                    if (data.gateways[id] && data.gateways[id].incoming) {
-                        data.gateways[id].incoming.forEach(incoming => {
-                            const node = Object.keys(allNode).find(item => Array.isArray(allNode[item].outgoing) ? allNode[item].outgoing.includes(incoming) : allNode[item].outgoing === incoming)
-                            ordered.forEach(item => {
-                                if (item.id === node && allNode[node].type !== 'ServiceActivity' && allNode[node].type !== 'ConvergeGateway') {
-                                    if (!item.children.map(chd => chd.id).includes(data.gateways[id].id) && !this.renderedCoverNode.includes(id)) {
-                                        this.renderedCoverNode.push(id)
-                                        item.children.push(Object.assign(data.gateways[id], { name: this.$t('汇聚网关') }))
-                                    }
-                                } else {
-                                    if (item.children) {
-                                        this.findCoverPosition(item.children, node, id, allNode, ordered)
-                                    }
-                                }
-                            })
-                        })
+            getMatchOrderedNode (ordered, id, isParent) {
+                let result
+                ordered.some(item => {
+                    if (item.id === id) {
+                        result = isParent ? ordered : item
+                        return true
+                    } else if (item.children?.length) {
+                        result = this.getMatchOrderedNode(item.children, id, isParent)
+                        return result && !!Object.keys(result).length
                     }
+                    return false
                 })
-            },
-            findCoverPosition (list, id, cur, allNode, ordered) {
-                list.forEach(item => {
-                    if (item.id === id) {
-                        // 不是任务节点直接添加
-                        if (item.type !== 'ServiceActivity' && item.type !== 'ConvergeGateway' && item.state !== 'Gateway') {
-                            if (list.map(chd => chd.id).includes(allNode[id].id) && !this.renderedCoverNode.includes(cur)) {
-                                this.renderedCoverNode.push(cur)
-                                list.push(Object.assign({}, allNode[cur], { name: this.$t('汇聚网关') }))
-                            }
-                        } else {
-                            item.incoming.forEach(incoming => {
-                                const node = Object.keys(allNode).find(item => Array.isArray(allNode[item].outgoing) ? allNode[item].outgoing.includes(incoming) : allNode[item].outgoing === incoming)
-                                this.getItemCoverTree(ordered, node, cur, allNode)
+                return result
+            },
+            
+            getNodeSourceMaps (pipelineData) {
+                const sourceMap = pipelineData.line.reduce((acc, cur) => {
+                    const { source, target } = cur
+                    if (acc[target.id]) {
+                        acc[target.id].push(source.id)
+                    } else {
+                        acc[target.id] = [source.id]
+                    }
+                    return acc
+                }, {})
+                Object.assign(this.nodeSourceMaps, sourceMap)
+            },
+            getNodeTargetMaps (pipelineData) {
+                const targetMap = pipelineData.line.reduce((acc, cur) => {
+                    const { source, target } = cur
+                    if (acc[source.id]) {
+                        acc[source.id].push(target.id)
+                    } else {
+                        acc[source.id] = [target.id]
+                    }
+                    return acc
+                }, {})
+                Object.assign(this.nodeTargetMaps, targetMap)
+            },
+            getGatewayConvergeNodes (id, parentId, convergeInfo = {}, index, isDeep) {
+                if (!convergeInfo[parentId]) {
+                    convergeInfo[parentId] = {
+                        id: parentId,
+                        checkedNodes: [],
+                        convergeNode: '',
+                        branchCount: 1
+                    }
+                }
+                const targetNodes = this.nodeTargetMaps[id] || []
+                if (targetNodes.length > 1) {
+                    if (!isDeep) {
+                        convergeInfo[parentId].branchCount += targetNodes.length - 1
+                    }
+                    targetNodes.forEach((targetId, branchIndex) => {
+                        let newIndex = branchIndex
+                        if (index !== 0) {
+                            const branches = Object.keys(convergeInfo[parentId]).filter(item => /^branch[0-9]*$/.test(item))
+                            newIndex = branches.length
+                        }
+                        newIndex = isDeep ? index : newIndex
+                        this.getGatewayConvergeNodes(targetId, parentId, convergeInfo, newIndex, isDeep)
+                    })
+                } else {
+                    const { checkedNodes, branchCount = 0 } = convergeInfo[parentId]
+                    const countArr = [...Array(branchCount).keys()]
+                    const { end_event } = this.pipelineData
+                    if ([...checkedNodes, end_event.id].includes(id) || this.nodeSourceMaps[id].length > 1) {
+                        const branchConvergeNode = convergeInfo[parentId][`branch${index}`]
+                        if (!branchConvergeNode) {
+                            convergeInfo[parentId][`branch${index}`] = [id]
+                        } else if (!branchConvergeNode.includes(id)) {
+                            branchConvergeNode.push(id)
+                        }
+                        if (!checkedNodes.includes(id)) {
+                            checkedNodes.push(id)
+                        }
+                        const convergeNodes = countArr.map(item => {
+                            const data = convergeInfo[parentId][`branch${item}`] || []
+                            return [...new Set(data)]
+                        }).flat()
+                        if (this.findMost(convergeNodes) === branchCount) {
+                            convergeInfo[parentId].convergeNode = id
+                        } else if (index === branchCount - 1) {
+                            countArr.forEach(item => {
+                                if (!convergeInfo[parentId].convergeNode) {
+                                    const data = convergeInfo[parentId][`branch${item}`] || []
+                                    const [lastId] = data.slice(-1)
+                                    const targetIds = this.nodeTargetMaps[lastId] || [lastId]
+                                    targetIds.forEach(targetId => {
+                                        this.getGatewayConvergeNodes(targetId, parentId, convergeInfo, item, true)
+                                    })
+                                }
                             })
                         }
                     } else {
-                        if (item.children) this.findCoverPosition(item.children, id, cur, allNode, ordered)
+                        checkedNodes.push(id)
+                        const targetId = targetNodes[0]
+                        this.getGatewayConvergeNodes(targetId, parentId, convergeInfo, index, isDeep)
                     }
-                })
+                }
             },
-            // 给网关节点添加汇聚节点
-            getItemCoverTree (ordered, node, id, allNode) {
-                ordered.forEach(item => {
-                    if (item.id === node && item.type !== 'ServiceActivity' && item.state !== 'Gateway') {
-                        if (item.children && !item.children.map(chd => chd.node).includes(allNode[node].id) && !this.renderedCoverNode.includes(id)) {
-                            this.renderedCoverNode.push(id)
-                            item.children.push(Object.assign({}, allNode[id], { name: this.$t('汇聚网关') }))
-                        }
+            findMost (arr) {
+                if (!arr.length) return
+                if (arr.length === 1) return 1
+                let maxNum = 0
+                arr.reduce((acc, cur) => {
+                    acc[cur] ? acc[cur] += 1 : acc[cur] = 1
+                    if (acc[cur] > maxNum) {
+                        maxNum = acc[cur]
+                    }
+                    return acc
+                }, {})
+                return maxNum
+            },
+            judgeNodeBack (id, backId) {
+                const targetNodes = this.nodeTargetMaps[id]
+                if (!targetNodes) return false
+                if (targetNodes.length > 1) {
+                    return targetNodes.some(targetId => {
+                        return this.judgeNodeBack(targetId, backId)
+                    })
+                } else {
+                    const targetId = targetNodes[0]
+                    if (targetId === backId) {
+                        return true
                     } else {
-                        if (item.children) this.getItemCoverTree(item.children, node, id, allNode)
+                        return this.judgeNodeBack(targetId, backId)
                     }
-                })
+                }
             },
             updateNodeActived (id, isActived) {
                 this.$refs.templateCanvas.onUpdateNodeInfo(id, { isActived })
@@ -1793,10 +1870,6 @@
             },
             onNodeClick (id, type) {
                 this.defaultActiveId = id
-                if (type === 'subflow') {
-                    this.handleSubflowCanvasChange(id)
-                    return
-                }
                 this.setNodeDetailConfig(id)
                 if (this.nodeDetailConfig.node_id) {
                     this.updateNodeActived(this.nodeDetailConfig.node_id, false)
@@ -1806,7 +1879,7 @@
                 this.nodePipelineData = { ...this.pipelineData }
                 // 兼容旧版本子流程节点输出数据
                 const selectLocation = this.canvasData.locations.find(item => item.id === id)
-                if (selectLocation.type === 'subflow') {
+                if (selectLocation?.type === 'subflow') {
                     const { constants } = this.pipelineData.activities[id].pipeline
                     this.nodePipelineData['constants'] = constants
                 }
@@ -1931,73 +2004,60 @@
                 this.cancelTaskStatusTimer()
                 this.updateTaskStatus(id)
             },
-            async onClickTreeNode (nodeHeirarchy, selectNodeId, nodeType) {
-                let nodeActivities
-                let parentNodeActivities
-                const nodePath = [{
-                    id: this.instance_id,
-                    name: this.instanceName,
-                    nodeId: this.completePipelineData.id
-                }]
+            async onClickTreeNode (node) {
+                const { id, conditionType, parentId } = node
                 if (this.nodeDetailConfig.node_id) {
                     this.updateNodeActived(this.nodeDetailConfig.node_id, false)
                 }
-                const heirarchyList = nodeHeirarchy.split('.')
-                heirarchyList.pop()
-                if (heirarchyList.length) { // not root node
-                    nodeActivities = this.completePipelineData.activities
-                    heirarchyList.forEach((key, index) => {
-                        nodeActivities = index ? nodeActivities.pipeline.activities[key] : nodeActivities[key]
-                        if (nodeActivities) {
-                            nodePath.push({
-                                id: nodeActivities.id,
-                                name: nodeActivities.name,
-                                nodeId: nodeActivities.id,
-                                type: nodeActivities.type
-                            })
-                            if (nodeActivities.type === 'SubProcess') {
-                                parentNodeActivities = nodeActivities
-                            }
+                this.updateNodeActived(id, true)
+                let pipelineData = this.pipelineData
+                if (parentId) {
+                    const parentIdList = parentId.split('-')
+                    parentIdList.forEach(item => {
+                        const nodeData = pipelineData.activities[item]
+                        if (nodeData.pipeline) {
+                            pipelineData = nodeData.pipeline
+                        } else {
+                            let { data: componentData } = nodeData.component
+                            componentData = componentData && componentData.subprocess
+                            componentData = componentData && componentData.value
+                            componentData = componentData && componentData.pipeline
+                            pipelineData = componentData || pipelineData
                         }
                     })
-                    this.selectedFlowPath = nodePath
-                    if (nodeActivities.type === 'SubProcess') {
-                        await this.switchCanvasView(nodeActivities)
-                        this.treeNodeConfig = {}
-                    } else {
-                        if (parentNodeActivities && parentNodeActivities.id !== this.taskId) { // 不在当前 taskId 的任务中
-                            await this.switchCanvasView(parentNodeActivities)
-                        } else if (!parentNodeActivities && this.taskId !== this.instance_id) { // 属于第二级任务
-                            await this.switchCanvasView(this.completePipelineData, true)
-                        }
-                        let subprocessStack = []
-                        if (this.selectedFlowPath.length > 1) {
-                            subprocessStack = this.selectedFlowPath.map(item => item.nodeId).slice(1, -1)
-                        }
-                        this.treeNodeConfig = {
-                            component_code: nodeActivities.component.code,
-                            version: nodeActivities.component.version || 'legacy',
-                            node_id: nodeActivities.id,
-                            instance_id: this.instance_id,
-                            subprocess_stack: JSON.stringify(subprocessStack)
-                        }
-                        this.updataNodeParamsInfo(nodeActivities)
-                    }
-                } else {
-                    this.selectedFlowPath = nodePath
-                    await this.switchCanvasView(this.completePipelineData, true)
-                    this.treeNodeConfig = {}
                 }
-                this.setNodeDetailConfig(selectNodeId, !nodeHeirarchy)
+                let code, version, componentData
+                const nodeInfo = pipelineData.activities[id]
+                if (nodeInfo) {
+                    componentData = nodeInfo.type === 'ServiceActivity' ? nodeInfo.component.data : {}
+                    code = nodeInfo.type === 'ServiceActivity' ? nodeInfo.component.code : ''
+                    version = (nodeInfo.type === 'ServiceActivity' ? nodeInfo.component.version : nodeInfo.version) || 'legacy'
+                }
+                let nodeId = id
+                this.isCondition = false
+                if (conditionType) {
+                    nodeId = id.split('-')[0]
+                    this.isCondition = true
+                    this.conditionData = { ...node }
+                }
+                const subprocessStack = parentId ? parentId.split('-') : []
+                this.nodeDetailConfig = {
+                    component_code: code,
+                    version: version,
+                    node_id: nodeId,
+                    instance_id: this.instance_id,
+                    root_node: parentId,
+                    subprocess_stack: JSON.stringify(subprocessStack),
+                    componentData
+                }
                 // 节点树切换时，如果为子流程节点则需要重置pipelineData的constants
-                this.nodePipelineData = { ...this.pipelineData }
+                this.nodePipelineData = { ...pipelineData }
                 // 兼容旧版本子流程节点输出数据
-                const selectLocation = this.canvasData.locations.find(item => item.id === selectNodeId)
-                if (selectLocation.type === 'subflow') {
-                    const { constants } = this.pipelineData.activities[selectNodeId].pipeline
+                const selectLocation = pipelineData.location.find(item => item.id === id)
+                if (selectLocation?.type === 'subflow') {
+                    const { constants } = pipelineData.activities[id].pipeline
                     this.nodePipelineData['constants'] = constants
                 }
-                this.updateNodeActived(selectNodeId, true)
             },
             // 切换画布视图
             async switchCanvasView (nodeActivities, isRootNode = false) {
diff --git a/frontend/desktop/src/scss/iconfont.scss b/frontend/desktop/src/scss/iconfont.scss
index 3dc4eb015e..80cbfb5019 100644
--- a/frontend/desktop/src/scss/iconfont.scss
+++ b/frontend/desktop/src/scss/iconfont.scss
@@ -569,3 +569,24 @@
 .common-icon-default:before {
 	content: "\e1fb";
 }
+.common-icon-parallel-gateway:before {
+	content: "\e1fd";
+}
+.common-icon-reback-branch:before {
+	content: "\e1fc";
+}
+.common-icon-branch-gateway:before {
+	content: "\e1fe";
+}
+.common-icon-converge-gateway:before {
+	content: "\e1ff";
+}
+.common-icon-sub-process:before {
+	content: "\e200";
+}
+.common-icon-partial-screen:before {
+	content: "\e201";
+}
+.common-icon-full-screen:before {
+	content: "\e202";
+}

From ca9c5ce90d8585d2cfaa55396ac7e04becc3d78b Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 9 Aug 2023 16:19:43 +0800
Subject: [PATCH 015/112] =?UTF-8?q?bugfix:=20=E8=BD=BB=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=94=AF=E6=8C=81=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=A7=E8=A1=8C=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/pages/task/TaskCreate/TaskSelectNode.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
index 2a9474b538..3e9c2db176 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
@@ -485,7 +485,6 @@
              * 设置默认勾选值
              */
             async setCanvasSelected (selectNodes = []) {
-                if (this.isPreviewMode) return
                 if (selectNodes.length) {
                     // 使用传进来的选中节点，取消画布默认全选
                     this.selectedNodes = selectNodes
@@ -494,7 +493,9 @@
                     const defaultSelected = await this.getDefaultSelected()
                     this.selectedNodes = defaultSelected
                 }
-                this.updateDataAndCanvas()
+                if (!this.isPreviewMode) {
+                    this.updateDataAndCanvas()
+                }
             },
             async getDefaultSelected () {
                 try {

From e70cc4596f2e0ca33835567b12644ab3cf8ac589 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Fri, 4 Aug 2023 17:55:18 +0800
Subject: [PATCH 016/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Djob?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=B7=B3=E8=BD=ACid=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/static/components/atoms/job/execute_task/v1_0.js | 2 +-
 .../components/static/components/atoms/job/execute_task/v1_1.js | 2 +-
 .../components/static/components/atoms/job/execute_task/v1_2.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
index 58134aaa53..0fc7c110c6 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
@@ -66,7 +66,7 @@
                     }
                     let biz_cc_id = this.get_parent && this.get_parent().get_child('biz_cc_id')._get_value();
                     let bk_job_host = window.BK_JOB_HOST;
-                    let url = bk_job_host + '/' + biz_cc_id + "/api_plan/" + this.value;
+                    let url = bk_job_host + "/api_plan/" + this.value;
                     window.open(url, '_blank')
                 },
                 validation: [
diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
index 2abcb8d670..91b9f152a1 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
@@ -67,7 +67,7 @@
                     let biz_cc_id = this.get_parent && this.get_parent().get_child('biz_cc_id')._get_value();
                     let bk_job_host = window.BK_JOB_HOST;
                     if (bk_job_host.charAt(bk_job_host.length - 1) == "/") bk_job_host = bk_job_host.substr(0, bk_job_host.length - 1);
-                    let url = bk_job_host + '/' + biz_cc_id + "/api_plan/" + this.value;
+                    let url = bk_job_host  + "/api_plan/" + this.value;
                     window.open(url, '_blank')
                 },
                 validation: [
diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
index 77df052ab1..9d9d9bde1e 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
@@ -67,7 +67,7 @@
                     let biz_cc_id = this.get_parent && this.get_parent().get_child('biz_cc_id')._get_value();
                     let bk_job_host = window.BK_JOB_HOST;
                     if (bk_job_host.charAt(bk_job_host.length - 1) == "/") bk_job_host = bk_job_host.substr(0, bk_job_host.length - 1);
-                    let url = bk_job_host + '/' + biz_cc_id + "/api_plan/" + this.value;
+                    let url = bk_job_host + "/api_plan/" + this.value;
                     window.open(url, '_blank')
                 },
                 validation: [

From 6d962ced6cc7874c2d459691a05696a38c6091d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 10 Aug 2023 15:43:44 +0800
Subject: [PATCH 017/112] =?UTF-8?q?optimization:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=BD=91=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=B1=95=E7=A4=BA=20(#6986)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* optimization: 优化网关接口无权限时的展示

* minor: code review
---
 gcloud/apigw/decorators.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gcloud/apigw/decorators.py b/gcloud/apigw/decorators.py
index 68a2d55176..eb0c7a15e4 100644
--- a/gcloud/apigw/decorators.py
+++ b/gcloud/apigw/decorators.py
@@ -17,14 +17,15 @@
 import ujson as json
 from django.contrib.auth import get_user_model
 from django.http import JsonResponse
+from iam.exceptions import AuthFailedException
 
 from gcloud import err_code
+from gcloud.apigw.constants import DEFAULT_APP_WHITELIST, PROJECT_SCOPE_CMDB_BIZ
 from gcloud.apigw.exceptions import InvalidUserError
-from gcloud.conf import settings
-from gcloud.core.models import Project
 from gcloud.apigw.utils import get_project_with
-from gcloud.apigw.constants import PROJECT_SCOPE_CMDB_BIZ, DEFAULT_APP_WHITELIST
 from gcloud.apigw.whitelist import EnvWhitelist
+from gcloud.conf import settings
+from gcloud.core.models import Project
 
 app_whitelist = EnvWhitelist(transient_list=DEFAULT_APP_WHITELIST, env_key="APP_WHITELIST")
 WHETHER_PREPARE_BIZ = getattr(settings, "WHETHER_PREPARE_BIZ_IN_API_CALL", True)
@@ -86,7 +87,16 @@ def return_json_response(view_func):
 
     @wraps(view_func)
     def _wrapped_view(request, *args, **kwargs):
-        result = view_func(request, *args, **kwargs)
+        try:
+            result = view_func(request, *args, **kwargs)
+        except AuthFailedException as e:
+            # 针对权限中心的异常进行统一的处理
+            result = {
+                "result": False,
+                "data": None,
+                "message": "iam authentication exception, please check, action:{}".format(e.action.id),
+                "code": 3599999,
+            }
         # 如果返回的是dict且request中有trace_id，则在响应中加上
         if isinstance(result, dict):
             if hasattr(request, "trace_id"):

From 472a5b75e9845ec0c5b9f3495123de3ad438d1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 10 Aug 2023 15:44:25 +0800
Subject: [PATCH 018/112] =?UTF-8?q?minor:=20=E4=BC=98=E5=8C=96get=5Fnode?=
 =?UTF-8?q?=5Fdata=5Fv2=20=E7=9A=84=E8=BF=90=E8=A1=8C=E9=80=9F=E5=BA=A6=20?=
 =?UTF-8?q?(#6984)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/domains/dispatchers/node.py  | 54 +++++++-------
 gcloud/tasktmpl3/domains/constants.py         | 71 +++++++++++++++++--
 gcloud/tests/mock_settings.py                 |  1 +
 .../test_get_node_data_v2.py                  | 40 ++++-------
 4 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/gcloud/taskflow3/domains/dispatchers/node.py b/gcloud/taskflow3/domains/dispatchers/node.py
index 462b0eb915..393acb2a9d 100644
--- a/gcloud/taskflow3/domains/dispatchers/node.py
+++ b/gcloud/taskflow3/domains/dispatchers/node.py
@@ -13,35 +13,35 @@
 
 import logging
 from copy import deepcopy
-from typing import Optional, List
+from typing import List, Optional
 
-from bamboo_engine import exceptions as bamboo_exceptions
 from bamboo_engine import api as bamboo_engine_api
+from bamboo_engine import exceptions as bamboo_exceptions
 from bamboo_engine import states as bamboo_engine_states
 from bamboo_engine.eri import ContextValueType
-
-from engine_pickle_obj.context import SystemObject
-from gcloud.project_constants.domains.context import get_project_constants_context
-from pipeline.engine import states as pipeline_states
+from django.utils.translation import ugettext_lazy as _
+from opentelemetry import trace
+from pipeline.component_framework.library import ComponentLibrary
 from pipeline.engine import api as pipeline_api
-from pipeline.service import task_service
-from pipeline.models import PipelineInstance
+from pipeline.engine import exceptions as pipeline_exceptions
 from pipeline.engine import models as pipeline_engine_models
-from pipeline.parser.context import get_pipeline_context
+from pipeline.engine import states as pipeline_states
 from pipeline.eri.runtime import BambooDjangoRuntime
 from pipeline.log.models import LogEntry
-from pipeline.component_framework.library import ComponentLibrary
-from pipeline.engine import exceptions as pipeline_exceptions
-from opentelemetry import trace
+from pipeline.models import PipelineInstance
+from pipeline.parser.context import get_pipeline_context
+from pipeline.service import task_service
 
+from engine_pickle_obj.context import SystemObject
 from gcloud import err_code
-from gcloud.utils.handlers import handle_plain_log
+from gcloud.project_constants.domains.context import get_project_constants_context
 from gcloud.taskflow3.utils import format_pipeline_status
+from gcloud.tasktmpl3.domains.constants import preview_node_inputs
+from gcloud.utils.handlers import handle_plain_log
 from pipeline_web.parser import WebPipelineAdapter
 from pipeline_web.parser.format import format_web_data_to_pipeline
 
 from .base import EngineCommandDispatcher, ensure_return_is_dict
-from django.utils.translation import ugettext_lazy as _
 
 logger = logging.getLogger("root")
 
@@ -554,17 +554,17 @@ def get_node_data_v2(
                 )
 
                 formatted_pipeline = format_web_data_to_pipeline(pipeline_instance.execution_data)
-                preview_result = bamboo_engine_api.preview_node_inputs(
-                    runtime=runtime,
-                    pipeline=formatted_pipeline,
-                    node_id=self.node_id,
-                    subprocess_stack=subprocess_stack,
-                    root_pipeline_data=root_pipeline_data,
-                    parent_params=root_pipeline_context,
-                )
-
-                if not preview_result.result:
-                    message = _(f"节点数据请求失败: 请重试, 如多次失败可联系管理员处理. {preview_result.exc} | get_node_data_v2")
+                try:
+                    preview_inputs = preview_node_inputs(
+                        runtime=runtime,
+                        pipeline=formatted_pipeline,
+                        node_id=self.node_id,
+                        subprocess_stack=subprocess_stack,
+                        root_pipeline_data=root_pipeline_data,
+                        parent_params=root_pipeline_context,
+                    )
+                except Exception as e:
+                    message = _(f"节点数据请求失败: 请重试, 如多次失败可联系管理员处理. {e} | get_node_data_v2")
                     logger.error(message)
                     return {
                         "result": False,
@@ -575,9 +575,9 @@ def get_node_data_v2(
 
                 if node_info["type"] == "SubProcess":
                     # remove prefix '${' and subfix '}' in subprocess execution input
-                    inputs = {k[2:-1]: v for k, v in preview_result.data.items()}
+                    inputs = {k[2:-1]: v for k, v in preview_inputs.items()}
                 else:
-                    inputs = preview_result.data
+                    inputs = preview_inputs
 
             except Exception as err:
                 return {
diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index bd15fed3a4..929fded589 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -12,18 +12,22 @@
 """
 
 import logging
+import re
+from typing import List
 
 from bamboo_engine.context import Context
-from bamboo_engine.eri import ContextValue
+from bamboo_engine.eri import ContextValue, NodeType
+from bamboo_engine.template import Template
 from bamboo_engine.utils.constants import VAR_CONTEXT_MAPPING
-from pipeline.eri.runtime import BambooDjangoRuntime
-
-from pipeline.core.data.expression import ConstantTemplate
-
 from pipeline.core.data import var
+from pipeline.core.data.expression import ConstantTemplate
 from pipeline.core.data.library import VariableLibrary
+from pipeline.eri.runtime import BambooDjangoRuntime
+
 from pipeline_web.parser.format import format_data_to_pipeline_inputs
 
+var_pattern = re.compile(r"\${(\w+)}")
+
 logger = logging.getLogger("root")
 
 
@@ -70,6 +74,63 @@ def get_constant_values(constants, extra_data):
     return {**constant_values, **hydrated_context}
 
 
+def preview_node_inputs(
+    runtime: BambooDjangoRuntime,
+    pipeline: dict,
+    node_id: str,
+    subprocess_stack: List[str] = [],
+    root_pipeline_data: dict = {},
+    parent_params: dict = {},
+):
+    def get_need_render_context_keys():
+        keys = set()
+        node_info = pipeline["activities"][node_id]
+        for item in node_info.get("component").get("inputs").values():
+
+            if not item["need_render"]:
+                continue
+            if isinstance(item["value"], str):
+                for value in var_pattern.findall(item["value"]):
+                    keys.add("${" + value + "}")
+        return keys
+
+    need_render_context_keys = get_need_render_context_keys()
+    context_values = [
+        ContextValue(key=key, type=VAR_CONTEXT_MAPPING[info["type"]], value=info["value"], code=info.get("custom_type"))
+        for key, info in list(pipeline["data"].get("inputs", {}).items()) + list(parent_params.items())
+        if key in need_render_context_keys
+    ]
+    context = Context(runtime, context_values, root_pipeline_data)
+
+    if subprocess_stack:
+        subprocess = subprocess_stack[0]
+        child_pipeline = pipeline["activities"][subprocess]["pipeline"]
+        param_data = {key: info["value"] for key, info in pipeline["activities"][subprocess]["params"].items()}
+        hydrated_context = context.hydrate(deformat=True)
+        hydrated_param_data = Template(param_data).render(hydrated_context)
+        formatted_param_data = {key: {"value": value, "type": "plain"} for key, value in hydrated_param_data.items()}
+        return preview_node_inputs(
+            runtime=runtime,
+            pipeline=child_pipeline,
+            node_id=node_id,
+            subprocess_stack=subprocess_stack[1:],
+            root_pipeline_data=root_pipeline_data,
+            parent_params=formatted_param_data,
+        )
+
+    node_type = pipeline["activities"][node_id]["type"]
+    if node_type == NodeType.ServiceActivity.value:
+        raw_inputs = pipeline["activities"][node_id]["component"]["inputs"]
+    elif node_type == NodeType.SubProcess.value:
+        raw_inputs = pipeline["activities"][node_id]["params"]
+    else:
+        raise Exception(f"can not preview inputs for node type: {node_type}")
+    raw_inputs = {key: info["value"] for key, info in raw_inputs.items()}
+    hydrated_context = context.hydrate(deformat=True)
+    inputs = Template(raw_inputs).render(hydrated_context)
+    return inputs
+
+
 def _system_constants_to_mako_str(value):
     """
     将内置系统变量(_system.xxx)转换为可用于mako渲染统计的变量(_system点xxx)
diff --git a/gcloud/tests/mock_settings.py b/gcloud/tests/mock_settings.py
index af8f95a62f..53691cc99b 100644
--- a/gcloud/tests/mock_settings.py
+++ b/gcloud/tests/mock_settings.py
@@ -59,6 +59,7 @@
 TASKFLOW_DISPATCHERS_NODE_FORMAT_PIPELINE_STATUS = "gcloud.taskflow3.domains.dispatchers.node.format_pipeline_status"
 TASKFLOW_DISPATCHERS_NODE_GET_PIPELINE_CONTEXT = "gcloud.taskflow3.domains.dispatchers.node.get_pipeline_context"
 TASKFLOW_DISPATCHERS_NODE_SYSTEM_OBJ = "gcloud.taskflow3.domains.dispatchers.node.SystemObject"
+TASKFLOW_CUSTOM_PREVIEW_NODE_INPUTS = "gcloud.tasktmpl3.domains.constants.preview_node_inputs"
 
 TASKFLOW_DISPATCHERS_TASK_PIPELINE_MODEL = "gcloud.taskflow3.domains.dispatchers.task.PipelineModel"
 TASKFLOW_DISPATCHERS_TASK_BAMBOO_DJANGO_RUNTIME = "gcloud.taskflow3.domains.dispatchers.task.BambooDjangoRuntime"
diff --git a/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_data_v2.py b/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_data_v2.py
index a7ca8b32d8..573be7342e 100644
--- a/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_data_v2.py
+++ b/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_data_v2.py
@@ -11,12 +11,11 @@
 specific language governing permissions and limitations under the License.
 """
 from bamboo_engine.eri import ContextValue, ContextValueType
+from bamboo_engine.exceptions import NotFoundError
 from django.test import TestCase
 
 from gcloud import err_code
 from gcloud.taskflow3.domains.dispatchers.node import NodeCommandDispatcher
-from bamboo_engine.exceptions import NotFoundError
-
 from gcloud.tests.mock import *  # noqa
 from gcloud.tests.mock_settings import *  # noqa
 
@@ -90,11 +89,8 @@ def test_act_not_started(self):
         dispatcher = NodeCommandDispatcher(engine_ver=2, node_id="node_id")
         dispatcher._get_node_info = MagicMock(return_value={"type": "ServiceActivity"})
 
-        preview_node_inputs_result = MagicMock()
-        preview_node_inputs_result.result = True
-        preview_node_inputs_result.data = "inputs"
+        preview_node_inputs_result = MagicMock(return_value="inputs")
 
-        bamboo_api.preview_node_inputs = MagicMock(return_value=preview_node_inputs_result)
         format_outputs = "format_outputs"
         dispatcher._format_outputs = MagicMock(return_value=(True, None, format_outputs))
 
@@ -102,31 +98,25 @@ def test_act_not_started(self):
             with patch(TASKFLOW_DISPATCHERS_NODE_BAMBOO_API, bamboo_api):
                 with patch(TASKFLOW_DISPATCHERS_NODE_GET_PIPELINE_CONTEXT, get_pipeline_context):
                     with patch(TASKFLOW_DISPATCHERS_NODE_SYSTEM_OBJ, system_obj):
-                        node_data = dispatcher.get_node_data_v2(
-                            username=username,
-                            component_code=component_code,
-                            subprocess_stack=subprocess_stack,
-                            loop=loop,
-                            **kwargs
-                        )
+                        with patch(TASKFLOW_CUSTOM_PREVIEW_NODE_INPUTS, preview_node_inputs_result):
+                            node_data = dispatcher.get_node_data_v2(
+                                username=username,
+                                component_code=component_code,
+                                subprocess_stack=subprocess_stack,
+                                loop=loop,
+                                **kwargs
+                            )
 
         bamboo_api.get_children_states.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id)
-        bamboo_api.preview_node_inputs.assert_called_once_with(
-            runtime=runtime,
-            pipeline=pipeline_instance.execution_data,
-            node_id=dispatcher.node_id,
-            subprocess_stack=subprocess_stack,
-            root_pipeline_data={},
-            parent_params={
-                "${_system}": {"type": "plain", "value": "system_obj"},
-                "${log_output}": {"type": "plain", "value": "test"},
-            },
-        )
+
         dispatcher._get_node_info.assert_called_once_with(
             node_id=dispatcher.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
         )
         dispatcher._format_outputs.assert_called_once_with(
-            outputs={}, component_code=component_code, pipeline_instance=pipeline_instance, subprocess_stack=["1"]
+            outputs={},
+            component_code=component_code,
+            pipeline_instance=pipeline_instance,
+            subprocess_stack=["1"],
         )
         self.assertEqual(
             node_data,

From 81db25cb0b91fa834894489ca14dad60c5d12433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 10 Aug 2023 16:05:11 +0800
Subject: [PATCH 019/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=8F=92=E4=BB=B6=E5=A4=B1=E8=B4=A5=E6=97=A0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E8=BE=93=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98=20(#6985?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复监控插件失败无异常输出的问题 (#6985)
---
 .../collections/sites/open/monitor/base.py    |  1 +
 .../monitor_test/alarm_shield/test_v1_1.py    |  9 +++++
 .../monitor_test/alarm_shield/test_v1_2.py    | 33 ++++++++++++-------
 .../alarm_shield_strategy/test_v1_1.py        | 14 +++++---
 .../alarm_shield_strategy/test_v1_2.py        | 16 ++++++---
 .../open/monitor_test/test_alarm_shield.py    | 21 +++++++++---
 .../test_alarm_shield_strategy.py             | 14 +++++---
 7 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/monitor/base.py b/pipeline_plugins/components/collections/sites/open/monitor/base.py
index 9a1713a1db..a37fd45581 100644
--- a/pipeline_plugins/components/collections/sites/open/monitor/base.py
+++ b/pipeline_plugins/components/collections/sites/open/monitor/base.py
@@ -74,6 +74,7 @@ def send_request(self, request_body, data, client):
         if not response["result"]:
             message = monitor_handle_api_error("monitor.create_shield", request_body, response)
             self.logger.error(message)
+            data.outputs.ex_data = message
             shield_id = ""
             ret_flag = False
         else:
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py
index 62a6108623..bc656755c6 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_1.py
@@ -142,6 +142,15 @@ def get_module_id_list_by_name(bk_biz_id, username, set_list, service_template_l
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58",'
+            '"bk_biz_id":2,"category":"scope","cycle_config":{"begin_time":"","end_time":"","day_list":[],'
+            '"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":'
+            '{"scope_type":"node","target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module",'
+            '"bk_inst_id":2},{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],"metric_id":["bk_monitor.system.load.load5",'
+            '"bk_monitor.system.cpu_summary.usage"]},"end_time":"2020-09-28 11:18:58","notice_config":{},'
+            '"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2020-09-28 11:18:58",'
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_2.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_2.py
index bc0aebc718..f0d35dae36 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_2.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield/test_v1_2.py
@@ -22,9 +22,7 @@
     Patcher,
 )
 
-from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_2 import (
-    MonitorAlarmShieldComponent,
-)
+from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_2 import MonitorAlarmShieldComponent
 
 
 class MonitorAlarmShieldComponentTest(TestCase, ComponentTestMixin):
@@ -141,16 +139,27 @@ def get_module_id_list_by_name(bk_biz_id, username, set_list, service_template_l
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败,"
+            " error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58","bk_biz_id":2,"category":"scope",'
+            '"cycle_config":{"begin_time":"","end_time":"","day_list":[],"week_list":[],"type":1},'
+            '"description":"shield by bk_sops","dimension_config":{"scope_type":"node",'
+            '"target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module","bk_inst_id":2},'
+            '{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],'
+            '"metric_id":["bk_monitor.system.load.load5","bk_monitor.system.cpu_summary.usage"]},'
+            '"end_time":"2020-09-28 11:18:58","notice_config":{},"shield_notice":false}',
             "shield_id": "",
-            "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
-            'params={"begin_time":"2020-09-28 11:18:58",'
-            '"bk_biz_id":2,"category":"scope","cycle_config":{"begin_time":"","end_time":"","day_list":[],'
-            '"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":'
-            '{"scope_type":"node","target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module",'
-            '"bk_inst_id":2},{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
-            '{"bk_obj_id":"module","bk_inst_id":5}],"metric_id":["bk_monitor.system.load.load5",'
-            '"bk_monitor.system.cpu_summary.usage"]},"end_time":"2020-09-28 11:18:58","notice_config":{},'
-            '"shield_notice":false}',
+            "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败,"
+            " error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58","bk_biz_id":2,"category":"scope",'
+            '"cycle_config":{"begin_time":"","end_time":"","day_list":[],"week_list":[],"type":1},'
+            '"description":"shield by bk_sops","dimension_config":{"scope_type":"node",'
+            '"target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module","bk_inst_id":2},'
+            '{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],'
+            '"metric_id":["bk_monitor.system.load.load5","bk_monitor.system.cpu_summary.usage"]},'
+            '"end_time":"2020-09-28 11:18:58","notice_config":{},"shield_notice":false}',
         },
     ),
     schedule_assertion=None,
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py
index 08a4d6b1c3..1778bdb808 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_1.py
@@ -13,15 +13,15 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
+
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_1 import (
     MonitorAlarmShieldStrategyComponent,
 )
@@ -113,6 +113,12 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py
index 1257676fee..c8f2d87607 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/alarm_shield_strategy/test_v1_2.py
@@ -11,15 +11,15 @@
 specific language governing permissions and limitations under the License.
 """
 from django.test import TestCase
+from mock import MagicMock
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
+    Call,
+    CallAssertion,
     ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    CallAssertion,
-    Call,
     Patcher,
 )
-from mock import MagicMock
 
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_2 import (
     MonitorAlarmShieldStrategyComponent,
@@ -112,6 +112,14 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"dimension_conditions":[{"condition":"and","key":"bk_biz_id","method":"eq","value":["1","2"],'
+            '"name":"bk_biz_id"}],'  # noqa
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py
index 8a983b2e96..305b4976f1 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield.py
@@ -13,16 +13,18 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
-from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_0 import MonitorAlarmShieldComponent
+
+from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield.v1_0 import (
+    MonitorAlarmShieldComponent,
+)
 
 
 class MonitorAlarmShieldComponentTest(TestCase, ComponentTestMixin):
@@ -138,6 +140,15 @@ def get_module_id_list_by_name(bk_biz_id, username, set_list, service_template_l
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2020-09-28 11:18:58",'
+            '"bk_biz_id":2,"category":"scope","cycle_config":{"begin_time":"","end_time":"","day_list":[],'
+            '"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":'
+            '{"scope_type":"node","target":[{"bk_obj_id":"module","bk_inst_id":1},{"bk_obj_id":"module",'
+            '"bk_inst_id":2},{"bk_obj_id":"module","bk_inst_id":3},{"bk_obj_id":"module","bk_inst_id":4},'
+            '{"bk_obj_id":"module","bk_inst_id":5}],"metric_id":["bk_monitor.system.load.load5",'
+            '"bk_monitor.system.cpu_summary.usage"]},"end_time":"2020-09-28 11:18:58","notice_config":{},'
+            '"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2020-09-28 11:18:58",'
diff --git a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py
index 7df9721089..b703cb8e46 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/monitor_test/test_alarm_shield_strategy.py
@@ -13,15 +13,15 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    Call,
     Patcher,
 )
+
 from pipeline_plugins.components.collections.sites.open.monitor.alarm_shield_strategy.v1_0 import (
     MonitorAlarmShieldStrategyComponent,
 )
@@ -117,6 +117,12 @@ def __init__(self):
     execute_assertion=ExecuteAssertion(
         success=False,
         outputs={
+            "ex_data": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
+            'params={"begin_time":"2019-11-04 00:00:00",'
+            '"bk_biz_id":2,"category":"strategy","cycle_config":{"begin_time":"","end_time":"","day_list":'
+            '[],"week_list":[],"type":1},"description":"shield by bk_sops","dimension_config":{"id":"123",'
+            '"scope_type":"ip","target":[{"ip":"127.0.0.1","bk_cloud_id":0},{"ip":"127.0.0.2",'
+            '"bk_cloud_id":1}]},"end_time":"2019-11-05 00:00:00","notice_config":{},"shield_notice":false}',
             "shield_id": "",
             "message": "调用监控平台(Monitor)接口monitor.create_shield返回失败, error=create shield fail, "
             'params={"begin_time":"2019-11-04 00:00:00",'

From c75dafa82ea5a03be4fe2b7cd0461b3d478c04a2 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Wed, 2 Aug 2023 15:51:26 +0800
Subject: [PATCH 020/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=9B=86=E7=BE=A4=E5=B1=9E=E6=80=A7=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E9=9B=86=E7=BE=A4=E5=A4=9A=E9=80=89=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collections/sites/open/cc/base.py         |  23 +++-
 .../sites/open/cc/update_set/legacy.py        | 122 +++++++++---------
 .../sites/open/cc/update_set/v1_0.py          |  16 +--
 3 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/cc/base.py b/pipeline_plugins/components/collections/sites/open/cc/base.py
index 0085701b0e..c41283f803 100644
--- a/pipeline_plugins/components/collections/sites/open/cc/base.py
+++ b/pipeline_plugins/components/collections/sites/open/cc/base.py
@@ -105,7 +105,11 @@ def cc_get_host_id_by_innerip(executor, bk_biz_id, ip_list, supplier_account):
     """
 
     host_list = cmdb.get_business_host(
-        executor, bk_biz_id, supplier_account, ["bk_host_id", "bk_host_innerip"], ip_list,
+        executor,
+        bk_biz_id,
+        supplier_account,
+        ["bk_host_id", "bk_host_innerip"],
+        ip_list,
     )
 
     if not host_list:
@@ -245,6 +249,23 @@ def cc_format_tree_mode_id(front_id_list):
     return [int(str(x).split("_")[1]) if len(str(x).split("_")) == 2 else int(x) for x in front_id_list]
 
 
+def cc_format_tree_set_id(front_id_list):
+    """
+    从一棵树中获取setID
+    @param front_id_list:
+    @return:
+    """
+    if front_id_list is None:
+        return []
+
+    set_ids = []
+    for x in front_id_list:
+        if x.startswith("set_") and len(str(x).split("_")) == 2:
+            set_ids.append(int(str(x).split("_")[1]))
+
+    return set_ids
+
+
 def cc_get_name_id_from_combine_value(combine_value):
     """
     组合value中获取id
diff --git a/pipeline_plugins/components/collections/sites/open/cc/update_set/legacy.py b/pipeline_plugins/components/collections/sites/open/cc/update_set/legacy.py
index 8e85f864e5..4bbbbe5fd7 100644
--- a/pipeline_plugins/components/collections/sites/open/cc/update_set/legacy.py
+++ b/pipeline_plugins/components/collections/sites/open/cc/update_set/legacy.py
@@ -17,18 +17,16 @@
 
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
-
-from pipeline.core.flow.activity import Service
-from pipeline.core.flow.io import StringItemSchema, ArrayItemSchema, IntItemSchema
 from pipeline.component_framework.component import Component
-
-from pipeline_plugins.base.utils.inject import supplier_account_for_business
-from pipeline_plugins.components.collections.sites.open.cc.base import cc_format_tree_mode_id, cc_format_prop_data
+from pipeline.core.flow.activity import Service
+from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, StringItemSchema
 
 from gcloud.conf import settings
 from gcloud.utils.handlers import handle_api_error
+from pipeline_plugins.base.utils.inject import supplier_account_for_business
+from pipeline_plugins.components.collections.sites.open.cc.base import cc_format_prop_data, cc_format_tree_set_id
 
-logger = logging.getLogger('celery')
+logger = logging.getLogger("celery")
 get_client_by_user = settings.ESB_GET_CLIENT_BY_USER
 
 __group_name__ = _("配置平台(CMDB)")
@@ -37,103 +35,105 @@
 
 
 class CCUpdateSetService(Service):
-
     def inputs_format(self):
-        return [self.InputItem(name=_('业务 ID'),
-                               key='biz_cc_id',
-                               type='string',
-                               schema=StringItemSchema(description=_('当前操作所属的 CMDB 业务 ID'))),
-                self.InputItem(name=_('集群列表'),
-                               key='cc_set_select',
-                               type='array',
-                               schema=ArrayItemSchema(description=_('集群 ID 列表'),
-                                                      item_schema=IntItemSchema(description=_('集群 ID')))),
-                self.InputItem(name=_('集群属性'),
-                               key='cc_set_property',
-                               type='string',
-                               schema=StringItemSchema(description=_('需要修改的集群属性'))),
-                self.InputItem(name=_('属性值'),
-                               key='cc_set_prop_value',
-                               type='string',
-                               schema=StringItemSchema(description=_('集群属性更新后的值')))]
+        return [
+            self.InputItem(
+                name=_("业务 ID"),
+                key="biz_cc_id",
+                type="string",
+                schema=StringItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
+            ),
+            self.InputItem(
+                name=_("集群列表"),
+                key="cc_set_select",
+                type="array",
+                schema=ArrayItemSchema(description=_("集群 ID 列表"), item_schema=IntItemSchema(description=_("集群 ID"))),
+            ),
+            self.InputItem(
+                name=_("集群属性"),
+                key="cc_set_property",
+                type="string",
+                schema=StringItemSchema(description=_("需要修改的集群属性")),
+            ),
+            self.InputItem(
+                name=_("属性值"),
+                key="cc_set_prop_value",
+                type="string",
+                schema=StringItemSchema(description=_("集群属性更新后的值")),
+            ),
+        ]
 
     def outputs_format(self):
         return []
 
     def execute(self, data, parent_data):
-        executor = parent_data.get_one_of_inputs('executor')
+        executor = parent_data.get_one_of_inputs("executor")
 
         client = get_client_by_user(executor)
-        if parent_data.get_one_of_inputs('language'):
-            setattr(client, 'language', parent_data.get_one_of_inputs('language'))
-            translation.activate(parent_data.get_one_of_inputs('language'))
+        if parent_data.get_one_of_inputs("language"):
+            setattr(client, "language", parent_data.get_one_of_inputs("language"))
+            translation.activate(parent_data.get_one_of_inputs("language"))
 
-        biz_cc_id = data.get_one_of_inputs('biz_cc_id', parent_data.inputs.biz_cc_id)
+        biz_cc_id = data.get_one_of_inputs("biz_cc_id", parent_data.inputs.biz_cc_id)
         supplier_account = supplier_account_for_business(biz_cc_id)
-        cc_set_select = cc_format_tree_mode_id(data.get_one_of_inputs('cc_set_select'))
+        cc_set_select = cc_format_tree_set_id(data.get_one_of_inputs("cc_set_select"))
 
-        cc_set_property = data.get_one_of_inputs('cc_set_property')
+        cc_set_property = data.get_one_of_inputs("cc_set_property")
         if cc_set_property == "bk_service_status":
-            bk_service_status = cc_format_prop_data(executor,
-                                                    'set',
-                                                    'bk_service_status',
-                                                    parent_data.get_one_of_inputs('language'),
-                                                    supplier_account)
-            if not bk_service_status['result']:
-                data.set_outputs('ex_data', bk_service_status['message'])
+            bk_service_status = cc_format_prop_data(
+                executor, "set", "bk_service_status", parent_data.get_one_of_inputs("language"), supplier_account
+            )
+            if not bk_service_status["result"]:
+                data.set_outputs("ex_data", bk_service_status["message"])
                 return False
 
-            cc_set_prop_value = bk_service_status['data'].get(data.get_one_of_inputs('cc_set_prop_value'))
+            cc_set_prop_value = bk_service_status["data"].get(data.get_one_of_inputs("cc_set_prop_value"))
             if not cc_set_prop_value:
-                data.set_outputs('ex_data', _("服务状态校验失败，请重试并修改为正确的服务状态"))
+                data.set_outputs("ex_data", _("服务状态校验失败，请重试并修改为正确的服务状态"))
                 return False
 
         elif cc_set_property == "bk_set_env":
-            bk_set_env = cc_format_prop_data(executor,
-                                             'set',
-                                             'bk_set_env',
-                                             parent_data.get_one_of_inputs('language'),
-                                             supplier_account)
-            if not bk_set_env['result']:
-                data.set_outputs('ex_data', bk_set_env['message'])
+            bk_set_env = cc_format_prop_data(
+                executor, "set", "bk_set_env", parent_data.get_one_of_inputs("language"), supplier_account
+            )
+            if not bk_set_env["result"]:
+                data.set_outputs("ex_data", bk_set_env["message"])
                 return False
 
-            cc_set_prop_value = bk_set_env['data'].get(data.get_one_of_inputs('cc_set_prop_value'))
+            cc_set_prop_value = bk_set_env["data"].get(data.get_one_of_inputs("cc_set_prop_value"))
             if not cc_set_prop_value:
-                data.set_outputs('ex_data', _("环境类型校验失败，请重试并修改为正确的环境类型"))
+                data.set_outputs("ex_data", _("环境类型校验失败，请重试并修改为正确的环境类型"))
                 return False
 
         elif cc_set_property == "bk_capacity":
             try:
-                cc_set_prop_value = int(data.get_one_of_inputs('cc_set_prop_value'))
+                cc_set_prop_value = int(data.get_one_of_inputs("cc_set_prop_value"))
             except Exception:
                 self.logger.error(traceback.format_exc())
-                data.set_outputs('ex_data', _("集群容量必须为整数"))
+                data.set_outputs("ex_data", _("集群容量必须为整数"))
                 return False
 
         else:
-            cc_set_prop_value = data.get_one_of_inputs('cc_set_prop_value')
+            cc_set_prop_value = data.get_one_of_inputs("cc_set_prop_value")
 
         for set_id in cc_set_select:
             cc_kwargs = {
                 "bk_biz_id": biz_cc_id,
                 "bk_supplier_account": supplier_account,
                 "bk_set_id": set_id,
-                "data": {
-                    cc_set_property: cc_set_prop_value
-                }
+                "data": {cc_set_property: cc_set_prop_value},
             }
             cc_result = client.cc.update_set(cc_kwargs)
-            if not cc_result['result']:
-                message = cc_handle_api_error('cc.update_set', cc_kwargs, cc_result)
+            if not cc_result["result"]:
+                message = cc_handle_api_error("cc.update_set", cc_kwargs, cc_result)
                 self.logger.error(message)
-                data.set_outputs('ex_data', message)
+                data.set_outputs("ex_data", message)
                 return False
         return True
 
 
 class CCUpdateSetComponent(Component):
     name = _("更新集群属性")
-    code = 'cc_update_set'
+    code = "cc_update_set"
     bound_service = CCUpdateSetService
-    form = '%scomponents/atoms/cc/cc_update_set.js' % settings.STATIC_URL
+    form = "%scomponents/atoms/cc/cc_update_set.js" % settings.STATIC_URL
diff --git a/pipeline_plugins/components/collections/sites/open/cc/update_set/v1_0.py b/pipeline_plugins/components/collections/sites/open/cc/update_set/v1_0.py
index a510a561d2..053e91c338 100644
--- a/pipeline_plugins/components/collections/sites/open/cc/update_set/v1_0.py
+++ b/pipeline_plugins/components/collections/sites/open/cc/update_set/v1_0.py
@@ -16,22 +16,20 @@
 
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
-
-from pipeline.core.flow.activity import Service
-from pipeline.core.flow.io import StringItemSchema, ArrayItemSchema, IntItemSchema
 from pipeline.component_framework.component import Component
+from pipeline.core.flow.activity import Service
+from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, StringItemSchema
 
+from gcloud.conf import settings
+from gcloud.utils.handlers import handle_api_error
+from pipeline_plugins.base.utils.inject import supplier_account_for_business
 from pipeline_plugins.components.collections.sites.open.cc.base import (
     BkObjType,
     SelectMethod,
-    cc_format_tree_mode_id,
     cc_format_prop_data,
+    cc_format_tree_set_id,
     cc_list_select_node_inst_id,
 )
-from pipeline_plugins.base.utils.inject import supplier_account_for_business
-
-from gcloud.conf import settings
-from gcloud.utils.handlers import handle_api_error
 
 logger = logging.getLogger("celery")
 get_client_by_user = settings.ESB_GET_CLIENT_BY_USER
@@ -100,7 +98,7 @@ def execute(self, data, parent_data):
         supplier_account = supplier_account_for_business(biz_cc_id)
         cc_set_select_method = data.get_one_of_inputs("cc_set_select_method")
         if cc_set_select_method == SelectMethod.TOPO.value:
-            cc_set_select = cc_format_tree_mode_id(data.get_one_of_inputs("cc_set_select_topo"))
+            cc_set_select = cc_format_tree_set_id(data.get_one_of_inputs("cc_set_select_topo"))
         elif cc_set_select_method == SelectMethod.TEXT.value:
             cc_set_select_text = data.get_one_of_inputs("cc_set_select_text")
             cc_list_select_node_inst_id_return = cc_list_select_node_inst_id(

From 33e459a686e37006dc18714e097cc31c199c65bd Mon Sep 17 00:00:00 2001
From: crayon <42019787+ZhuoZhuoCrayon@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:50:09 +0800
Subject: [PATCH 021/112] =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=8C=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1=E3=80=8D=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96=20(#6981)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feature: 节点管理「新建任务」插件优化

* minor: review fix
---
 .../collections/sites/open/nodeman/base.py    |  74 +-
 .../sites/open/nodeman/create_task/v3_0.py    |  74 +-
 .../sites/open/nodeman/create_task/v4_0.py    | 193 ++---
 .../atoms/nodeman/create_task/v4_0.js         | 810 ++++++++----------
 .../test_nodeman_v3_create_task.py            |   6 +-
 .../test_nodeman_v4_create_task.py            | 142 ++-
 6 files changed, 609 insertions(+), 690 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/base.py b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
index 7f69d0d995..778f7bf9f5 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/base.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
@@ -13,7 +13,7 @@
 import ujson as json
 from django.utils.translation import ugettext_lazy as _
 from pipeline.core.flow.activity import Service, StaticIntervalGenerator
-from pipeline.core.flow.io import IntItemSchema, StringItemSchema
+from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
@@ -140,11 +140,10 @@ def get_ip_list(self, ip_str):
     def get_host_id_list(self, ip_str, executor, bk_cloud_id, bk_biz_id):
         # 如果开启了ipv6的逻辑，则执行
         if settings.ENABLE_IPV6:
-            ipv6_list, ipv4_list, _, _ = extract_ip_from_ip_str(ip_str)
-            ip_list = ipv4_list + ipv6_list
-            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
-
-            return list(bk_host_id_dict_ipv6.values())
+            ipv6_list, ipv4_list, *_ = extract_ip_from_ip_str(ip_str)
+            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ipv6_list)
+            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ipv4_list)
+            return list(set(bk_host_id_dict_ipv6.values()) | set(bk_host_id_dict.values()))
 
         ip_list = get_ip_by_regex(ip_str)
         bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
@@ -282,3 +281,66 @@ def schedule(self, data, parent_data, callback_data=None):
             data.set_outputs("ex_data", error_log)
             self.finish_schedule()
             return False
+
+
+class NodeManNewBaseService(NodeManBaseService):
+    def inputs_format(self):
+        return [
+            self.InputItem(
+                name=_("业务 ID"),
+                key="bk_biz_id",
+                type="int",
+                schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
+            ),
+            self.InputItem(
+                name=_("节点类型"),
+                key="nodeman_node_type",
+                type="string",
+                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
+            ),
+            self.InputItem(
+                name=_("操作详情"),
+                key="nodeman_op_info",
+                type="object",
+                schema=ObjectItemSchema(
+                    description=_("操作内容信息"),
+                    property_schemas={
+                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
+                        "nodeman_op_type": StringItemSchema(
+                            description=_(
+                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
+                            )
+                        ),
+                        "nodeman_hosts": ArrayItemSchema(
+                            description=_("需要被操作的主机信息(安装与重装时需要)"),
+                            item_schema=ObjectItemSchema(
+                                description=_("主机相关信息"),
+                                property_schemas={
+                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
+                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
+                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
+                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
+                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
+                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
+                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
+                                    "port": StringItemSchema(description=_("端口号")),
+                                    "account": StringItemSchema(description=_("登录帐号")),
+                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
+                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
+                                },
+                            ),
+                        ),
+                        "nodeman_other_hosts": ArrayItemSchema(
+                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
+                            item_schema=ObjectItemSchema(
+                                description=_("主机相关信息"),
+                                property_schemas={
+                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
+                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
+                                },
+                            ),
+                        ),
+                    },
+                ),
+            ),
+        ]
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
index 610864ac50..c3c0cb514a 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
@@ -14,13 +14,12 @@
 
 from django.utils.translation import ugettext_lazy as _
 from pipeline.component_framework.component import Component
-from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
 from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
-    NodeManBaseService,
+    NodeManNewBaseService,
     get_host_id_by_inner_ip,
     get_host_id_by_inner_ipv6,
     get_nodeman_rsa_public_key,
@@ -45,7 +44,7 @@
 HOST_EXTRA_PARAMS_IPV6 = ["inner_ipv6", "outer_ipv6"]
 
 
-class NodemanCreateTaskService(NodeManBaseService):
+class NodemanCreateTaskService(NodeManNewBaseService):
     def execute(self, data, parent_data):
         executor = parent_data.inputs.executor
         client = BKNodeManClient(username=executor)
@@ -53,15 +52,6 @@ def execute(self, data, parent_data):
 
         node_type = data.inputs.nodeman_node_type
 
-        nodeman_ticket = data.get_one_of_inputs("nodeman_ticket", {})
-        nodeman_tjj_ticket = nodeman_ticket.get("nodeman_tjj_ticket", "")
-        if nodeman_tjj_ticket:
-            try:
-                nodeman_tjj_ticket = decrypt_auth_key(nodeman_tjj_ticket, settings.RSA_PRIV_KEY)
-            except Exception:
-                # password is not encrypted
-                pass
-
         nodeman_op_info = data.inputs.nodeman_op_info
         op_type = nodeman_op_info.get("nodeman_op_type", "")
         nodeman_hosts = nodeman_op_info.get("nodeman_hosts", [])
@@ -190,8 +180,6 @@ def execute(self, data, parent_data):
 
             kwargs = {"job_type": job_name, "hosts": all_hosts, "action": "job_install"}
 
-            if nodeman_tjj_ticket:
-                kwargs.update({"tcoa_ticket": nodeman_tjj_ticket})
         else:
             data.set_outputs("ex_data", _("无效的操作请求:{}".format(job_name)))
             return False
@@ -201,64 +189,6 @@ def execute(self, data, parent_data):
 
         return self.get_job_result(result, data, action, kwargs)
 
-    def inputs_format(self):
-        return [
-            self.InputItem(
-                name=_("业务 ID"), key="bk_biz_id", type="int", schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
-            ),
-            self.InputItem(
-                name=_("节点类型"),
-                key="nodeman_node_type",
-                type="string",
-                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
-            ),
-            self.InputItem(
-                name=_("操作详情"),
-                key="nodeman_op_info",
-                type="object",
-                schema=ObjectItemSchema(
-                    description=_("操作内容信息"),
-                    property_schemas={
-                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
-                        "nodeman_op_type": StringItemSchema(
-                            description=_(
-                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
-                            )
-                        ),
-                        "nodeman_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(安装与重装时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
-                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
-                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
-                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
-                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
-                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
-                                    "port": StringItemSchema(description=_("端口号")),
-                                    "account": StringItemSchema(description=_("登录帐号")),
-                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
-                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
-                                },
-                            ),
-                        ),
-                        "nodeman_other_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
-                                },
-                            ),
-                        ),
-                    },
-                ),
-            ),
-        ]
-
 
 class NodemanCreateTaskComponent(Component):
     name = _("新建任务")
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
index 43eeb95e4c..c07311b5d8 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
@@ -10,9 +10,10 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+from copy import deepcopy
+
 from django.utils.translation import ugettext_lazy as _
 from pipeline.component_framework.component import Component
-from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
@@ -20,18 +21,34 @@
 from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
-    NodeManBaseService,
+    NodeManNewBaseService,
     get_nodeman_rsa_public_key,
 )
 
 __group_name__ = _("节点管理(Nodeman)")
 VERSION = "v4.0"
 
-# 安装类任务(job_install)
-INSTALL_JOB = ["INSTALL_PROXY", "INSTALL_AGENT", "REINSTALL_PROXY", "REINSTALL_AGENT", "UNINSTALL_AGENT"]
+# 无需认证信息的操作
+NOT_NEED_AUTH_JOB = ["RELOAD_AGENT", "RELOAD_PROXY"]
+
+
+# 无需额外配置信息的操作
+NOT_NEED_EXTRA_CONFIG_JOB = ["UNINSTALL_AGENT"]
 
-# 操作类任务(job_operate)
-OPERATE_JOB = ["UPGRADE_AGENT", "UNINSTALL_PROXY"]
+# 依赖节点管理 job/install 接口的操作
+INSTALL_JOB = (
+    [
+        "INSTALL_PROXY",
+        "INSTALL_AGENT",
+        "REINSTALL_PROXY",
+        "REINSTALL_AGENT",
+    ]
+    + NOT_NEED_EXTRA_CONFIG_JOB
+    + NOT_NEED_AUTH_JOB
+)
+
+# 依赖节点管理 job/details 接口的操作
+OPERATE_JOB = ["UPGRADE_AGENT", "UPGRADE_PROXY", "UNINSTALL_PROXY", "RESTART_AGENT", "RESTART_PROXY"]
 
 # 主机其它参数
 HOST_EXTRA_PARAMS = ["outer_ip", "login_ip", "data_ip", "inner_ipv6", "outer_ipv6"]
@@ -40,21 +57,12 @@
 HOST_EXTRA_PARAMS_IPV6 = ["inner_ipv6", "outer_ipv6"]
 
 
-class NodemanCreateTaskService(NodeManBaseService):
+class NodemanCreateTaskService(NodeManNewBaseService):
     def execute(self, data, parent_data):
         executor = parent_data.inputs.executor
         client = BKNodeManClient(username=executor)
         bk_biz_id = data.inputs.bk_biz_id
 
-        nodeman_ticket = data.get_one_of_inputs("nodeman_ticket", {})
-        nodeman_tjj_ticket = nodeman_ticket.get("nodeman_tjj_ticket", "")
-        if nodeman_tjj_ticket:
-            try:
-                nodeman_tjj_ticket = decrypt_auth_key(nodeman_tjj_ticket, settings.RSA_PRIV_KEY)
-            except Exception:
-                # password is not encrypted
-                pass
-
         nodeman_op_info = data.inputs.nodeman_op_info
         node_type = nodeman_op_info.get("nodeman_node_type")
         op_type = nodeman_op_info.get("nodeman_op_type", "")
@@ -85,10 +93,6 @@ def execute(self, data, parent_data):
             all_hosts, row_host_params_list = [], []
             for host in nodeman_hosts:
                 bk_cloud_id = host["nodeman_bk_cloud_id"]
-                ap_id = host["nodeman_ap_id"]
-                auth_type = host["auth_type"]
-                auth_key = host["auth_key"]
-
                 use_inner_ip = True if host.get("inner_ip") else False
                 # use_inner_ip 判定用户输入的的是ipv4还是ipv6
                 inner_ip_list = self.get_ip_list(
@@ -101,46 +105,71 @@ def execute(self, data, parent_data):
                     data.set_outputs("ex_data", _("请确认内网Ip是否合法host_info:{host}".format(host=host["inner_ip"])))
                     return False
 
-                # 处理表格中每行的key/psw
-                try:
-                    auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
-                except Exception:
-                    # password is not encrypted
-                    pass
-                # auth_key加密
-                success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
-                if not success:
-                    data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
-                    return False
-                auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+                auth_params = {}
+                if job_name not in NOT_NEED_AUTH_JOB:
+
+                    # 认证信息
+                    auth_params.update(
+                        {
+                            "port": host["port"],
+                            "auth_type": host["auth_type"],
+                            "account": host["account"],
+                        }
+                    )
+
+                    auth_key = host["auth_key"]
+
+                    # 处理表格中每行的key/psw
+                    try:
+                        auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
+                    except Exception:
+                        self.logger.info("try to decrypt password error, use plaintext.")
+                        pass
+
+                    # auth_key加密
+                    success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
+                    if not success:
+                        data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+                        return False
+                    auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+
+                    if auth_params["auth_type"] == "PASSWORD":
+                        auth_params["password"] = auth_key
+                    else:
+                        auth_params["key"] = auth_key
+
+                # 额外配置参数
+                extra_config_params = {"peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 0)}
+                speed_limit = host.get("speed_limit")
+                if speed_limit:
+                    extra_config_params.update({"bt_speed_limit": int(speed_limit)})
+
                 # 表格每行基础参数
                 base_params = {
+                    **auth_params,
                     "bk_biz_id": bk_biz_id,
                     "bk_cloud_id": bk_cloud_id,
+                    "ap_id": host["nodeman_ap_id"],
                     "os_type": host["os_type"],
-                    "port": host["port"],
-                    "account": host["account"],
-                    "auth_type": auth_type,
-                    "ap_id": ap_id,
                     "is_manual": False,
-                    "peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 1),
                 }
-                speed_limit = host.get("speed_limit")
-                if speed_limit:
-                    base_params.update({"bt_speed_limit": int(speed_limit)})
 
                 # 支持表格中一行多ip操作, 拼装表格内的inner_ip参数
                 for index, inner_ip in enumerate(inner_ip_list):
-                    one = {}
+
+                    row_host_info = deepcopy(base_params)
                     if use_inner_ip:
-                        one = {"inner_ip": inner_ip}
-                    if auth_type == "PASSWORD":
-                        one["password"] = auth_key
-                    else:
-                        one["key"] = auth_key
+                        row_host_info.update({"inner_ip": inner_ip})
+
+                    # 注入额外 Agent 配置信息
+                    if job_name not in NOT_NEED_EXTRA_CONFIG_JOB:
+                        row_host_info.update(extra_config_params)
 
-                    # 重装必须要bk_host_id
-                    if job_name in ["REINSTALL_PROXY", "REINSTALL_AGENT", "UNINSTALL_AGENT"]:
+                    # 除了安装，其他操作需要 bk_host_id
+                    if (
+                        job_name
+                        in ["REINSTALL_PROXY", "REINSTALL_AGENT"] + NOT_NEED_AUTH_JOB + NOT_NEED_EXTRA_CONFIG_JOB
+                    ):
                         supplier_account = supplier_account_for_business(bk_biz_id)
                         host_fields = ["bk_host_id", "bk_host_innerip"]
                         # 如果开启了ipv6，并且用户输入的是ipv6的地址
@@ -156,7 +185,7 @@ def execute(self, data, parent_data):
                             )
                             bk_host_id_dict = {host["bk_host_innerip"]: host["bk_host_id"] for host in host_list}
                         try:
-                            one["bk_host_id"] = bk_host_id_dict[inner_ip]
+                            row_host_info["bk_host_id"] = bk_host_id_dict[inner_ip]
                         except KeyError:
                             data.set_outputs("ex_data", _("获取bk_host_id失败:{},请确认管控区域是否正确".format(inner_ip)))
                             return False
@@ -169,14 +198,12 @@ def execute(self, data, parent_data):
                         if host.get(ip_type, False):
                             others_ip_list = self.get_ip_list(host[ip_type])
                             if len(others_ip_list) == len(inner_ip_list):
-                                one[ip_type] = others_ip_list[index]
+                                row_host_info[ip_type] = others_ip_list[index]
                             else:
                                 data.set_outputs("ex_data", _("获取{}的{}失败,请确认是否与inner_ip一一对应".format(inner_ip, ip_type)))
                                 return False
 
-                    one.update(base_params)
-
-                    row_host_params_list.append(one)
+                    row_host_params_list.append(row_host_info)
 
             all_hosts.extend(row_host_params_list)
 
@@ -185,8 +212,6 @@ def execute(self, data, parent_data):
             if job_name in ["INSTALL_PROXY", "INSTALL_AGENT", "REINSTALL_PROXY", "REINSTALL_AGENT"]:
                 kwargs.update({"is_install_latest_plugins": nodeman_install_latest_plugins})
 
-            if nodeman_tjj_ticket:
-                kwargs.update({"tcoa_ticket": nodeman_tjj_ticket})
         else:
             data.set_outputs("ex_data", _("无效的操作请求:{}".format(job_name)))
             return False
@@ -196,64 +221,6 @@ def execute(self, data, parent_data):
 
         return self.get_job_result(result, data, action, kwargs)
 
-    def inputs_format(self):
-        return [
-            self.InputItem(
-                name=_("业务 ID"), key="bk_biz_id", type="int", schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
-            ),
-            self.InputItem(
-                name=_("节点类型"),
-                key="nodeman_node_type",
-                type="string",
-                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
-            ),
-            self.InputItem(
-                name=_("操作详情"),
-                key="nodeman_op_info",
-                type="object",
-                schema=ObjectItemSchema(
-                    description=_("操作内容信息"),
-                    property_schemas={
-                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
-                        "nodeman_op_type": StringItemSchema(
-                            description=_(
-                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
-                            )
-                        ),
-                        "nodeman_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(安装与重装时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
-                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
-                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
-                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
-                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
-                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
-                                    "port": StringItemSchema(description=_("端口号")),
-                                    "account": StringItemSchema(description=_("登录帐号")),
-                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
-                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
-                                },
-                            ),
-                        ),
-                        "nodeman_other_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
-                                },
-                            ),
-                        ),
-                    },
-                ),
-            ),
-        ]
-
 
 class NodemanCreateTaskComponent(Component):
     name = _("新建任务")
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index d0457cf9bf..86dd4b1df5 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -13,14 +13,289 @@
 (function () {
     function is_display_tag(self, op_type, value) {
         if (op_type.indexOf(value) !== -1) {
-            self.show()
+            self.show();
         } else {
-            self.hide()
+            self.hide();
         }
     }
 
-    let node_type = "AGENT"
-    let NODEMAN_TJJ_IS_HIDDEN = true
+    function is_install_op(self, value) {
+        is_display_tag(self, ["INSTALL", "REINSTALL"], value);
+    }
+
+
+    function init_columns(self, node_type, op_type) {
+        let common_columns = [
+            {
+                tag_code: "nodeman_bk_cloud_id",
+                type: "select",
+                attrs: {
+                    name: gettext("管控区域ID"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_cloud_area/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        resp.data.unshift({"text": gettext("直连区域"), "value": 0});
+                        return resp.data;
+                    },
+                    validation: [
+                        {
+                            type: "required",
+                        }
+                    ]
+                }
+            },
+            {
+                tag_code: "nodeman_ap_id",
+                type: "select",
+                attrs: {
+                    name: gettext("接入点"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_ap_list/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        return resp.data;
+                    },
+                    validation: []
+                }
+            },
+            {
+                tag_code: "inner_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP"),
+                    placeholder: gettext("多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "inner_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，内网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "os_type",
+                type: "select",
+                attrs: {
+                    name: gettext("操作系统类型"),
+                    width: "180px",
+                    items: [
+                        {value: "LINUX", text: gettext("LINUX")},
+                        {value: "WINDOWS", text: gettext("WINDOWS")},
+                        {value: "AIX", text: gettext("AIX")}
+                    ],
+                    default: "LINUX",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+        ];
+
+        let proxy_columns = [
+            {
+                tag_code: "outer_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP"),
+                    placeholder: gettext("可选,如填写需与内网ip一一对应,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                    validation: []
+                },
+            },
+            {
+                tag_code: "data_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("数据IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "outer_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，外网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                },
+            },
+        ];
+
+        let auth_columns = [
+            {
+                tag_code: "login_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("登录IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "account",
+                type: "input",
+                attrs: {
+                    name: gettext("登录账号"),
+                    width: "180px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "port",
+                type: "input",
+                attrs: {
+                    name: gettext("端口号"),
+                    width: "100px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_type",
+                type: "select",
+                attrs: {
+                    name: gettext("认证方式"),
+                    width: "180px",
+                    items: [
+                        {value: "PASSWORD", text: gettext("PASSWORD")},
+                        {value: "KEY", text: gettext("KEY")},
+                        {value: "TJJ_PASSWORD", text: gettext("TJJ")}
+
+                    ],
+                    default: "PASSWORD",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_key",
+                type: "textarea",
+                // TODO 能不能加一个动态选项？如果具有加密前缀，默认展示 * 脱敏
+                // TODO 如果重新输入保存，可以拉公钥去做加密
+                attrs: {
+                    name: gettext("认证密钥"),
+                    width: "400px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value, parent_value) {
+                                let auth_type = parent_value.auth_type;
+                                let result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (auth_type !== "TJJ_PASSWORD" && !value.length) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入认证密钥");
+                                }
+                                return result;
+                            }
+                        }
+                    ],
+                    showPassword: true
+                },
+            },
+        ];
+
+        let config_columns = [
+            {
+                tag_code: "peer_exchange_switch_for_agent",
+                type: "radio",
+                attrs: {
+                    name: gettext("BT节点探测"),
+                    items: [
+                        {value: 1, name: gettext("是")},
+                        {value: 0, name: gettext("否")}
+                    ],
+                    default: 0,
+                    validation: [
+                        {
+                            type: "required"
+                        },
+                    ]
+                },
+            },
+            {
+                tag_code: "speed_limit",
+                type: "input",
+                attrs: {
+                    name: gettext("传输限速 M/s"),
+                    width: "100px",
+                    placeholder: gettext("请输入"),
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value) {
+                                var result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (value && !Number(value)) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入数字");
+                                }
+                                return result;
+                            }
+                        }
+                    ]
+                },
+            },
+        ];
+
+        self.columns = common_columns;
+
+        // 如果是 Proxy，补充 Proxy 信息
+        if (node_type === "PROXY") {
+            self.columns.push(...proxy_columns);
+        }
+        // 安装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+            self.columns.push(...auth_columns);
+        }
+        // 非卸载场景需要配置信息
+        if (op_type !== "UNINSTALL") {
+            self.columns.push(...config_columns);
+        }
+        console.log(node_type, op_type);
+    };
+
+    let NODEMAN_TJJ_IS_HIDDEN = true;
+
     $.ajax({
         url: $.context.get('site_url') + 'pipeline/nodeman_is_support_tjj/',
         type: 'GET',
@@ -28,13 +303,13 @@
         async: false,
         success: function (resp) {
             if (resp.data) {
-                NODEMAN_TJJ_IS_HIDDEN = false
+                NODEMAN_TJJ_IS_HIDDEN = false;
             }
         },
         error: function () {
             show_msg('request nodeman is support tjj error', 'error');
         }
-    })
+    });
     $.atoms.nodeman_create_task = [
         {
             tag_code: "bk_biz_id",
@@ -63,116 +338,10 @@
                     if (this.value) {
                         return
                     }
-                    this._set_value($.context.getBkBizId())
+                    this._set_value($.context.getBkBizId());
                 }
             }
         },
-        {
-            tag_code: "nodeman_ticket",
-            type: "combine",
-            attrs: {
-                name: gettext("ticket信息"),
-                hookable: true,
-                hidden: NODEMAN_TJJ_IS_HIDDEN,
-                children: [{
-                    tag_code: "nodeman_ticket_save",
-                    type: "radio",
-                    attrs: {
-                        name: gettext("ticket获取方式"),
-                        hookable: true,
-                        hidden: false,
-                        value: 2,
-                        disabled: false,
-                        default: 2,
-                        items: [
-                            {
-                                name: gettext("获取ticket"),
-                                value: 0
-                            },
-                            {
-                                name: gettext("实时获取ticket"),
-                                value: 1
-                            },
-                            {
-                                name: gettext("不使用ticket"),
-                                value: 2
-                            }
-                        ],
-                    },
-                },
-                    {
-                        type: "text",
-                        tag_code: "nodeman_tjj_tip",
-                        attrs: {
-                            name: gettext("说明"),
-                            hookable: true,
-                            hidden: false,
-                            raw: false,
-                            value: gettext("TJJ认证需要获取用户的ticket,请选择ticket获取方式")
-                        },
-                        events: [
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "change",
-                                action: function (value) {
-                                    if (value === 0) {
-                                        this._set_value(gettext("此选项将保存ticket到模板,插件长时间未执行可能发生ticket过期失效导致认证失败"))
-                                    }
-                                    if (value === 1) {
-                                        this._set_value(gettext("此选项将在任务执行前获取ticket,选择此选项需要(ticket使用方式)勾选为全局变量"))
-                                    }
-                                    if (value === 2) {
-                                        this._set_value(gettext("TJJ认证需要获取用户的ticket,请选择ticket获取方式"))
-                                    }
-                                }
-                            },]
-                    },
-                    {
-                        tag_code: "nodeman_tjj_ticket",
-                        type: "password",
-                        attrs: {
-                            name: "TJJ认证ticket",
-                            hookable: true,
-                            hidden: true,
-                            placeholder: "用户ticket",
-                            disabled: true,
-                            validation: []
-                        },
-                        events: [
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "change",
-                                action: function (value) {
-                                    if (value === 2) {
-                                        this._set_value("")
-                                        return
-                                    }
-                                    let a = /TCOA_TICKET=\S+/
-                                    let cookieStr = document.cookie
-                                    let ticket = cookieStr.match(a)[0].split(";")[0].split("=")[1]
-                                    this._set_value(ticket)
-                                }
-                            },
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "init",
-                                action: function (value) {
-                                    if (value === 1) {
-                                        let a = /TCOA_TICKET=\S+/
-                                        let cookieStr = document.cookie
-                                        let ticket = cookieStr.match(a)[0].split(";")[0].split("=")[1]
-                                        this._set_value(ticket)
-                                    }
-                                    if (value === 2) {
-                                        this._set_value("")
-                                    }
-                                }
-                            }
-
-                        ],
-                    }]
-            },
-        },
         {
             tag_code: "nodeman_op_info",
             type: "combine",
@@ -195,6 +364,16 @@
                                 {
                                     type: "required"
                                 }
+                            ],
+                            events: [
+                                {
+                                    source: "nodeman_node_type",
+                                    type: "init",
+                                    action: function (value) {
+                                        // 统一以 change 事件抛出
+                                        this.emit_event(this.tagCode, "change", this.value);
+                                    }
+                                },
                             ]
                         }
                     },
@@ -208,6 +387,8 @@
                                 {value: "REINSTALL", text: gettext("重新安装")},
                                 {value: "UNINSTALL", text: gettext("卸载")},
                                 {value: "UPGRADE", text: gettext("升级")},
+                                {value: "RESTART", text: gettext("重启")},
+                                {value: "RELOAD", text: gettext("配置重载")},
                             ],
                             default: "INSTALL",
                             validation: [
@@ -218,51 +399,10 @@
                         },
                         events: [
                             {
-                                source: "nodeman_node_type",
+                                source: "nodeman_op_type",
                                 type: "init",
                                 action: function (value) {
-                                    node_type = value
-                                    if (value == "AGENT") {
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                            {value: "UPGRADE", text: gettext("升级")},
-                                        ]
-                                    } else {
-                                        if (this.value == "UPGRADE") {
-                                            this._set_value("INSTALL")
-                                        }
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                        ]
-                                    }
-                                }
-                            },
-                            {
-                                source: "nodeman_node_type",
-                                type: "change",
-                                action: function (value) {
-                                    node_type = value
-                                    if (value == "AGENT") {
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                            {value: "UPGRADE", text: gettext("升级")},
-                                        ]
-                                    } else {
-                                        if (this.value == "UPGRADE") {
-                                            this._set_value("INSTALL")
-                                        }
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                        ]
-                                    }
+                                    this.emit_event(this.tagCode, "change", this.value);
                                 }
                             },
                         ]
@@ -284,20 +424,11 @@
                             ]
                         },
                         events: [
-                            {
-                                source: "nodeman_op_type",
-                                type: "init",
-                                action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    is_display_tag(this, op_type, value)
-                                }
-                            },
                             {
                                 source: "nodeman_op_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    is_display_tag(this, op_type, value)
+                                    is_install_op(this, value);
                                 }
                             },
                         ]
@@ -313,7 +444,7 @@
                                     type: "add_row",
                                     text: gettext("添加"),
                                     callback: function () {
-                                        this.add_row()
+                                        this.add_row();
                                     }
                                 },
                                 {
@@ -324,305 +455,29 @@
                                     type: "export",
                                     text: gettext("导出"),
                                     callback: function () {
-                                        this.export2Excel()
+                                        this.export2Excel();
                                     }
                                 },
 
                             ],
-                            columns: [
-                                {
-                                    tag_code: "nodeman_bk_cloud_id",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("管控区域ID"),
-                                        width: "180px",
-                                        remote: true,
-                                        items: [],
-                                        remote_url: $.context.get("site_url") + "pipeline/nodeman_get_cloud_area/",
-                                        remote_data_init: function (resp) {
-                                            if (resp.result === false) {
-                                                show_msg(resp.message, "error");
-                                            }
-                                            resp.data.unshift({"text": gettext("直连区域"), "value": 0})
-                                            return resp.data;
-                                        },
-                                        validation: [
-                                            {
-                                                type: "required",
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "nodeman_ap_id",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("接入点"),
-                                        width: "180px",
-                                        remote: true,
-                                        items: [],
-                                        remote_url: $.context.get("site_url") + "pipeline/nodeman_get_ap_list/",
-                                        remote_data_init: function (resp) {
-                                            if (resp.result === false) {
-                                                show_msg(resp.message, "error");
-                                            }
-                                            return resp.data;
-                                        },
-                                        validation: []
-                                    }
-                                },
-                                {
-                                    tag_code: "inner_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("内网IP"),
-                                        placeholder: gettext("多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true
-                                    }
-                                },
-                                {
-                                    tag_code: "outer_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("外网IP"),
-                                        placeholder: gettext("可选,如填写需与内网ip一一对应,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true,
-                                        validation: []
-                                    }
-                                },
-                                {
-                                    tag_code: "login_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("登录IP"),
-                                        placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true
-                                    }
-                                },
-                                {
-                                    tag_code: "data_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("数据IP"),
-                                        placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "inner_ipv6",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("内网IP(IPV6)"),
-                                        placeholder: gettext("可为空，如纯ipv6主机，内网ipv和外网IP(IPV6)两个必须填一个"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "outer_ipv6",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("外网IP(IPV6)"),
-                                        placeholder: gettext("可为空，如纯ipv6主机，外网ipv和外网IP(IPV6)两个必须填一个"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "os_type",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("操作系统类型"),
-                                        width: "180px",
-                                        items: [
-                                            {value: "LINUX", text: gettext("LINUX")},
-                                            {value: "WINDOWS", text: gettext("WINDOWS")},
-                                            {value: "AIX", text: gettext("AIX")}
-                                        ],
-                                        default: "LINUX",
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "account",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("登录账号"),
-                                        width: "180px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "port",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("端口号"),
-                                        width: "100px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "auth_type",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("认证方式"),
-                                        width: "180px",
-                                        items: [
-                                            {value: "PASSWORD", text: gettext("PASSWORD")},
-                                            {value: "KEY", text: gettext("KEY")},
-                                            {value: "TJJ_PASSWORD", text: gettext("TJJ")}
-
-                                        ],
-                                        default: "PASSWORD",
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "auth_key",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("认证密钥"),
-                                        width: "400px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "custom",
-                                                args: function (value, parent_value) {
-                                                    let auth_type = parent_value.auth_type
-                                                    let result = {
-                                                        result: true,
-                                                        error_message: ""
-                                                    }
-                                                    if (auth_type !== "TJJ_PASSWORD" && !value.length) {
-                                                        result.result = false;
-                                                        result.error_message = gettext("请输入认证密钥");
-                                                    }
-                                                    return result
-                                                }
-                                            }
-                                        ],
-                                        showPassword: true
-                                    },
-                                    events: []
-                                },
-                                {
-                                    tag_code: "peer_exchange_switch_for_agent",
-                                    type: "radio",
-                                    attrs: {
-                                        name: gettext("BT节点探测"),
-                                        items: [
-                                            {value: 1, name: gettext("是")},
-                                            {value: 0, name: gettext("否")}
-                                        ],
-                                        default: 1,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            },
-                                        ]
-                                    },
-                                    events: [
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "init",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "change",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                    ]
-                                },
-                                {
-                                    tag_code: "speed_limit",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("传输限速 M/s"),
-                                        width: "100px",
-                                        placeholder: gettext("请输入"),
-                                        validation: [
-                                            {
-                                                type: "custom",
-                                                args: function (value) {
-                                                    var result = {
-                                                        result: true,
-                                                        error_message: ""
-                                                    }
-                                                    if (value && !Number(value)) {
-                                                        result.result = false;
-                                                        result.error_message = gettext("请输入数字");
-                                                    }
-                                                    return result;
-                                                }
-                                            }
-                                        ]
-                                    },
-                                    events: [
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "init",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "change",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                    ]
-                                },
-                            ],
+                            columns: [],
                             hookable: true,
                             validation: [
                                 {
                                     type: "custom",
                                     args: function (value) {
-                                        let self = this
+                                        let self = this;
                                         let result = {
                                             result: true,
                                             error_message: ""
-                                        }
+                                        };
                                         let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
-                                        let install_type = ["INSTALL", "REINSTALL"]
+                                        let install_type = ["INSTALL", "REINSTALL"];
                                         if (install_type.indexOf(op_type) !== -1 && value === "") {
                                             result.result = false;
                                             result.error_message = gettext("请完善主机信息");
                                         }
-                                        return result
+                                        return result;
 
                                     }
                                 }
@@ -631,24 +486,27 @@
                         events: [
                             {
                                 source: "nodeman_op_type",
-                                type: "init",
+                                type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    if (node_type == "AGENT") {
-                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL"]
+                                    let node_type = this.get_parent().get_child("nodeman_node_type").value;
+                                    init_columns(this, node_type, value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (node_type === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, value);
                                 }
                             },
                             {
-                                source: "nodeman_op_type",
+                                source: "nodeman_node_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    if (node_type == "AGENT") {
-                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL"]
+                                    init_columns(this, value, this.get_parent().get_child("nodeman_op_type").value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (value === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
                                 }
                             },
                         ]
@@ -664,7 +522,7 @@
                                     type: "add_row",
                                     text: gettext("添加"),
                                     callback: function () {
-                                        this.add_row()
+                                        this.add_row();
                                     }
                                 },
                                 {
@@ -675,7 +533,7 @@
                                     type: "export",
                                     text: gettext("导出"),
                                     callback: function () {
-                                        this.export2Excel()
+                                        this.export2Excel();
                                     }
                                 },
 
@@ -715,18 +573,18 @@
                                 {
                                     type: "custom",
                                     args: function (value) {
-                                        let self = this
+                                        let self = this;
                                         let result = {
                                             result: true,
                                             error_message: ""
-                                        }
+                                        };
                                         let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
-                                        let install_type = ["UNINSTALL", "UPGRADE"]
+                                        let install_type = ["UNINSTALL", "UPGRADE"];
                                         if (install_type.indexOf(op_type) !== -1 && value === "") {
                                             result.result = false;
                                             result.error_message = gettext("请完善主机信息");
                                         }
-                                        return result
+                                        return result;
 
                                     }
                                 }
@@ -735,24 +593,24 @@
                         events: [
                             {
                                 source: "nodeman_op_type",
-                                type: "init",
+                                type: "change",
                                 action: function (value) {
-                                    let op_type = ["UPGRADE"]
-                                    if (node_type == "PROXY") {
-                                        op_type = ["UPGRADE", "UNINSTALL"]
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (this.get_parent().get_child("nodeman_node_type").value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, value);
                                 }
                             },
                             {
-                                source: "nodeman_op_type",
+                                source: "nodeman_node_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["UPGRADE"]
-                                    if (node_type == "PROXY") {
-                                        op_type = ["UPGRADE", "UNINSTALL"]
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
                                 }
                             },
                         ]
@@ -760,5 +618,5 @@
                 ],
             },
         },
-    ]
+    ];
 })();
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
index 04e0eee81b..5836b6ad1f 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
@@ -13,16 +13,16 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
     ComponentTestCase,
     ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v3_0 import NodemanCreateTaskComponent
 
 
@@ -743,7 +743,6 @@ def __init__(
     inputs={
         "bk_biz_id": "1",
         "nodeman_node_type": "AGENT",
-        "nodeman_ticket": {"nodeman_tjj_ticket": "xxxxx"},
         "nodeman_op_info": {
             "nodeman_op_type": "INSTALL",
             "nodeman_ip_str": "",
@@ -798,7 +797,6 @@ def __init__(
                                 "data_ip": "1.1.1.1",
                             }
                         ],
-                        "tcoa_ticket": "xxxxx",
                     }
                 )
             ],
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
index e5dca2876d..8ff67501a0 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
@@ -13,16 +13,16 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
     ComponentTestCase,
     ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v4_0 import NodemanCreateTaskComponent
 
 
@@ -31,6 +31,7 @@ def cases(self):
         return [
             INSTALL_SUCCESS_CASE,
             REINSTALL_SUCCESS_CASE,
+            RELOAD_SUCCESS_CASE,
             INSTALL_FAIL_CASE,
             OPERATE_SUCCESS_CASE,
             OPERATE_FAIL_CASE,
@@ -241,7 +242,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -332,7 +333,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -349,7 +350,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "4.4.4.4",
                                 "login_ip": "6.6.6.6",
@@ -366,7 +367,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "5.5.5.5",
                                 "login_ip": "7.7.7.7",
@@ -400,6 +401,111 @@ def __init__(
     ],
 )
 
+RELOAD_SUCCESS_CASE = ComponentTestCase(
+    name="nodeman v4.0 reinstall task success case",
+    inputs={
+        "bk_biz_id": "1",
+        "nodeman_op_info": {
+            "nodeman_op_type": "RELOAD",
+            "nodeman_node_type": "AGENT",
+            "nodeman_hosts": [
+                {
+                    "bk_biz_id": "1",
+                    "nodeman_bk_cloud_id": "1",
+                    "nodeman_ap_id": "1",
+                    "inner_ip": "1.1.1.1",
+                    "os_type": "LINUX",
+                    "peer_exchange_switch_for_agent": 0,
+                    "speed_limit": "100",
+                },
+                {
+                    "bk_biz_id": "1",
+                    "nodeman_bk_cloud_id": "1",
+                    "nodeman_ap_id": "1",
+                    "os_type": "LINUX",
+                    "inner_ip": "2.2.2.2,3.3.3.3",
+                    "peer_exchange_switch_for_agent": 0,
+                    "speed_limit": "100",
+                },
+            ],
+        },
+    },
+    parent_data={"executor": "tester"},
+    execute_assertion=ExecuteAssertion(success=True, outputs={"job_id": "1"}),
+    schedule_assertion=ScheduleAssertion(
+        success=True,
+        callback_data=None,
+        schedule_finished=True,
+        outputs={"fail_num": 0, "job_id": "1", "success_num": 1},
+    ),
+    execute_call_assertion=[
+        CallAssertion(
+            func=INSTALL_OR_OPERATE_SUCCESS_CLIENT.job_install,
+            calls=[
+                Call(
+                    **{
+                        "job_type": "RELOAD_AGENT",
+                        "hosts": [
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "1.1.1.1",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 1,
+                            },
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "2.2.2.2",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 2,
+                            },
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "3.3.3.3",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 3,
+                            },
+                        ],
+                    }
+                )
+            ],
+        ),
+    ],
+    schedule_call_assertion=[
+        CallAssertion(
+            func=INSTALL_OR_OPERATE_SUCCESS_CLIENT.job_details,
+            calls=[Call(**{"job_id": "1"})],
+        ),
+    ],
+    patchers=[
+        Patcher(target=GET_CLIENT_BY_USER, return_value=INSTALL_OR_OPERATE_SUCCESS_CLIENT),
+        Patcher(target=BASE_GET_CLIENT_BY_USER, return_value=INSTALL_OR_OPERATE_SUCCESS_CLIENT),
+        Patcher(
+            target=GET_BUSINESS_HOST,
+            return_value=[
+                {"bk_host_innerip": "1.1.1.1", "bk_host_id": 1},
+                {"bk_host_innerip": "2.2.2.2", "bk_host_id": 2},
+                {"bk_host_innerip": "3.3.3.3", "bk_host_id": 3},
+            ],
+        ),
+        Patcher(target=ENCRYPT_AUTH_KEY, return_value="encrypt_auth_key"),
+    ],
+)
+
 INSTALL_FAIL_CASE = ComponentTestCase(
     name="nodeman v4.0 install task failed case",
     inputs={
@@ -447,7 +553,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -635,7 +741,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "3.3.3.3",
                                 "login_ip": "5.5.5.5",
@@ -652,7 +758,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "4.4.4.4",
                                 "login_ip": "6.6.6.6",
@@ -669,7 +775,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "3.3.3.3",
                                 "login_ip": "5.5.5.5",
@@ -686,7 +792,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "data_ip": "7.7.7.7",
                                 "bk_host_id": 1,
@@ -720,7 +826,6 @@ def __init__(
     inputs={
         "bk_biz_id": "1",
         "nodeman_node_type": "AGENT",
-        "nodeman_ticket": {"nodeman_tjj_ticket": "xxxxx"},
         "nodeman_op_info": {
             "nodeman_op_type": "INSTALL",
             "nodeman_node_type": "AGENT",
@@ -734,7 +839,7 @@ def __init__(
                     "os_type": "LINUX",
                     "port": "22",
                     "account": "test",
-                    "auth_type": "PASSWORD",
+                    "auth_type": "TJJ_PASSWORD",
                     "auth_key": "123",
                     "outer_ip": "1.1.1.1",
                     "login_ip": "1.1.1.1",
@@ -767,17 +872,16 @@ def __init__(
                                 "os_type": "LINUX",
                                 "port": "22",
                                 "account": "test",
-                                "auth_type": "PASSWORD",
+                                "auth_type": "TJJ_PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
-                                "password": "encrypt_auth_key",
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "key": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
                                 "data_ip": "1.1.1.1",
                             }
                         ],
-                        "tcoa_ticket": "xxxxx",
                     }
                 )
             ],
@@ -910,7 +1014,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -926,7 +1030,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "2",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "2.2.2.2",
                                 "login_ip": "2.2.2.2",

From f949d4332416027a9db0acf30534e0bb2c553cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Fri, 11 Aug 2023 16:12:06 +0800
Subject: [PATCH 022/112] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9B=86=E7=BE=A4ip?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=20(#6982)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* optimization: 优化集群ip选择器筛选逻辑

* test: 修复单元测试

* minor: 优化代码结构
---
 .../test_var_cmdb_set_module_ip_selector.py   | 67 ++-----------------
 .../cmdb/var_cmdb_set_module_ip_selector.py   | 20 ++++--
 2 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/pipeline_plugins/tests/variables/collections/sites/open/cc/test_var_cmdb_set_module_ip_selector.py b/pipeline_plugins/tests/variables/collections/sites/open/cc/test_var_cmdb_set_module_ip_selector.py
index e60146c63b..306ace3284 100644
--- a/pipeline_plugins/tests/variables/collections/sites/open/cc/test_var_cmdb_set_module_ip_selector.py
+++ b/pipeline_plugins/tests/variables/collections/sites/open/cc/test_var_cmdb_set_module_ip_selector.py
@@ -649,15 +649,7 @@ def test_ip_selector_select_method_no_inner_module_success_case(self, mock_get_c
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[],
-                            bk_set_ids=[31],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        )
-                    ],
+                    "calls": [],
                 },
                 {"func": self.client.new().cc.list_biz_hosts, "calls": []},
             ]
@@ -821,15 +813,7 @@ def test_select_method_get_ip_fail_case(self, mock_get_client_by_user_return=Non
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[],
-                            bk_set_ids=[31],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        )
-                    ],
+                    "calls": [],
                 },
                 {"func": self.client.new().cc.list_biz_hosts, "calls": []},
             ]
@@ -858,15 +842,7 @@ def test_manual_method_success_case(self, mock_get_client_by_user_return=None):
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[],
-                            bk_set_ids=[31],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        )
-                    ],
+                    "calls": [],
                 },
                 {"func": self.client.new().cc.list_biz_hosts, "calls": []},
             ]
@@ -979,15 +955,7 @@ def test_manual_method_fail_case(self, mock_get_client_by_user_return=None):
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[],
-                            bk_set_ids=[31],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        )
-                    ],
+                    "calls": [],
                 },
                 {"func": self.client.new().cc.list_biz_hosts, "calls": []},
             ]
@@ -1012,22 +980,7 @@ def test_custom_method_success_case(self, mock_get_client_by_user_return=None):
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[61],
-                            bk_set_ids=[31, 32],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        ),
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[61],
-                            bk_set_ids=[31, 32],
-                            fields=["bk_module_id"],
-                            page={"limit": 500, "start": 0},
-                        ),
-                    ],
+                    "calls": [],
                 },
                 {
                     "func": self.client.new().cc.list_biz_hosts,
@@ -1070,15 +1023,7 @@ def test_custom_method_fail_case(self, mock_get_client_by_user_return=None):
             [
                 {
                     "func": self.client.new().cc.find_module_with_relation,
-                    "calls": [
-                        call(
-                            bk_biz_id=1,
-                            bk_service_template_ids=[],
-                            bk_set_ids=[31, 32],
-                            fields=["bk_module_id"],
-                            page={"start": 0, "limit": 1},
-                        )
-                    ],
+                    "calls": [],
                 },
                 {"func": self.client.new().cc.list_biz_hosts, "calls": []},
             ]
diff --git a/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py b/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
index 5c90c83810..843bdbaff2 100644
--- a/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
+++ b/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
@@ -14,24 +14,24 @@
 from typing import List
 
 from django.utils.translation import ugettext_lazy as _
+from pipeline.core.data.var import LazyVariable
 
 from gcloud.conf import settings
 from gcloud.constants import BIZ_INTERNAL_SET, Type
 from gcloud.core.models import Project
-from pipeline.core.data.var import LazyVariable
 from pipeline_plugins.base.utils.inject import supplier_account_for_project
 from pipeline_plugins.components.utils.sites.open.utils import cc_get_ips_info_by_str, cc_get_ips_info_by_str_ipv6
+from pipeline_plugins.variables.base import FieldExplain, SelfExplainVariable
 from pipeline_plugins.variables.utils import (
-    get_service_template_list_by_names,
-    get_list_by_selected_names,
     filter_ip,
-    get_set_list,
-    get_service_template_list,
-    list_biz_hosts,
     find_module_with_relation,
     get_biz_internal_module,
+    get_list_by_selected_names,
+    get_service_template_list,
+    get_service_template_list_by_names,
+    get_set_list,
+    list_biz_hosts,
 )
-from pipeline_plugins.variables.base import SelfExplainVariable, FieldExplain
 
 ALL_SELECTED_STR = "all"
 
@@ -87,6 +87,7 @@ def get_value(self):
             )
             logger.info("[SetModuleIpSelector.get_value] module_ids: %s" % module_ids)
 
+            # 如果没有过滤到任何模块id，此时返回空
             # 自定义输入ip
             custom_value = var_ip_selector["var_ip_custom_value"]
             if settings.ENABLE_IPV6:
@@ -283,6 +284,10 @@ def get_module_id_list(
             if biz_internal_module_item["name"] in internal_module_in_filter
         ]
 
+    # 当存在服务模板过滤，并一个也过滤不到时
+    if filter_service_template_names and not service_template_ids:
+        return []
+
     # 调用find_module_with_relation接口根据set id list, service_template_id_list查询模块id
     module_id_list = find_module_with_relation(bk_biz_id, username, set_ids, service_template_ids, ["bk_module_id"])
     # 拼接空闲机、待回收等模块ID
@@ -418,6 +423,7 @@ def get_ip_result_by_input_method(
     module_ids = get_module_id_list(
         bk_biz_id, username, set_list, service_template_list, filter_set, filter_service_template, bk_supplier_account
     )
+
     # 根据模块 id 列表获取 ip 并返回
     if settings.ENABLE_IPV6:
         data = get_ip_list_by_module_id_with_ipv6(username, bk_biz_id, bk_supplier_account, module_ids)

From 7748b3b0971c67442f8bbb99f0a60e816c6025ec Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 11 Aug 2023 15:20:02 +0800
Subject: [PATCH 023/112] =?UTF-8?q?optimization:=20=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateEdit/NodeConfig/InputParams.vue   | 68 +++++++++++++++----
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
index b4a305f586..d0d0b22e3f 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
@@ -12,6 +12,7 @@
     <div class="input-params">
         <render-form
             ref="renderForm"
+            :class="{ 'subflow-form': isSubflow }"
             :scheme="formsScheme"
             :hooked="hooked"
             :constants="isSubflow ? subflowForms : constants"
@@ -373,12 +374,57 @@
     }
 }
 /deep/.render-form {
-    .rf-tag-label {
-        display: none;
+    >.rf-form-item {
+        .rf-group-name {
+            display: none;
+        }
+        .rf-tag-label {
+            width: 130px;
+            padding-right: 24px;
+            white-space: nowrap;
+            .required {
+                position: absolute;
+                top: 2px;
+                right: 15px;
+            }
+        }
+        .hide-render-icon {
+            top: 0;
+        }
+    }
+    .rf-form-group {
+        .rf-group-name {
+            display: none;
+        }
+        .rf-tag-hook {
+            top: 0;
+        }
     }
+}
+/deep/.subflow-form {
     .rf-form-group {
-        >.rf-form-item {
-            margin-top: 0;
+        .rf-group-name {
+            display: block;
+            width: 130px;
+            padding-right: 24px;
+            text-align: right;
+            font-size: 12px;
+        }
+        .rf-has-hook {
+            .rf-tag-label {
+                display: none;
+            }
+        }
+        .rf-tag-hook {
+            top: 0;
+        }
+    }
+    >.rf-form-group {
+        .rf-group-name {
+            float: left;
+        }
+        .form-item-group {
+            margin-left: 130px;
         }
     }
     .form-item-group {
@@ -391,16 +437,13 @@
         .rf-form-item {
             .rf-tag-label {
                 display: block;
-                float: initial;
                 text-align: left;
-                margin: 0 0 6px;
                 color: #63656e;
                 line-height: 20px;
-                .required {
-                    position: relative;
-                    top: 0;
-                    right: 0;
-                }
+                padding-right: 10px;
+            }
+            .rf-tag-form {
+                margin-left: 100px;
             }
             &:last-child {
                 margin-bottom: 0;
@@ -416,8 +459,5 @@
             padding: 0;
         }
     }
-    .rf-tag-form {
-        margin-left: 0;
-    }
 }
 </style>

From 170812cecaeb08564111c84b7d83a6f9d2fd5416 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Fri, 11 Aug 2023 20:14:49 +0800
Subject: [PATCH 024/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Dipv6?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E8=BE=93=E5=85=A5=E6=A1=86ip?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/utils/ip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud/utils/ip.py b/gcloud/utils/ip.py
index fec98cf2b3..26b474dcbb 100644
--- a/gcloud/utils/ip.py
+++ b/gcloud/utils/ip.py
@@ -127,7 +127,7 @@ def get_ip_by_regex_type(regex_type, ip_str):
     if regex_type == IpRegexType.HOST_ID.value:
         ip_list = [int(host_id) for host_id in ip_list]
 
-    return ip_list, new_ip_str
+    return list(set(ip_list)), new_ip_str
 
 
 def extract_ip_from_ip_str(ip_str):

From 51ff5ba0039fd55b2b482cac69d464f4686f48e6 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Mon, 14 Aug 2023 11:38:53 +0800
Subject: [PATCH 025/112] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#6990)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/task/TaskCreate/TaskScheme.vue  |  7 +++-
 .../pages/task/TaskCreate/TaskSelectNode.vue  | 10 ++---
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 41 +++++++++++++------
 .../pages/task/TaskExecute/TaskOperation.vue  |  9 +++-
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
index 750d769045..7c2aef585c 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
@@ -171,14 +171,17 @@
                         template_id: this.template_id,
                         isCommon: this.isCommonProcess
                     }) || []
+                    const { task_id: reuseTaskId } = this.$route.query
                     let selectNodes = []
                     this.schemeList.forEach(scheme => {
                         this.$set(scheme, 'isChecked', false)
                         this.$set(scheme, 'isDefault', false)
                         if (this.defaultSchemeList.includes(scheme.id)) {
                             scheme.isDefault = true
-                            scheme.isChecked = true
-                            selectNodes.push(...JSON.parse(scheme.data))
+                            if (!reuseTaskId) { // 优先复用变量的勾选
+                                scheme.isChecked = true
+                                selectNodes.push(...JSON.parse(scheme.data))
+                            }
                         }
                     })
                     selectNodes = Array.from(new Set(selectNodes)) || []
diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
index 3e9c2db176..56395a6b75 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue
@@ -501,16 +501,16 @@
                 try {
                     let selectedNodes = []
                     const { task_id: reuseTaskId } = this.$route.query
-                    if (this.excludeNode.length) { // 优先使用勾选记录
+                    if (reuseTaskId) { // 优先复用变量的勾选
+                        const instanceData = await this.getTaskInstanceData(reuseTaskId)
+                        const pipelineTree = JSON.parse(instanceData.pipeline_tree)
+                        selectedNodes = Object.values(pipelineTree.activities).map(item => item.template_node_id)
+                    } else if (this.excludeNode.length) { // 其次使用勾选记录
                         Object.keys(this.activities).forEach(key => {
                             if (!this.excludeNode.includes(key)) {
                                 selectedNodes.push(key)
                             }
                         })
-                    } else if (reuseTaskId) { // 其次复用变量的勾选
-                        const instanceData = await this.getTaskInstanceData(reuseTaskId)
-                        const pipelineTree = JSON.parse(instanceData.pipeline_tree)
-                        selectedNodes = Object.values(pipelineTree.activities).map(item => item.template_node_id)
                     } else {
                         selectedNodes = Object.keys(this.activities) // 默认全选
                     }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 64bd17a854..60efa29f34 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -34,6 +34,7 @@
                         v-if="subProcessPipeline">
                         <TemplateCanvas
                             ref="subProcessCanvas"
+                            :key="canvasRandomKey"
                             class="sub-flow"
                             :show-palette="false"
                             :show-tool="false"
@@ -282,6 +283,7 @@
         data () {
             return {
                 randomKey: '',
+                canvasRandomKey: null,
                 loading: true,
                 isRenderOutputForm: false,
                 executeInfo: {},
@@ -325,8 +327,17 @@
             }),
             // 节点实时状态
             realTimeState () {
-                const nodeStateMap = this.nodeDisplayStatus.children || {}
-                return nodeStateMap[this.nodeDetailConfig.node_id] || { state: 'READY' }
+                const { root_node, node_id } = this.nodeDetailConfig
+                let nodes = this.nodeDisplayStatus.children || {}
+                if (this.subProcessPipeline) {
+                    const parentId = root_node?.split('-') || []
+                    parentId.forEach(id => {
+                        if (nodes[id]) {
+                            nodes = nodes[id].children
+                        }
+                    })
+                }
+                return nodes[node_id] || { state: 'READY' }
             },
             displayStatus () {
                 let state = ''
@@ -465,11 +476,7 @@
             this.loadNodeInfo()
             if (this.subProcessPipeline) {
                 this.$nextTick(() => {
-                    const flowDom = this.$el.querySelector('.sub-flow')
-                    const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
-                    let jsFlowInstance = this.$refs.subProcessCanvas
-                    jsFlowInstance = jsFlowInstance.$refs.jsFlow
-                    jsFlowInstance && jsFlowInstance.zoomOut(0.75, width / 2, height / 2)
+                    this.setSubprocessCanvasZoom()
                 })
             }
         },
@@ -896,12 +903,13 @@
                 if (this.subProcessPipeline) {
                     this.onUpdateNodeInfo(this.nodeDetailConfig.node_id, { isActived: false })
                 }
-                if ((node.isSubProcess || node.parentId) && !this.subProcessPipeline) {
-                    this.$nextTick(() => {
-                        let jsFlowInstance = this.$refs.subProcessCanvas
-                        jsFlowInstance = jsFlowInstance.$refs.jsFlow
-                        jsFlowInstance && jsFlowInstance.zoomOut(0.75)
-                    })
+                if (node.isSubProcess || node.parentId) {
+                    if (!this.subProcessPipeline || !this.subProcessPipeline.activities[node.id]) {
+                        this.canvasRandomKey = new Date().getTime()
+                        this.$nextTick(() => {
+                            this.setSubprocessCanvasZoom()
+                        })
+                    }
                 }
                 this.$emit('onClickTreeNode', node)
                 this.$nextTick(() => {
@@ -911,6 +919,13 @@
                     this.updateNodeInfo()
                 })
             },
+            setSubprocessCanvasZoom () {
+                const flowDom = this.$el.querySelector('.sub-flow')
+                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
+                let jsFlowInstance = this.$refs.subProcessCanvas
+                jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                jsFlowInstance && jsFlowInstance.zoomOut(0.75, width / 2, height / 2)
+            },
             updateNodeInfo () {
                 if (!this.subProcessPipeline) return
                 const { root_node, node_id } = this.nodeDetailConfig
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 0db63fa158..5f2f1a095d 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -1456,11 +1456,12 @@
                                 }
                             })
                             conditions = Object.keys(nodeConfig.conditions).map((key, index) => {
-                                const { name: branchName } = nodeConfig.conditions[key]
+                                const { name: branchName, evaluate } = nodeConfig.conditions[key]
                                 return {
                                     id: id + '-' + key,
                                     name: branchName + '-' + key,
                                     title: branchName,
+                                    value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
                                     parentId,
                                     conditionType: 'condition', // 条件、条件并行网关
@@ -1472,12 +1473,13 @@
                             })
                             // 添加条件分支默认节点
                             if (nodeConfig.default_condition) {
-                                const { name: branchName, flow_id } = nodeConfig.default_condition
+                                const { name: branchName, flow_id, evaluate } = nodeConfig.default_condition
                                 // 默认条件置顶
                                 conditions.unshift({
                                     id: id + '-' + flow_id,
                                     name: branchName + '-' + flow_id,
                                     title: branchName,
+                                    value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
                                     parentId,
                                     conditionType: 'default',
@@ -1728,6 +1730,9 @@
                 const targetNodes = this.nodeTargetMaps[id]
                 if (!targetNodes) return false
                 if (targetNodes.length > 1) {
+                    if (targetNodes.includes(backId)) {
+                        return true
+                    }
                     return targetNodes.some(targetId => {
                         return this.judgeNodeBack(targetId, backId)
                     })

From 724e69ff956a8d619a8be35ada9c922fc4006a02 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 14 Aug 2023 19:53:58 +0800
Subject: [PATCH 026/112] =?UTF-8?q?feature:=20=E6=94=AF=E6=8C=81=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/iam_auth/view_interceptors/taskflow.py |  39 +++++-
 gcloud/taskflow3/apis/django/api.py           | 117 +++++++++---------
 gcloud/taskflow3/apis/django/validators.py    |  12 +-
 gcloud/taskflow3/urls.py                      |   5 +-
 4 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/gcloud/iam_auth/view_interceptors/taskflow.py b/gcloud/iam_auth/view_interceptors/taskflow.py
index a34461fa03..eacbfbf99f 100644
--- a/gcloud/iam_auth/view_interceptors/taskflow.py
+++ b/gcloud/iam_auth/view_interceptors/taskflow.py
@@ -12,15 +12,13 @@
 """
 
 import abc
-import ujson as json
 
-from iam import Action, Subject, Request
-from iam.exceptions import AuthFailedException
+import ujson as json
+from iam.exceptions import AuthFailedException, MultiAuthFailedException
 
-from gcloud.iam_auth import IAMMeta
-from gcloud.iam_auth import get_iam_client
+from gcloud.iam_auth import IAMMeta, get_iam_client, res_factory
 from gcloud.iam_auth.intercept import ViewInterceptor
-from gcloud.iam_auth import res_factory
+from iam import Action, Request, Subject
 
 iam = get_iam_client()
 
@@ -95,3 +93,32 @@ class GetNodeLogInterceptor(TaskSingleActionGetInterceptor):
 
 class StatusViewInterceptor(TaskSingleActionGetInterceptor):
     action = IAMMeta.TASK_VIEW_ACTION
+
+
+class BatchStatusViewInterceptor(ViewInterceptor):
+    def process(self, request, *args, **kwargs):
+        task_ids = json.loads(request.body).get("task_ids") or []
+        subject = Subject("user", request.user.username)
+        action = Action(IAMMeta.TASK_VIEW_ACTION)
+        resources_list = res_factory.resources_list_for_tasks(task_ids)
+
+        if not resources_list:
+            return
+
+        resources_map = {}
+        for resources in resources_list:
+            resources_map[resources[0].id] = resources
+
+        request = Request(IAMMeta.SYSTEM_ID, subject, action, [], {})
+        result = iam.batch_is_allowed(request, resources_list)
+
+        if not result:
+            raise MultiAuthFailedException(IAMMeta.SYSTEM_ID, subject, action, resources_list)
+
+        not_allowed_list = []
+        for tid, allow in result.items():
+            if not allow:
+                not_allowed_list.append(resources_map[tid])
+
+        if not_allowed_list:
+            raise MultiAuthFailedException(IAMMeta.SYSTEM_ID, subject, action, not_allowed_list)
diff --git a/gcloud/taskflow3/apis/django/api.py b/gcloud/taskflow3/apis/django/api.py
index b6f0952450..cf9bce62e1 100644
--- a/gcloud/taskflow3/apis/django/api.py
+++ b/gcloud/taskflow3/apis/django/api.py
@@ -15,62 +15,61 @@
 import traceback
 
 import ujson as json
+from blueapps.account.decorators import login_exempt
 from cryptography.fernet import Fernet
 from django.db import transaction
 from django.http import JsonResponse
+from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_GET, require_POST
-from django.utils.translation import ugettext_lazy as _
 from drf_yasg.utils import swagger_auto_schema
-from rest_framework.decorators import api_view
-
-import env
-from blueapps.account.decorators import login_exempt
-from gcloud.utils.throttle import check_task_operation_throttle, get_task_operation_frequence
-
 from iam.contrib.http import HTTP_AUTH_FORBIDDEN_CODE
 from iam.exceptions import RawAuthFailedException
+from rest_framework.decorators import api_view
 
+import env
 from gcloud import err_code
-from gcloud.core.models import EngineConfig
-from gcloud.utils.decorators import request_validate
 from gcloud.conf import settings
-from gcloud.constants import TASK_CREATE_METHOD, PROJECT, JobBizScopeType
-from gcloud.taskflow3.models import TaskFlowInstance, TimeoutNodeConfig
-from gcloud.taskflow3.domains.context import TaskContext
+from gcloud.constants import PROJECT, TASK_CREATE_METHOD, JobBizScopeType
 from gcloud.contrib.analysis.analyse_items import task_flow_instance
+from gcloud.contrib.operate_record.constants import OperateType, RecordType
 from gcloud.contrib.operate_record.decorators import record_operation
-from gcloud.contrib.operate_record.constants import RecordType, OperateType
-from gcloud.taskflow3.apis.django.validators import (
-    StatusValidator,
-    DataValidator,
-    DetailValidator,
-    GetJobInstanceLogValidator,
-    TaskActionValidator,
-    NodesActionValidator,
-    SpecNodesTimerResetValidator,
-    TaskCloneValidator,
-    TaskFuncClaimValidator,
-    PreviewTaskTreeValidator,
-    QueryTaskCountValidator,
-    GetNodeLogValidator,
-)
-from gcloud.taskflow3.domains.dispatchers import NodeCommandDispatcher, TaskCommandDispatcher
-from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
+from gcloud.core.models import EngineConfig
 from gcloud.iam_auth.intercept import iam_intercept
 from gcloud.iam_auth.view_interceptors.taskflow import (
+    BatchStatusViewInterceptor,
     DataViewInterceptor,
     DetailViewInterceptor,
-    TaskActionInterceptor,
+    GetNodeLogInterceptor,
     NodesActionInterceptor,
     SpecNodesTimerResetInpterceptor,
+    StatusViewInterceptor,
+    TaskActionInterceptor,
     TaskCloneInpterceptor,
     TaskFuncClaimInterceptor,
-    GetNodeLogInterceptor,
-    StatusViewInterceptor,
 )
 from gcloud.openapi.schema import AnnotationAutoSchema
-
+from gcloud.taskflow3.apis.django.validators import (
+    BatchStatusValidator,
+    DataValidator,
+    DetailValidator,
+    GetJobInstanceLogValidator,
+    GetNodeLogValidator,
+    NodesActionValidator,
+    PreviewTaskTreeValidator,
+    QueryTaskCountValidator,
+    SpecNodesTimerResetValidator,
+    StatusValidator,
+    TaskActionValidator,
+    TaskCloneValidator,
+    TaskFuncClaimValidator,
+)
+from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
+from gcloud.taskflow3.domains.context import TaskContext
+from gcloud.taskflow3.domains.dispatchers import NodeCommandDispatcher, TaskCommandDispatcher
+from gcloud.taskflow3.models import TaskFlowInstance, TimeoutNodeConfig
+from gcloud.utils.decorators import request_validate
+from gcloud.utils.throttle import check_task_operation_throttle, get_task_operation_frequence
 from pipeline_web.preview import preview_template_tree
 
 logger = logging.getLogger("root")
@@ -102,12 +101,7 @@ def status(request, project_id):
         message = _(f"任务查询失败: 任务[ID: {instance_id}]不存在, 请检查 | status")
         logger.error(message)
         return JsonResponse(
-            {
-                "result": False,
-                "message": message,
-                "data": None,
-                "code": err_code.CONTENT_NOT_EXIST.code,
-            }
+            {"result": False, "message": message, "data": None, "code": err_code.CONTENT_NOT_EXIST.code}
         )
 
     dispatcher = TaskCommandDispatcher(
@@ -117,6 +111,27 @@ def status(request, project_id):
     return JsonResponse(result)
 
 
+@require_POST
+@request_validate(BatchStatusValidator)
+@iam_intercept(BatchStatusViewInterceptor())
+def batch_status(request, project_id):
+    """用于批量获取独立子流程状态"""
+    body = json.loads(request.body)
+    task_ids = body.get("task_ids") or []
+    tasks = TaskFlowInstance.objects.filter(id__in=task_ids, project_id=project_id)
+    total_result = {"result": True, "data": {}, "code": err_code.SUCCESS.code, "message": ""}
+    for task in set(tasks):
+        dispatcher = TaskCommandDispatcher(
+            engine_ver=task.engine_ver,
+            taskflow_id=task.id,
+            pipeline_instance=task.pipeline_instance,
+            project_id=project_id,
+        )
+        total_result["data"][task.id] = dispatcher.get_task_status()
+
+    return JsonResponse(total_result)
+
+
 @require_GET
 @request_validate(DataValidator)
 @iam_intercept(DataViewInterceptor())
@@ -241,13 +256,7 @@ def task_action(request, action, project_id):
             allowed_times, scope_seconds = frequence_data
             message = _(f"任务操作失败: 项目[ID: {project_id}]启动任务的极限: {allowed_times}/{scope_seconds}(单位:秒)")
         logger.error(message)
-        return JsonResponse(
-            {
-                "result": False,
-                "message": message,
-                "code": err_code.INVALID_OPERATION.code,
-            }
-        )
+        return JsonResponse({"result": False, "message": message, "code": err_code.INVALID_OPERATION.code})
 
     ctx = task.task_action(action, username)
     return JsonResponse(ctx)
@@ -437,17 +446,9 @@ def get_node_log(request, project_id, node_id):
 
     task = TaskFlowInstance.objects.get(pk=task_id, project_id=project_id)
     if not task.has_node(node_id):
-        message = _(
-            f"节点状态请求失败: 任务[ID: {task.id}]中未找到节点[ID: {node_id}]. 请重试. 如持续失败可联系管理员处理 | get_node_log"
-        )
+        message = _(f"节点状态请求失败: 任务[ID: {task.id}]中未找到节点[ID: {node_id}]. 请重试. 如持续失败可联系管理员处理 | get_node_log")
         logger.error(message)
-        return JsonResponse(
-            {
-                "result": False,
-                "data": None,
-                "message": message,
-            }
-        )
+        return JsonResponse({"result": False, "data": None, "message": message})
 
     dispatcher = NodeCommandDispatcher(engine_ver=task.engine_ver, node_id=node_id, taskflow_id=task_id)
     return JsonResponse(dispatcher.get_node_log(history_id))
@@ -480,9 +481,7 @@ def node_callback(request, token):
     try:
         callback_data = json.loads(request.body)
     except Exception:
-        message = _(
-            f"节点回调失败: 无效的请求, 请重试. 如持续失败可联系管理员处理. {traceback.format_exc()} | api node_callback"
-        )
+        message = _(f"节点回调失败: 无效的请求, 请重试. 如持续失败可联系管理员处理. {traceback.format_exc()} | api node_callback")
         logger.error(message)
         return JsonResponse({"result": False, "message": message}, status=400)
 
diff --git a/gcloud/taskflow3/apis/django/validators.py b/gcloud/taskflow3/apis/django/validators.py
index 8df60e00bf..8a142cab72 100644
--- a/gcloud/taskflow3/apis/django/validators.py
+++ b/gcloud/taskflow3/apis/django/validators.py
@@ -13,7 +13,7 @@
 
 import ujson as json
 
-from gcloud.utils.validate import RequestValidator, ObjectJsonBodyValidator
+from gcloud.utils.validate import ObjectJsonBodyValidator, RequestValidator
 
 
 class StatusValidator(RequestValidator):
@@ -27,6 +27,16 @@ def validate(self, request, *args, **kwargs):
         return True, ""
 
 
+class BatchStatusValidator(RequestValidator):
+    def validate(self, request, *args, **kwargs):
+        try:
+            json.loads(request.body)
+        except Exception as e:
+            return False, f"request body is not a valid json string: {e}"
+
+        return True, ""
+
+
 class DataValidator(RequestValidator):
     def validate(self, request, *args, **kwargs):
         task_id = request.GET.get("instance_id")
diff --git a/gcloud/taskflow3/urls.py b/gcloud/taskflow3/urls.py
index 4366dde96f..d081582c94 100644
--- a/gcloud/taskflow3/urls.py
+++ b/gcloud/taskflow3/urls.py
@@ -11,19 +11,20 @@
 specific language governing permissions and limitations under the License.
 """
 
+from django.conf.urls import include, url
 from django.urls import path
-from django.conf.urls import url, include
 
 from gcloud.taskflow3.apis.django import api
 from gcloud.taskflow3.apis.django.v4.urls import v4_urlpatterns
-from gcloud.taskflow3.apis.drf.viewsets.render_current_constants import RenderCurrentConstantsView
 from gcloud.taskflow3.apis.drf.viewsets.engine_v2_node_log import EngineV2NodeLogView
 from gcloud.taskflow3.apis.drf.viewsets.preview_task_tree import PreviewTaskTreeWithSchemesView
+from gcloud.taskflow3.apis.drf.viewsets.render_current_constants import RenderCurrentConstantsView
 from gcloud.taskflow3.apis.drf.viewsets.update_task_constants import UpdateTaskConstantsView
 
 urlpatterns = [
     url(r"^api/context/$", api.context),
     url(r"^api/status/(?P<project_id>\d+)/$", api.status),
+    url(r"^api/batch_status/(?P<project_id>\d+)/$", api.batch_status),
     url(r"^api/clone/(?P<project_id>\d+)/$", api.task_clone),
     url(r"^api/action/(?P<action>\w+)/(?P<project_id>\d+)/$", api.task_action),
     url(r"^api/flow/claim/(?P<project_id>\d+)/$", api.task_func_claim),

From 45d7ac16007134cb082c01df31f7658bf00b1dc7 Mon Sep 17 00:00:00 2001
From: normal-wls <1158341873@qq.com>
Date: Tue, 15 Aug 2023 17:02:55 +0800
Subject: [PATCH 027/112] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8F=92=E4=BB=B6=E4=BB=A3=E7=A0=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=A1=86=E6=B7=BB=E5=8A=A0=20variable=5Frender=20?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=20(#6995)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* optimization: 作业平台相关插件代码编辑框添加  variable_render 选项

* minor: 快速执行脚本 v1.2 插件添加 variable_render 配置
---
 .../components/atoms/job/all_biz_fast_execute_script/v1_0.js     | 1 +
 .../components/atoms/job/all_biz_fast_execute_script/v1_1.js     | 1 +
 .../static/components/atoms/job/fast_execute_script/v1_0.js      | 1 +
 .../static/components/atoms/job/fast_execute_script/v1_1.js      | 1 +
 .../static/components/atoms/job/fast_execute_script/v1_2.js      | 1 +
 .../static/components/atoms/job/job_fast_execute_script.js       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_0.js
index 29a32748b7..29a999627b 100644
--- a/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_0.js
+++ b/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_0.js
@@ -258,6 +258,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 default: getScriptContent("1"),
                 language: "shell",
diff --git a/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_1.js
index 49697d3e12..4024bf011f 100644
--- a/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_1.js
+++ b/pipeline_plugins/components/static/components/atoms/job/all_biz_fast_execute_script/v1_1.js
@@ -385,6 +385,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 language: "shell",
                 showLanguageSwitch: false,
diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_0.js
index 7d62f8a67d..08df521b7a 100644
--- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_0.js
+++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_0.js
@@ -337,6 +337,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 default: getScriptContent("1"),
                 language: "shell",
diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
index c2d600ce98..ccae0ef1b8 100644
--- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
+++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
@@ -337,6 +337,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 language: "shell",
                 default: getScriptContent("1"),
diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
index 48cd48da0f..292e7f1704 100644
--- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
+++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
@@ -453,6 +453,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 language: "shell",
                 default: getScriptContent("1"),
diff --git a/pipeline_plugins/components/static/components/atoms/job/job_fast_execute_script.js b/pipeline_plugins/components/static/components/atoms/job/job_fast_execute_script.js
index d50d848db7..4ed34c0891 100644
--- a/pipeline_plugins/components/static/components/atoms/job/job_fast_execute_script.js
+++ b/pipeline_plugins/components/static/components/atoms/job/job_fast_execute_script.js
@@ -337,6 +337,7 @@ job_start
             attrs: {
                 name: gettext("脚本内容"),
                 hookable: true,
+                variable_render: false,
                 placeholder: gettext("填写执行脚本内容"),
                 language: "shell",
                 default: getScriptContent("1"),

From 72f2a19becfe2400e2b053c3e7100e25dc2b800b Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Tue, 15 Aug 2023 12:33:56 +0800
Subject: [PATCH 028/112] =?UTF-8?q?optimization:=20ip=20=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E5=8A=A8=E6=80=81=E5=88=86=E7=BB=84=E5=85=88=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=A4=B1=E6=95=88=E5=88=86=E7=BB=84=E5=86=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/utils/cmdb.py                     | 10 ++++++++++
 pipeline_plugins/cmdb_ip_picker/utils.py |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/gcloud/utils/cmdb.py b/gcloud/utils/cmdb.py
index 2b535ddcab..bddaada544 100644
--- a/gcloud/utils/cmdb.py
+++ b/gcloud/utils/cmdb.py
@@ -332,6 +332,16 @@ def get_notify_receivers(client, biz_cc_id, supplier_account, receiver_group, mo
     return result
 
 
+def get_dynamic_group_list(username, bk_biz_id, bk_supplier_account):
+    """获取业务下的所有动态分组列表"""
+    client = get_client_by_user(username)
+    kwargs = {"bk_biz_id": bk_biz_id, "bk_supplier_account": bk_supplier_account}
+    result = batch_request(client.cc.search_dynamic_group, kwargs, limit=200, check_iam_auth_fail=True)
+
+    dynamic_groups = [{"id": dynamic_group["id"]} for dynamic_group in result if dynamic_group["bk_obj_id"] == "host"]
+    return dynamic_groups
+
+
 def get_dynamic_group_host_list(username, bk_biz_id, bk_supplier_account, dynamic_group_id):
     """获取动态分组中对应主机列表"""
     client = get_client_by_user(username)
diff --git a/pipeline_plugins/cmdb_ip_picker/utils.py b/pipeline_plugins/cmdb_ip_picker/utils.py
index bdac41364e..2fc69c6576 100644
--- a/pipeline_plugins/cmdb_ip_picker/utils.py
+++ b/pipeline_plugins/cmdb_ip_picker/utils.py
@@ -20,6 +20,7 @@
 from gcloud.conf import settings
 from gcloud.exceptions import ApiRequestError
 from gcloud.utils import cmdb
+from gcloud.utils.cmdb import get_dynamic_group_list
 from gcloud.utils.handlers import handle_api_error
 from gcloud.utils.ip import extract_ip_from_ip_str, format_sundry_ip
 
@@ -283,6 +284,13 @@ def group_picker_handler(self, inputted_group):
         :params inputted_group: 动态分组信息列表, list
         """
         dynamic_group_ids = [dynamic_group["id"] for dynamic_group in inputted_group]
+        try:
+            existing_dynamic_groups = get_dynamic_group_list(self.username, self.bk_biz_id, self.bk_supplier_account)
+            existing_dynamic_group_ids = set([dynamic_group["id"] for dynamic_group in existing_dynamic_groups])
+            dynamic_group_ids = set(dynamic_group_ids) & existing_dynamic_group_ids
+        except Exception as e:
+            # 如果获取动态分组失败，则不做过滤
+            logger.info(f"[group_picker_handler]: get_dynamic_group_list error {e}")
         dynamic_groups_host = {}
         for dynamic_group_id in dynamic_group_ids:
             success, result = cmdb.get_dynamic_group_host_list(

From 488e9ee6c686f1f740d2af663eb46bb32a57880e Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 17 Aug 2023 15:54:03 +0800
Subject: [PATCH 029/112] =?UTF-8?q?fixbug:=20horse=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/assets/js/flow.js        |   2 +-
 .../common/RenderForm/FormGroup.vue           |  76 +++-
 .../components/common/RenderForm/FormItem.vue |  63 ++--
 .../TemplateCanvas/NodeTemplate/EndPoint.vue  |   7 +-
 .../NodeTemplate/StartPoint.vue               |   7 +-
 .../TemplateCanvas/NodeTemplate/Subflow.vue   |   4 -
 frontend/desktop/src/config/i18n/cn.js        |   4 +-
 frontend/desktop/src/config/i18n/en.js        |   6 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 351 ++++++++++++++++--
 .../ExecuteInfo/ExecuteInfoForm.vue           |  86 ++++-
 .../src/pages/task/TaskExecute/NodeTree.vue   |  50 +--
 .../pages/task/TaskExecute/NodeTreeItem.vue   |  45 ++-
 .../pages/task/TaskExecute/TaskOperation.vue  | 133 ++++---
 .../TemplateEdit/NodeConfig/BasicInfo.vue     | 175 +++++----
 .../TemplateEdit/NodeConfig/InputParams.vue   |  44 ++-
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |   6 +-
 frontend/desktop/src/store/modules/task.js    |  10 +
 17 files changed, 784 insertions(+), 285 deletions(-)

diff --git a/frontend/desktop/src/assets/js/flow.js b/frontend/desktop/src/assets/js/flow.js
index 5d0f96c109..e74216eda0 100644
--- a/frontend/desktop/src/assets/js/flow.js
+++ b/frontend/desktop/src/assets/js/flow.js
@@ -1 +1 @@
-function t(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)}return n}function e(e){for(var i=1;i<arguments.length;i++){var o=null!=arguments[i]?arguments[i]:{};i%2?t(Object(o),!0).forEach(function(t){n(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):t(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}function n(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var i,o,s=[],r=!0,a=!1;try{for(n=n.call(t);!(r=(i=n.next()).done)&&(s.push(i.value),!e||s.length!==e);r=!0);}catch(t){a=!0,o=t}finally{try{r||null==n.return||n.return()}finally{if(a)throw o}}return s}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,i=new Array(e);n<e;n++)i[n]=t[n];return i}var s="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var r,a=(function(t,e){(function(){void 0===Math.sgn&&(Math.sgn=function(t){return 0==t?0:t>0?1:-1});var t=function(t,e){return{x:t.x-e.x,y:t.y-e.y}},n=function(t,e){return t.x*e.x+t.y*e.y},i=function(t){return Math.sqrt(t.x*t.x+t.y*t.y)},o=function(t,e){return{x:t.x*e,y:t.y*e}},s=Math.pow(2,-65),r=function(e,n){for(var o=[],s=a(e,n),r=n.length-1,u=l(s,2*r-1,o,0),c=t(e,n[0]),h=i(c),p=0,f=0;f<u;f++){c=t(e,d(n,r,o[f],null,null));var g=i(c);g<h&&(h=g,p=o[f])}return c=t(e,n[r]),(g=i(c))<h&&(h=g,p=1),{location:p,distance:h}},a=function(e,i){for(var s=i.length-1,r=2*s-1,a=[],l=[],u=[],c=[],h=[[1,.6,.3,.1],[.4,.6,.6,.4],[.1,.3,.6,1]],d=0;d<=s;d++)a[d]=t(i[d],e);for(d=0;d<=s-1;d++)l[d]=t(i[d+1],i[d]),l[d]=o(l[d],3);for(var p=0;p<=s-1;p++)for(var f=0;f<=s;f++)u[p]||(u[p]=[]),u[p][f]=n(l[p],a[f]);for(d=0;d<=r;d++)c[d]||(c[d]=[]),c[d].y=0,c[d].x=parseFloat(d)/r;for(var g=s,m=s-1,v=0;v<=g+m;v++){var y=Math.max(0,v-m),b=Math.min(v,g);for(d=y;d<=b;d++){var P=v-d;c[d+P].y+=u[P][d]*h[P][d]}}return c},l=function(t,e,n,i){var o,s,r=[],a=[],p=[],f=[];switch(u(t,e)){case 0:return 0;case 1:if(i>=64)return n[0]=(t[0].x+t[e].x)/2,1;if(c(t,e))return n[0]=h(t,e),1}d(t,e,.5,r,a),o=l(r,e,p,i+1),s=l(a,e,f,i+1);for(var g=0;g<o;g++)n[g]=p[g];for(g=0;g<s;g++)n[g+o]=f[g];return o+s},u=function(t,e){var n,i,o=0;n=i=Math.sgn(t[0].y);for(var s=1;s<=e;s++)(n=Math.sgn(t[s].y))!=i&&o++,i=n;return o},c=function(t,e){var n,i,o,r,a,l,u,c,h;r=t[0].y-t[e].y,a=t[e].x-t[0].x,l=t[0].x*t[e].y-t[e].x*t[0].y,c=h=0;for(var d=1;d<e;d++){var p=r*t[d].x+a*t[d].y+l;p>c?c=p:p<h&&(h=p)}return 0,1,0,n=(1*(l-c)-0*(u=a))*(1/(0*u-1*r)),i=(1*(l-h)-0*(u=a))*(1/(0*u-1*r)),o=Math.min(n,i),Math.max(n,i)-o<s?1:0},h=function(t,e){var n=t[e].x-t[0].x,i=t[e].y-t[0].y,o=t[0].x-0;return 0+1*((n*(t[0].y-0)-i*o)*(1/(0*n-1*i)))},d=function(t,e,n,i,o){for(var s=[[]],r=0;r<=e;r++)s[0][r]=t[r];for(var a=1;a<=e;a++)for(r=0;r<=e-a;r++)s[a]||(s[a]=[]),s[a][r]||(s[a][r]={}),s[a][r].x=(1-n)*s[a-1][r].x+n*s[a-1][r+1].x,s[a][r].y=(1-n)*s[a-1][r].y+n*s[a-1][r+1].y;if(null!=i)for(r=0;r<=e;r++)i[r]=s[r][0];if(null!=o)for(r=0;r<=e;r++)o[r]=s[e-r][r];return s[e][0]},p={},f=function(t,e){for(var n=function(t){var e=p[t];if(!e){var n=function(t){return function(e){return t}},i=function(){return function(t){return t}},o=function(){return function(t){return 1-t}},s=function(t){return function(e){for(var n=1,i=0;i<t.length;i++)n*=t[i](e);return n}};(e=[]).push(new function(){return function(e){return Math.pow(e,t)}});for(var r=1;r<t;r++){for(var a=[new n(t)],l=0;l<t-r;l++)a.push(new i);for(l=0;l<r;l++)a.push(new o);e.push(new s(a))}e.push(new function(){return function(e){return Math.pow(1-e,t)}}),p[t]=e}return e}(t.length-1),i=0,o=0,s=0;s<t.length;s++)i+=t[s].x*n[s](e),o+=t[s].y*n[s](e);return{x:i,y:o}},g=function(t,e){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))},m=function(t){return t[0].x===t[1].x&&t[0].y===t[1].y},v=function(t,e,n){if(m(t))return{point:t[0],location:e};for(var i=f(t,e),o=0,s=e,r=n>0?1:-1,a=null;o<Math.abs(n);)a=f(t,s+=.005*r),o+=g(a,i),i=a;return{point:a,location:s}},y=function(t,e){var n=f(t,e),i=f(t.slice(0,t.length-1),e),o=i.y-n.y,s=i.x-n.x;return 0===o?1/0:Math.atan(o/s)},b=function(t,e,n,i,o){var s=i-e,r=t-n,a=t*(e-i)+e*(n-t),l=function(t){return[P(t,"x"),P(t,"y")]}(o),u=[s*l[0][0]+r*l[1][0],s*l[0][1]+r*l[1][1],s*l[0][2]+r*l[1][2],s*l[0][3]+r*l[1][3]+a],c=function(t,e,n,i){var o,s,r=e/t,a=n/t,l=i/t,u=(3*a-Math.pow(r,2))/9,c=(9*r*a-27*l-2*Math.pow(r,3))/54,h=Math.pow(u,3)+Math.pow(c,2),d=[];if(h>=0)o=x(c+Math.sqrt(h))*Math.pow(Math.abs(c+Math.sqrt(h)),1/3),s=x(c-Math.sqrt(h))*Math.pow(Math.abs(c-Math.sqrt(h)),1/3),d[0]=-r/3+(o+s),d[1]=-r/3-(o+s)/2,d[2]=-r/3-(o+s)/2,0!==Math.abs(Math.sqrt(3)*(o-s)/2)&&(d[1]=-1,d[2]=-1);else{var p=Math.acos(c/Math.sqrt(-Math.pow(u,3)));d[0]=2*Math.sqrt(-u)*Math.cos(p/3)-r/3,d[1]=2*Math.sqrt(-u)*Math.cos((p+2*Math.PI)/3)-r/3,d[2]=2*Math.sqrt(-u)*Math.cos((p+4*Math.PI)/3)-r/3}for(var f=0;f<3;f++)(d[f]<0||d[f]>1)&&(d[f]=-1);return d}.apply(null,u),h=[];if(null!=c)for(var d=0;d<3;d++){var p,f=c[d],g=Math.pow(f,2),m=Math.pow(f,3),v=[l[0][0]*m+l[0][1]*g+l[0][2]*f+l[0][3],l[1][0]*m+l[1][1]*g+l[1][2]*f+l[1][3]];p=n-t!=0?(v[0]-t)/(n-t):(v[1]-e)/(i-e),f>=0&&f<=1&&p>=0&&p<=1&&h.push(v)}return h};function P(t,e){return[-t[0][e]+3*t[1][e]+-3*t[2][e]+t[3][e],3*t[0][e]-6*t[1][e]+3*t[2][e],-3*t[0][e]+3*t[1][e],t[0][e]]}function x(t){return t<0?-1:t>0?1:0}var C=this.jsBezier={distanceFromCurve:r,gradientAtPoint:y,gradientAtPointAlongCurveFrom:function(t,e,n){var i=v(t,e,n);return i.location>1&&(i.location=1),i.location<0&&(i.location=0),y(t,i.location)},nearestPointOnCurve:function(t,e){var n=r(t,e);return{point:d(e,e.length-1,n.location,null,null),location:n.location}},pointOnCurve:f,pointAlongCurveFrom:function(t,e,n){return v(t,e,n).point},perpendicularToCurveAt:function(t,e,n,i){var o=v(t,e,i=null==i?0:i),s=y(t,o.location),r=Math.atan(-1/s),a=n/2*Math.sin(r),l=n/2*Math.cos(r);return[{x:o.point.x+l,y:o.point.y+a},{x:o.point.x-l,y:o.point.y-a}]},locationAlongCurveFrom:function(t,e,n){return v(t,e,n).location},getLength:function(t){var e=(new Date).getTime();if(m(t))return 0;for(var n=f(t,0),i=0,o=0,s=null;o<1;)s=f(t,o+=.005),i+=g(s,n),n=s;return console.log("length",(new Date).getTime()-e),i},lineIntersection:b,boxIntersection:function(t,e,n,i,o){var s=[];return s.push.apply(s,b(t,e,t+n,e,o)),s.push.apply(s,b(t+n,e,t+n,e+i,o)),s.push.apply(s,b(t+n,e+i,t,e+i,o)),s.push.apply(s,b(t,e+i,t,e,o)),s},boundingBoxIntersection:function(t,e){var n=[];return n.push.apply(n,b(t.x,t.y,t.x+t.w,t.y,e)),n.push.apply(n,b(t.x+t.w,t.y,t.x+t.w,t.y+t.h,e)),n.push.apply(n,b(t.x+t.w,t.y+t.h,t.x,t.y+t.h,e)),n.push.apply(n,b(t.x,t.y+t.h,t.x,t.y,e)),n},version:"0.9.0"};e.jsBezier=C}).call("undefined"!=typeof window?window:s),function(){var t=this.Biltong={version:"0.4.0"};e.Biltong=t;var n=function(t){return"[object Array]"===Object.prototype.toString.call(t)},i=function(t,e,i){return i(t=n(t)?t:[t.x,t.y],e=n(e)?e:[e.x,e.y])},o=t.gradient=function(t,e){return i(t,e,function(t,e){return e[0]==t[0]?e[1]>t[1]?1/0:-1/0:e[1]==t[1]?e[0]>t[0]?0:-0:(e[1]-t[1])/(e[0]-t[0])})},s=(t.normal=function(t,e){return-1/o(t,e)},t.lineLength=function(t,e){return i(t,e,function(t,e){return Math.sqrt(Math.pow(e[1]-t[1],2)+Math.pow(e[0]-t[0],2))})},t.quadrant=function(t,e){return i(t,e,function(t,e){return e[0]>t[0]?e[1]>t[1]?2:1:e[0]==t[0]?e[1]>t[1]?2:1:e[1]>t[1]?3:4})}),r=(t.theta=function(t,e){return i(t,e,function(t,e){var n=o(t,e),i=Math.atan(n),r=s(t,e);return 4!=r&&3!=r||(i+=Math.PI),i<0&&(i+=2*Math.PI),i})},t.intersects=function(t,e){var n=t.x,i=t.x+t.w,o=t.y,s=t.y+t.h,r=e.x,a=e.x+e.w,l=e.y,u=e.y+e.h;return n<=r&&r<=i&&o<=l&&l<=s||n<=a&&a<=i&&o<=l&&l<=s||n<=r&&r<=i&&o<=u&&u<=s||n<=a&&r<=i&&o<=u&&u<=s||r<=n&&n<=a&&l<=o&&o<=u||r<=i&&i<=a&&l<=o&&o<=u||r<=n&&n<=a&&l<=s&&s<=u||r<=i&&n<=a&&l<=s&&s<=u},t.encloses=function(t,e,n){var i=t.x,o=t.x+t.w,s=t.y,r=t.y+t.h,a=e.x,l=e.x+e.w,u=e.y,c=e.y+e.h,h=function(t,e,i,o){return n?t<=e&&i>=o:t<e&&i>o};return h(i,a,o,l)&&h(s,u,r,c)},[null,[1,-1],[1,1],[-1,1],[-1,-1]]),a=[null,[-1,-1],[-1,1],[1,1],[1,-1]];t.pointOnLine=function(t,e,n){var i=o(t,e),l=s(t,e),u=n>0?r[l]:a[l],c=Math.atan(i),h=Math.abs(n*Math.sin(c))*u[1],d=Math.abs(n*Math.cos(c))*u[0];return{x:t.x+d,y:t.y+h}},t.perpendicularLineTo=function(t,e,n){var i=o(t,e),s=Math.atan(-1/i),r=n/2*Math.sin(s),a=n/2*Math.cos(s);return[{x:e.x+a,y:e.y+r},{x:e.x-a,y:e.y-r}]}}.call("undefined"!=typeof window?window:s),function(){function t(t,e,n,i,o,s,r,a){return function(){var t=[];return Array.prototype.push.apply(t,arguments),t.item=function(t){return this[t]},t}(function(t,e,n,i,o,s,r,a){return new Touch({target:e,identifier:A(),pageX:n,pageY:i,screenX:o,screenY:s,clientX:r||o,clientY:a||s})}.apply(null,arguments))}var n=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},i=function(t){return"string"==typeof t||t.constructor===String?document.getElementById(t):t},o=function(t){return t.srcElement||t.target},s=function(t,e,n,i){if(i){if(void 0!==t.path&&t.path.indexOf)return{path:t.path,end:t.path.indexOf(n)};var o={path:[],end:-1},s=function(t){o.path.push(t),t===n?o.end=o.path.length-1:null!=t.parentNode&&s(t.parentNode)};return s(e),o}return{path:[e],end:1}},r=function(t,e){for(var n=0,i=t.length;n<i&&t[n]!=e;n++);n<t.length&&t.splice(n,1)},a=1,l=function(t,e,n){var i=a++;return t.__ta=t.__ta||{},t.__ta[e]=t.__ta[e]||{},t.__ta[e][i]=n,n.__tauid=i,i},u=function(t,e,i,r){if(null==t)return i;var a=t.split(","),l=function(r){l.__tauid=i.__tauid;var u=o(r),c=u,h=s(r,u,e,null!=t);if(-1!=h.end)for(var d=0;d<h.end;d++){c=h.path[d];for(var p=0;p<a.length;p++)n(c,a[p],e)&&i.apply(c,arguments)}};return c(i,r,l),l},c=function(t,e,n){t.__taExtra=t.__taExtra||[],t.__taExtra.push([e,n])},h=function(t,e,n,i){if(m&&y[e]){var o=u(i,t,n,y[e]);S(t,y[e],o,n)}"focus"===e&&null==t.getAttribute("tabindex")&&t.setAttribute("tabindex","1"),S(t,e,u(i,t,n,e),n)},d={tap:{touches:1,taps:1},dbltap:{touches:1,taps:2},contextmenu:{touches:2,taps:1}},p=function(t,e){return function(i,a,l,u){if("contextmenu"==a&&v)h(i,a,l,u);else{if(null==i.__taTapHandler){var c=i.__taTapHandler={tap:[],dbltap:[],contextmenu:[],down:!1,taps:0,downSelectors:[]},p=function(){c.down=!1},f=function(){c.taps=0};h(i,"mousedown",function(r){for(var a=o(r),l=s(r,a,i,null!=u),h=!1,d=0;d<l.end;d++){if(h)return;a=l.path[d];for(var g=0;g<c.downSelectors.length;g++)if(null==c.downSelectors[g]||n(a,c.downSelectors[g],i)){c.down=!0,setTimeout(p,t),setTimeout(f,e),h=!0;break}}}),h(i,"mouseup",function(t){if(c.down){var e,r,a=o(t);c.taps++;var l=E(t);for(var u in d)if(d.hasOwnProperty(u)){var h=d[u];if(h.touches===l&&(1===h.taps||h.taps===c.taps))for(var p=0;p<c[u].length;p++){r=s(t,a,i,null!=c[u][p][1]);for(var f=0;f<r.end;f++)if(e=r.path[f],null==c[u][p][1]||n(e,c[u][p][1],i)){c[u][p][0].apply(e,[t]);break}}}}})}i.__taTapHandler.downSelectors.push(u),i.__taTapHandler[a].push([l,u]),l.__taUnstore=function(){r(i.__taTapHandler[a],l)}}}},f=function(t,e,n,i){for(var o in n.__tamee[t])n.__tamee[t].hasOwnProperty(o)&&n.__tamee[t][o].apply(i,[e])},g=function(){var t=[];return function(e,i,s,r){if(!e.__tamee){e.__tamee={over:!1,mouseenter:[],mouseexit:[]};var a=function(i){var s=o(i);(null==r&&s==e&&!e.__tamee.over||n(s,r,e)&&(null==s.__tamee||!s.__tamee.over))&&(f("mouseenter",i,e,s),s.__tamee=s.__tamee||{},s.__tamee.over=!0,t.push(s))},c=function(i){for(var s=o(i),r=0;r<t.length;r++)s!=t[r]||n(i.relatedTarget||i.toElement,"*",s)||(s.__tamee.over=!1,t.splice(r,1),f("mouseexit",i,e,s))};S(e,"mouseover",u(r,e,a,"mouseover"),a),S(e,"mouseout",u(r,e,c,"mouseout"),c)}s.__taUnstore=function(){delete e.__tamee[i][s.__tauid]},l(e,i,s),e.__tamee[i][s.__tauid]=s}},m="ontouchstart"in document.documentElement||navigator.maxTouchPoints,v="onmousedown"in document.documentElement,y={mousedown:"touchstart",mouseup:"touchend",mousemove:"touchmove"},b=function(){var t=-1;if("Microsoft Internet Explorer"==navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),P=b>-1&&b<9,x=function(t,e){if(null==t)return[0,0];var n=j(t),i=_(n,0);return[i[e+"X"],i[e+"Y"]]},C=function(t){return null==t?[0,0]:P?[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop]:x(t,"page")},_=function(t,e){return t.item?t.item(e):t[e]},j=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},E=function(t){return j(t).length},S=function(t,e,n,i){if(l(t,e,n),i.__tauid=n.__tauid,t.addEventListener)t.addEventListener(e,n,!1);else if(t.attachEvent){var o=e+n.__tauid;t["e"+o]=n,t[o]=function(){t["e"+o]&&t["e"+o](window.event)},t.attachEvent("on"+e,t[o])}},w=function(t,e,n){null!=n&&D(t,function(){var o=i(this);if(function(t,e,n){if(t.__ta&&t.__ta[e]&&delete t.__ta[e][n.__tauid],n.__taExtra){for(var i=0;i<n.__taExtra.length;i++)w(t,n.__taExtra[i][0],n.__taExtra[i][1]);n.__taExtra.length=0}n.__taUnstore&&n.__taUnstore()}(o,e,n),null!=n.__tauid)if(o.removeEventListener)o.removeEventListener(e,n,!1),m&&y[e]&&o.removeEventListener(y[e],n,!1);else if(this.detachEvent){var s=e+n.__tauid;o[s]&&o.detachEvent("on"+e,o[s]),o[s]=null,o["e"+s]=null}n.__taTouchProxy&&w(t,n.__taTouchProxy[1],n.__taTouchProxy[0])})},D=function(t,e){if(null!=t){t="undefined"!=typeof Window&&"unknown"!=typeof t.top&&t==t.top?[t]:"string"!=typeof t&&null==t.tagName&&null!=t.length?t:"string"==typeof t?document.querySelectorAll(t):[t];for(var n=0;n<t.length;n++)e.apply(t[n])}},A=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"==t?e:3&e|8).toString(16)})};this.Mottle=function(e){var n=(e=e||{}).clickThreshold||250,s=e.dblClickThreshold||450,a=new g,l=new p(n,s),u=e.smartClicks,c=function(t,e,n,s){null!=n&&D(t,function(){var t=i(this);u&&"click"===e?function(t,e,n,i){null==t.__taSmartClicks&&(h(t,"mousedown",function(e){t.__tad=C(e)},i),h(t,"mouseup",function(e){t.__tau=C(e)},i),h(t,"click",function(e){if(t.__tad&&t.__tau&&t.__tad[0]===t.__tau[0]&&t.__tad[1]===t.__tau[1])for(var n=0;n<t.__taSmartClicks.length;n++)t.__taSmartClicks[n].apply(o(e),[e])},i),t.__taSmartClicks=[]);t.__taSmartClicks.push(n),n.__taUnstore=function(){r(t.__taSmartClicks,n)}}(t,0,n,s):"tap"===e||"dbltap"===e||"contextmenu"===e?l(t,e,n,s):"mouseenter"===e||"mouseexit"==e?a(t,e,n,s):h(t,e,n,s)})};this.remove=function(t){return D(t,function(){var t=i(this);if(t.__ta)for(var e in t.__ta)if(t.__ta.hasOwnProperty(e))for(var n in t.__ta[e])t.__ta[e].hasOwnProperty(n)&&w(t,e,t.__ta[e][n]);t.parentNode&&t.parentNode.removeChild(t)}),this},this.on=function(t,e,n,i){var o=arguments[0],s=4==arguments.length?arguments[2]:null,r=arguments[1],a=arguments[arguments.length-1];return c(o,r,a,s),this},this.off=function(t,e,n){return w(t,e,n),this},this.trigger=function(e,n,o,s){var r=v&&("undefined"==typeof MouseEvent||null==o||o.constructor===MouseEvent),a=m&&!v&&y[n]?y[n]:n,l=!(m&&!v&&y[n]),u=C(o),c=x(o,"screen"),h=function(t){return x(t,"client")}(o);return D(e,function(){var e,d=i(this);o=o||{screenX:c[0],screenY:c[1],clientX:h[0],clientY:h[1]};var p=function(t){s&&(t.payload=s)},f={TouchEvent:function(e){var n=t(window,d,0,u[0],u[1],c[0],c[1],h[0],h[1]);(e.initTouchEvent||e.initEvent)(a,!0,!0,window,null,c[0],c[1],h[0],h[1],!1,!1,!1,!1,n,n,n,1,0)},MouseEvents:function(t){t.initMouseEvent(a,!0,!0,window,0,c[0],c[1],h[0],h[1],!1,!1,!1,!1,1,d)}};if(document.createEvent){var g=!l&&!r&&m&&y[n]?"TouchEvent":"MouseEvents";e=document.createEvent(g),f[g](e),p(e),d.dispatchEvent(e)}else document.createEventObject&&((e=document.createEventObject()).eventType=e.eventName=a,e.screenX=c[0],e.screenY=c[1],e.clientX=h[0],e.clientY=h[1],p(e),d.fireEvent("on"+a,e))}),this}},this.Mottle.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.Mottle.pageLocation=C,this.Mottle.setForceTouchEvents=function(t){m=t},this.Mottle.setForceMouseEvents=function(t){v=t},this.Mottle.version="0.8.0",e.Mottle=this.Mottle}.call("undefined"==typeof window?s:window),function(){var t=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},n=function(t,e){var n=t.indexOf(e);-1!==n&&t.splice(n,1)},i=function(t){return null!=t&&("string"==typeof t||t.constructor===String)},o=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},s=function(t,e,n){if(o(e,n,t))return e;for(var i=e.parentNode;null!=i&&i!==t;){if(o(i,n,t))return i;i=i.parentNode}},r=function(){var t=-1;if("Microsoft Internet Explorer"===navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),a=r>-1&&r<9,l=9===r,u=function(t){if(a)return[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop];var e=h(t),n=c(e,0);return l?[n.pageX||n.clientX,n.pageY||n.clientY]:[n.pageX,n.pageY]},c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d={delegatedDraggable:"katavorio-delegated-draggable",draggable:"katavorio-draggable",droppable:"katavorio-droppable",drag:"katavorio-drag",selected:"katavorio-drag-selected",active:"katavorio-drag-active",hover:"katavorio-drag-hover",noSelect:"katavorio-drag-no-select",ghostProxy:"katavorio-ghost-proxy",clonedDrag:"katavorio-clone-drag"},p=["stop","start","drag","drop","over","out","beforeStart"],f=function(){},g=function(){return!0},m=function(t,e,n){for(var i=0;i<t.length;i++)t[i]!=n&&e(t[i])},v=function(t,e,n,i){m(t,function(t){t.setActive(e),e&&t.updatePosition(),n&&t.setHover(i,e)})},y=function(t,e){if(null!=t){t=i(t)||null!=t.tagName||null==t.length?[t]:t;for(var n=0;n<t.length;n++)e.apply(t[n],[t[n]])}},b=function(t){t.stopPropagation?(t.stopPropagation(),t.preventDefault()):t.returnValue=!1},P=function(t,e,n,i){this.params=e||{},this.el=t,this.params.addClass(this.el,this._class),this.uuid=E();var o=!0;return this.setEnabled=function(t){o=t},this.isEnabled=function(){return o},this.toggleEnabled=function(){o=!o},this.setScope=function(t){this.scopes=t?t.split(/\s+/):[i]},this.addScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.removeScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){delete e[t]}),this.scopes=[],e)this.scopes.push(n)},this.toggleScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]?delete e[t]:e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.setScope(e.scope),this.k=e.katavorio,e.katavorio},x=function(){return!0},C=function(){return!1},_=function(t,e,n,r){this._class=n.draggable;var a=P.apply(this,arguments);this.rightButtonCanDrag=this.params.rightButtonCanDrag;var l,c,h,p,f,m,y=[0,0],_=null,j=null,w=[0,0],D=!1,A=[0,0],I=!1!==this.params.consumeStartEvent,k=this.el,O=this.params.clone,M=(this.params.scroll,!1!==e.multipleDrop),T=!1,F=null,L=[],N=null,R=e.ghostProxyParent;if(l=!0===e.ghostProxy?x:e.ghostProxy&&"function"==typeof e.ghostProxy?e.ghostProxy:function(t,e){return!(!N||!N.useGhostProxy)&&N.useGhostProxy(t,e)},c=e.makeGhostProxy?e.makeGhostProxy:function(t){return N&&N.makeGhostProxy?N.makeGhostProxy(t):t.cloneNode(!0)},e.selector){var G=t.getAttribute("katavorio-draggable");null==G&&(G=""+(new Date).getTime(),t.setAttribute("katavorio-draggable",G)),L.push(e)}var B,H=e.snapThreshold,U=function(t,e,n,i,o){var s=e*Math.floor(t[0]/e),r=s+e,a=Math.abs(t[0]-s)<=i?s:Math.abs(r-t[0])<=i?r:t[0],l=n*Math.floor(t[1]/n),u=l+n;return[a,Math.abs(t[1]-l)<=o?l:Math.abs(u-t[1])<=o?u:t[1]]};this.posses=[],this.posseRoles={},this.toGrid=function(t){if(null==this.params.grid)return t;var e=this.params.grid?this.params.grid[0]/2:H||5,n=this.params.grid?this.params.grid[1]/2:H||5;return U(t,this.params.grid[0],this.params.grid[1],e,n)},this.snap=function(t,e){if(null!=k){t=t||(this.params.grid?this.params.grid[0]:10),e=e||(this.params.grid?this.params.grid[1]:10);var n=this.params.getPosition(k),i=this.params.grid?this.params.grid[0]/2:H,o=this.params.grid?this.params.grid[1]/2:H,s=U(n,t,e,i,o);return this.params.setPosition(k,s),s}},this.setUseGhostProxy=function(t){l=t?x:C};var X=function(t){return!1===e.allowNegative?[Math.max(0,t[0]),Math.max(0,t[1])]:t},Y=function(t){B="function"==typeof t?t:t?function(t,e,n,i){return X([Math.max(0,Math.min(n.w-i[0],t[0])),Math.max(0,Math.min(n.h-i[1],t[1]))])}.bind(this):function(t){return X(t)}}.bind(this);Y("function"==typeof this.params.constrain?this.params.constrain:this.params.constrain||this.params.containment),this.setConstrain=function(t){Y(t)};var $;this.setRevert=function(t){$=t},this.params.revert&&($=this.params.revert);var z={},W=this.setFilter=function(e,n){if(e){var s="function"==typeof(r=e)?(r._katavorioId=E(),r._katavorioId):r;z[s]=[function(n){var s,r=n.srcElement||n.target;return i(e)?s=o(r,e,t):"function"==typeof e&&(s=e(n,t)),s},!1!==n]}var r};this.addFilter=W,this.removeFilter=function(t){var e="function"==typeof t?t._katavorioId:t;delete z[e]};this.clearAllFilters=function(){z={}},this.canDrag=this.params.canDrag||g;var q,V=[],J=[];this.addSelector=function(t){t.selector&&L.push(t)},this.downListener=function(t){var e,i,r,l,c,h,p,f,g;if(!t.defaultPrevented&&((this.rightButtonCanDrag||3!==t.which&&2!==t.button)&&this.isEnabled()&&this.canDrag()))if(function(t){for(var e in z){var n=z[e],i=n[0](t);if(n[1]&&(i=!i),!i)return!1}return!0}(t)&&function(t,e,n){var i=t.srcElement||t.target;return!o(i,n.getInputFilterSelector(),e)}(t,this.el,this.k)){if(N=null,F=null,L.length>0){var m=function(t,e,n){for(var i=null,r=e.getAttribute("katavorio-draggable"),a=null!=r?"[katavorio-draggable='"+r+"'] ":"",l=0;l<t.length;l++)if(null!=(i=s(e,n,a+t[l].selector))){if(t[l].filter){var u=o(n,t[l].filter,i);if(!0===t[l].filterExclude&&!u||u)return null}return[t[l],i]}return null}(L,this.el,t.target||t.srcElement);if(null!=m&&(N=m[0],F=m[1]),null==F)return}else F=this.el;if(O)if(k=F.cloneNode(!0),this.params.addClass(k,d.clonedDrag),k.setAttribute("id",null),k.style.position="absolute",null!=this.params.parent){var v=this.params.getPosition(this.el);k.style.left=v[0]+"px",k.style.top=v[1]+"px",this.params.parent.appendChild(k)}else{var P=(e=F.getBoundingClientRect(),i=document.body,r=document.documentElement,l=window.pageYOffset||r.scrollTop||i.scrollTop,c=window.pageXOffset||r.scrollLeft||i.scrollLeft,h=r.clientTop||i.clientTop||0,p=r.clientLeft||i.clientLeft||0,f=e.top+l-h,g=e.left+c-p,{top:Math.round(f),left:Math.round(g)});k.style.left=P.left+"px",k.style.top=P.top+"px",document.body.appendChild(k)}else k=F;I&&b(t),y=u(t),k&&k.parentNode&&(A=[k.parentNode.scrollLeft,k.parentNode.scrollTop]),this.params.bind(document,"mousemove",this.moveListener),this.params.bind(document,"mouseup",this.upListener),a.markSelection(this),a.markPosses(this),this.params.addClass(document.body,n.noSelect),Q("beforeStart",{el:this.el,pos:_,e:t,drag:this})}else this.params.consumeFilteredEvents&&b(t)}.bind(this),this.moveListener=function(t){if(y){if(!D)if(!1!==Q("start",{el:this.el,pos:_,e:t,drag:this})){if(!y)return;this.mark(!0),D=!0}else this.abort();if(y){J.length=0;var e=u(t),n=e[0]-y[0],i=e[1]-y[1],o=this.params.ignoreZoom?1:a.getZoom();k&&k.parentNode&&(n+=k.parentNode.scrollLeft-A[0],i+=k.parentNode.scrollTop-A[1]),n/=o,i/=o,this.moveBy(n,i,t),a.updateSelection(n,i,this),a.updatePosses(n,i,this)}}}.bind(this),this.upListener=function(t){y&&(y=null,this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.params.removeClass(document.body,n.noSelect),this.unmark(t),a.unmarkSelection(this,t),a.unmarkPosses(this,t),this.stop(t),a.notifyPosseDragStop(this,t),D=!1,J.length=0,O?(k&&k.parentNode&&k.parentNode.removeChild(k),k=null):$&&!0===$(k,this.params.getPosition(k))&&(this.params.setPosition(k,_),Q("revert",k)))}.bind(this),this.getFilters=function(){return z},this.abort=function(){null!=y&&this.upListener()},this.getDragElement=function(t){return t?F||this.el:k||this.el};var Z={start:[],drag:[],stop:[],over:[],out:[],beforeStart:[],revert:[]};e.events.start&&Z.start.push(e.events.start),e.events.beforeStart&&Z.beforeStart.push(e.events.beforeStart),e.events.stop&&Z.stop.push(e.events.stop),e.events.drag&&Z.drag.push(e.events.drag),e.events.revert&&Z.revert.push(e.events.revert),this.on=function(t,e){Z[t]&&Z[t].push(e)},this.off=function(t,e){if(Z[t]){for(var n=[],i=0;i<Z[t].length;i++)Z[t][i]!==e&&n.push(Z[t][i]);Z[t]=n}};var K,Q=function(t,e){var n=null;if(N&&N[t])n=N[t](e);else if(Z[t])for(var i=0;i<Z[t].length;i++)try{var o=Z[t][i](e);null!=o&&(n=o)}catch(t){}return n};this.notifyStart=function(t){Q("start",{el:this.el,pos:this.params.getPosition(k),e:t,drag:this})},this.stop=function(t,e){if(e||D){var n=[],i=a.getSelection(),o=this.params.getPosition(k);if(i.length>0)for(var s=0;s<i.length;s++){var r=this.params.getPosition(i[s].el);n.push([i[s].el,{left:r[0],top:r[1]},i[s]])}else n.push([k,{left:o[0],top:o[1]},this]);Q("stop",{el:k,pos:K||o,finalPos:o,e:t,drag:this,selection:n})}},this.mark=function(t){var e;_=this.params.getPosition(k),j=this.params.getPosition(k,!0),w=[j[0]-_[0],j[1]-_[1]],this.size=this.params.getSize(k),V=a.getMatchingDroppables(this),v(V,!0,!1,this),this.params.addClass(k,this.params.dragClass||n.drag),e=this.params.getConstrainingRectangle?this.params.getConstrainingRectangle(k):this.params.getSize(k.parentNode),q={w:e[0],h:e[1]},f=0,m=0,t&&a.notifySelectionDragStart(this)},this.unmark=function(t,i){if(v(V,!1,!0,this),T&&l(F,k)?(K=[k.offsetLeft-f,k.offsetTop-m],k.parentNode.removeChild(k),k=F):K=null,this.params.removeClass(k,this.params.dragClass||n.drag),V.length=0,T=!1,!i){J.length>0&&K&&e.setPosition(F,K),J.sort(S);for(var o=0;o<J.length;o++){if(!0===J[o].drop(this,t))break}}},this.moveBy=function(t,n,i){J.length=0;var o=this.toGrid([_[0]+t,_[1]+n]),s=function(t,e,n,i){return null!=N&&N.constrain&&"function"==typeof N.constrain?N.constrain(t,e,n,i):B(t,e,n,i)}(o,k,q,this.size);if(l(this.el,k))if(o[0]!==s[0]||o[1]!==s[1]){if(!T){var r=c(F);e.addClass(r,d.ghostProxy),R?(R.appendChild(r),h=e.getPosition(F.parentNode,!0),p=e.getPosition(e.ghostProxyParent,!0),f=h[0]-p[0],m=h[1]-p[1]):F.parentNode.appendChild(r),k=r,T=!0}s=o}else T&&(k.parentNode.removeChild(k),k=F,T=!1,h=null,p=null,f=0,m=0);var a={x:s[0],y:s[1],w:this.size[0],h:this.size[1]},u={x:a.x+w[0],y:a.y+w[1],w:a.w,h:a.h},g=null;this.params.setPosition(k,[s[0]+f,s[1]+m]);for(var v=0;v<V.length;v++){var y={x:V[v].pagePosition[0],y:V[v].pagePosition[1],w:V[v].size[0],h:V[v].size[1]};this.params.intersects(u,y)&&(M||null==g||g===V[v].el)&&V[v].canDrop(this)?(g||(g=V[v].el),J.push(V[v]),V[v].setHover(this,!0,i)):V[v].isHover()&&V[v].setHover(this,!1,i)}Q("drag",{el:this.el,pos:s,e:i,drag:this})},this.destroy=function(){this.params.unbind(this.el,"mousedown",this.downListener),this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.downListener=null,this.upListener=null,this.moveListener=null},this.params.bind(this.el,"mousedown",this.downListener),this.params.handle?W(this.params.handle,!1):W(this.params.filter,this.params.filterExclude)},j=function(t,e,n,i){this._class=n.droppable,this.params=e||{},this.rank=e.rank||0,this._activeClass=this.params.activeClass||n.active,this._hoverClass=this.params.hoverClass||n.hover,P.apply(this,arguments);var o=!1;this.allowLoopback=!1!==this.params.allowLoopback,this.setActive=function(t){this.params[t?"addClass":"removeClass"](this.el,this._activeClass)},this.updatePosition=function(){this.position=this.params.getPosition(this.el),this.pagePosition=this.params.getPosition(this.el,!0),this.size=this.params.getSize(this.el)},this.canDrop=this.params.canDrop||function(t){return!0},this.isHover=function(){return o},this.setHover=function(t,e,n){(e||null==this.el._katavorioDragHover||this.el._katavorioDragHover===t.el._katavorio)&&(this.params[e?"addClass":"removeClass"](this.el,this._hoverClass),this.el._katavorioDragHover=e?t.el._katavorio:null,o!==e&&this.params.events[e?"over":"out"]({el:this.el,e:n,drag:t,drop:this}),o=e)},this.drop=function(t,e){return this.params.events.drop({drag:t,e:e,drop:this})},this.destroy=function(){this._class=null,this._activeClass=null,this._hoverClass=null,o=null}},E=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"===t?e:3&e|8).toString(16)})},S=function(t,e){return t.rank<e.rank?1:t.rank>e.rank?-1:0},w=function(t){return null==t?null:null==(t="string"==typeof t||t.constructor===String?document.getElementById(t):t)?null:(t._katavorio=t._katavorio||E(),t)};this.Katavorio=function(e){var o=[],s={};this._dragsByScope={},this._dropsByScope={};var r=1,a=function(t,e){y(t,function(t){for(var n=0;n<t.scopes.length;n++)e[t.scopes[n]]=e[t.scopes[n]]||[],e[t.scopes[n]].push(t)})},l=function(t,n){var i=0;return y(t,function(t){for(var o=0;o<t.scopes.length;o++)if(n[t.scopes[o]]){var s=e.indexOf(n[t.scopes[o]],t);-1!==s&&(n[t.scopes[o]].splice(s,1),i++)}}),i>0},u=(this.getMatchingDroppables=function(t){for(var e=[],n={},i=0;i<t.scopes.length;i++){var o=this._dropsByScope[t.scopes[i]];if(o)for(var s=0;s<o.length;s++)!o[s].canDrop(t)||n[o[s].uuid]||!o[s].allowLoopback&&o[s].el===t.el||(n[o[s].uuid]=!0,e.push(o[s]))}return e.sort(S),e},function(t){t=t||{};var n,i={events:{}};for(n in e)i[n]=e[n];for(n in t)i[n]=t[n];for(n=0;n<p.length;n++)i.events[p[n]]=t[p[n]]||f;return i.katavorio=this,i}.bind(this)),c=function(t,e){for(var n=0;n<p.length;n++)e[p[n]]&&t.on(p[n],e[p[n]])}.bind(this),h={},g=e.css||{},v=e.scope||"katavorio-drag-scope";for(var b in d)h[b]=d[b];for(var b in g)h[b]=g[b];var P=e.inputFilterSelector||"input,textarea,select,button,option";this.getInputFilterSelector=function(){return P},this.setInputFilterSelector=function(t){return P=t,this},this.draggable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t)))if(null==t._katavorioDrag){var o=u(n);t._katavorioDrag=new _(t,o,h,v),a(t._katavorioDrag,this._dragsByScope),i.push(t._katavorioDrag),e.addClass(t,o.selector?h.delegatedDraggable:h.draggable)}else c(t._katavorioDrag,n)}.bind(this)),i},this.droppable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t))){var o=new j(t,u(n),h,v);t._katavorioDrop=t._katavorioDrop||[],t._katavorioDrop.push(o),a(o,this._dropsByScope),i.push(o),e.addClass(t,h.droppable)}}.bind(this)),i},this.select=function(t){return y(t,function(){var t=w(this);t&&t._katavorioDrag&&(s[t._katavorio]||(o.push(t._katavorioDrag),s[t._katavorio]=[t,o.length-1],e.addClass(t,h.selected)))}),this},this.deselect=function(t){return y(t,function(){var t=w(this);if(t&&t._katavorio&&s[t._katavorio]){for(var n=[],i=0;i<o.length;i++)o[i].el!==t&&n.push(o[i]);o=n,delete s[t._katavorio],e.removeClass(t,h.selected)}}),this},this.deselectAll=function(){for(var t in s){var n=s[t];e.removeClass(n[0],h.selected)}o.length=0,s={}},this.markSelection=function(t){m(o,function(t){t.mark()},t)},this.markPosses=function(t){t.posses&&y(t.posses,function(e){t.posseRoles[e]&&A[e]&&m(A[e].members,function(t){t.mark()},t)})},this.unmarkSelection=function(t,e){m(o,function(t){t.unmark(e)},t)},this.unmarkPosses=function(t,e){t.posses&&y(t.posses,function(n){t.posseRoles[n]&&A[n]&&m(A[n].members,function(t){t.unmark(e,!0)},t)})},this.getSelection=function(){return o.slice(0)},this.updateSelection=function(t,e,n){m(o,function(n){n.moveBy(t,e)},n)};var x=function(t,e){e.posses&&y(e.posses,function(n){e.posseRoles[n]&&A[n]&&m(A[n].members,function(e){t(e)},e)})};this.updatePosses=function(t,e,n){x(function(n){n.moveBy(t,e)},n)},this.notifyPosseDragStop=function(t,e){x(function(t){t.stop(e,!0)},t)},this.notifySelectionDragStop=function(t,e){m(o,function(t){t.stop(e,!0)},t)},this.notifySelectionDragStart=function(t,e){m(o,function(t){t.notifyStart(e)},t)},this.setZoom=function(t){r=t},this.getZoom=function(){return r};var C=function(t,e,n,i){y(t,function(t){l(t,n),t[i](e),a(t,n)})};y(["set","add","remove","toggle"],function(t){this[t+"Scope"]=function(e,n){C(e._katavorioDrag,n,this._dragsByScope,t+"Scope"),C(e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this),this[t+"DragScope"]=function(e,n){C(e.constructor===_?e:e._katavorioDrag,n,this._dragsByScope,t+"Scope")}.bind(this),this[t+"DropScope"]=function(e,n){C(e.constructor===j?e:e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this)}.bind(this)),this.snapToGrid=function(t,e){for(var n in this._dragsByScope)m(this._dragsByScope[n],function(n){n.snap(t,e)})},this.getDragsForScope=function(t){return this._dragsByScope[t]},this.getDropsForScope=function(t){return this._dropsByScope[t]};var E=function(t,e,n){if((t=w(t))[e]){var i=o.indexOf(t[e]);i>=0&&o.splice(i,1),l(t[e],n)&&y(t[e],function(t){t.destroy()}),delete t[e]}},D=function(t,e,n,i){(t=w(t))[e]&&t[e].off(n,i)};this.elementRemoved=function(t){t._katavorioDrag&&this.destroyDraggable(t),t._katavorioDrop&&this.destroyDroppable(t)},this.destroyDraggable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrag",this._dragsByScope):D(t,"_katavorioDrag",e,n)},this.destroyDroppable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrop",this._dropsByScope):D(t,"_katavorioDrop",e,n)},this.reset=function(){this._dragsByScope={},this._dropsByScope={},o=[],s={},A={}};var A={},I=function(e,n,o){var s,r=i(n)?n:n.id,a=!!i(n)||!1!==n.active,l=A[r]||(s={name:r,members:[]},A[r]=s,s);return y(e,function(e){if(e._katavorioDrag){if(o&&null!=e._katavorioDrag.posseRoles[l.name])return;t(l.members,e._katavorioDrag),t(e._katavorioDrag.posses,l.name),e._katavorioDrag.posseRoles[l.name]=a}}),l};this.addToPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i]));return 1===n.length?n[0]:n},this.setPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i],!0).name);return y(t,function(t){if(t._katavorioDrag){var e=function(t,e){for(var n=[],i=0;i<t.length;i++)-1===e.indexOf(t[i])&&n.push(t[i]);return n}(t._katavorioDrag.posses,n);Array.prototype.push.apply([],t._katavorioDrag.posses);for(var i=0;i<e.length;i++)this.removeFromPosse(t,e[i])}}.bind(this)),1===n.length?n[0]:n},this.removeFromPosse=function(t,e){if(arguments.length<2)throw new TypeError("No posse id provided for remove operation");for(var i=1;i<arguments.length;i++)e=arguments[i],y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var i=t._katavorioDrag;y(e,function(t){n(A[t].members,i),n(i.posses,t),delete i.posseRoles[t]})}})},this.removeFromAllPosses=function(t){y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var e=t._katavorioDrag;y(e.posses,function(t){n(A[t].members,e)}),e.posses.length=0,e.posseRoles={}}})},this.setPosseState=function(t,e,n){var i=A[e];i&&y(t,function(t){t._katavorioDrag&&t._katavorioDrag.posses&&(t._katavorioDrag.posseRoles[i.name]=n)})}},this.Katavorio.version="1.0.0",e.Katavorio=this.Katavorio}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil=this.jsPlumbUtil||{};var t=this.jsPlumbUtil;function n(t){return"[object Array]"===Object.prototype.toString.call(t)}function i(t){return"string"==typeof t}function o(t){return"boolean"==typeof t}function s(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function r(t){return"[object Date]"===Object.prototype.toString.call(t)}function a(t){return"[object Function]"===Object.prototype.toString.call(t)}function l(t){if(i(t))return""+t;if(o(t))return!!t;if(r(t))return new Date(t.getTime());if(a(t))return t;if(n(t)){for(var e=[],u=0;u<t.length;u++)e.push(l(t[u]));return e}if(s(t)){var c={};for(var h in t)c[h]=l(t[h]);return c}return t}function u(t,e,r,a){var u,c,h={},d={};for(r=r||[],a=a||[],c=0;c<r.length;c++)h[r[c]]=!0;for(c=0;c<a.length;c++)d[a[c]]=!0;var p=l(t);for(c in e)if(null==p[c]||d[c])p[c]=e[c];else if(i(e[c])||o(e[c]))h[c]?((u=[]).push.apply(u,n(p[c])?p[c]:[p[c]]),u.push.apply(u,o(e[c])?e[c]:[e[c]]),p[c]=u):p[c]=e[c];else if(n(e[c]))u=[],n(p[c])&&u.push.apply(u,p[c]),u.push.apply(u,e[c]),p[c]=u;else if(s(e[c]))for(var f in s(p[c])||(p[c]={}),e[c])p[c][f]=e[c][f];return p}function c(t,e){if(t)for(var n=0;n<t.length;n++)if(e(t[n]))return n;return-1}function h(t,e){var n=t.indexOf(e);return n>-1&&t.splice(n,1),-1!==n}function d(t,e,n,i){var o=t[e];return null==o&&(o=[],t[e]=o),o[i?"unshift":"push"](n),o}e.jsPlumbUtil=t,t.isArray=n,t.isNumber=function(t){return"[object Number]"===Object.prototype.toString.call(t)},t.isString=i,t.isBoolean=o,t.isNull=function(t){return null==t},t.isObject=s,t.isDate=r,t.isFunction=a,t.isNamedFunction=function(t){return a(t)&&null!=t.name&&t.name.length>0},t.isEmpty=function(t){for(var e in t)if(t.hasOwnProperty(e))return!1;return!0},t.clone=l,t.merge=u,t.replace=function(t,e,n){if(null!=t){var i=t;return e.replace(/([^\.])+/g,function(t,e,o,s){var r=t.match(/([^\[0-9]+){1}(\[)([0-9+])/),a=function(){return i[r[1]]||(i[r[1]]=[],i[r[1]])};if(o+t.length>=s.length)r?a()[r[3]]=n:i[t]=n;else if(r){var l=a();i=l[r[3]]||(l[r[3]]={},l[r[3]])}else i=i[t]||(i[t]={},i[t]);return""}),t}},t.functionChain=function(t,e,n){for(var i=0;i<n.length;i++){var o=n[i][0][n[i][1]].apply(n[i][0],n[i][2]);if(o===e)return o}return t},t.populate=function(t,e,o,r){var l=function(t){if(null!=t){if(i(t))return function(t){var n=t.match(/(\${.*?})/g);if(null!=n)for(var i=0;i<n.length;i++){var o=e[n[i].substring(2,n[i].length-1)]||"";null!=o&&(t=t.replace(n[i],o))}return t}(t);if(!a(t)||r||null!=o&&0!==(t.name||"").indexOf(o)){if(n(t)){for(var u=[],c=0;c<t.length;c++)u.push(l(t[c]));return u}if(s(t)){var h={};for(var d in t)h[d]=l(t[d]);return h}return t}return t(e)}};return l(t)},t.findWithFunction=c,t.removeWithFunction=function(t,e){var n=c(t,e);return n>-1&&t.splice(n,1),-1!==n},t.remove=h,t.addWithFunction=function(t,e,n){-1===c(t,n)&&t.push(e)},t.addToList=d,t.suggest=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},t.extend=function(t,e,i){var o;e=n(e)?e:[e];var s=function(e){for(var n=e.__proto__;null!=n;)if(null!=n.prototype){for(var i in n.prototype)n.prototype.hasOwnProperty(i)&&!t.prototype.hasOwnProperty(i)&&(t.prototype[i]=n.prototype[i]);n=n.prototype.__proto__}else n=null};for(o=0;o<e.length;o++){for(var r in e[o].prototype)e[o].prototype.hasOwnProperty(r)&&!t.prototype.hasOwnProperty(r)&&(t.prototype[r]=e[o].prototype[r]);s(e[o])}var a=function(t,n){return function(){for(o=0;o<e.length;o++)e[o].prototype[t]&&e[o].prototype[t].apply(this,arguments);return n.apply(this,arguments)}},l=function(e){for(var n in e)t.prototype[n]=a(n,e[n])};if(arguments.length>2)for(o=2;o<arguments.length;o++)l(arguments[o]);return t};for(var p=[],f=0;f<256;f++)p[f]=(f<16?"0":"")+f.toString(16);function g(){var t=4294967295*Math.random()|0,e=4294967295*Math.random()|0,n=4294967295*Math.random()|0,i=4294967295*Math.random()|0;return p[255&t]+p[t>>8&255]+p[t>>16&255]+p[t>>24&255]+"-"+p[255&e]+p[e>>8&255]+"-"+p[e>>16&15|64]+p[e>>24&255]+"-"+p[63&n|128]+p[n>>8&255]+"-"+p[n>>16&255]+p[n>>24&255]+p[255&i]+p[i>>8&255]+p[i>>16&255]+p[i>>24&255]}function m(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];if(t.logEnabled&&"undefined"!=typeof console)try{var i=arguments[arguments.length-1];console.log(i)}catch(t){}}t.uuid=g,t.fastTrim=function(t){if(null==t)return null;for(var e=t.replace(/^\s\s*/,""),n=/\s/,i=e.length;n.test(e.charAt(--i)););return e.slice(0,i+1)},t.each=function(t,e){t=null==t.length||"string"==typeof t?[t]:t;for(var n=0;n<t.length;n++)e(t[n])},t.map=function(t,e){for(var n=[],i=0;i<t.length;i++)n.push(e(t[i]));return n},t.mergeWithParents=function(t,e,n){n=n||"parent";var i=function(t){return t?e[t]:null},o=function(t){return t?i(t[n]):null},s=function(t,e){if(null==t)return e;var n=["anchor","anchors","cssClass","connector","paintStyle","hoverPaintStyle","endpoint","endpoints"];"override"===e.mergeStrategy&&Array.prototype.push.apply(n,["events","overlays"]);var i=u(t,e,[],n);return s(o(t),i)},r=function(t){if(null==t)return{};if("string"==typeof t)return i(t);if(t.length){for(var e=!1,n=0,o=void 0;!e&&n<t.length;)(o=r(t[n]))?e=!0:n++;return o}},a=r(t);return a?s(o(a),a):{}},t.logEnabled=!0,t.log=m,t.wrap=function(t,e,n){return function(){var i=null;try{null!=e&&(i=e.apply(this,arguments))}catch(t){m("jsPlumb function failed : "+t)}if(null!=t&&(null==n||i!==n))try{i=t.apply(this,arguments)}catch(t){m("wrapped function failed : "+t)}return i}};var v=function(){return function(){var t=this;this._listeners={},this.eventsSuspended=!1,this.tick=!1,this.eventsToDieOn={ready:!0},this.queue=[],this.bind=function(e,n,i){var o=function(e){d(t._listeners,e,n,i),n.__jsPlumb=n.__jsPlumb||{},n.__jsPlumb[g()]=e};if("string"==typeof e)o(e);else if(null!=e.length)for(var s=0;s<e.length;s++)o(e[s]);return t},this.fire=function(t,e,n){if(this.tick)this.queue.unshift(arguments);else{if(this.tick=!0,!this.eventsSuspended&&this._listeners[t]){var i=this._listeners[t].length,o=0,s=!1,r=null;if(!this.shouldFireEvent||this.shouldFireEvent(t,e,n))for(;!s&&o<i&&!1!==r;){if(this.eventsToDieOn[t])this._listeners[t][o].apply(this,[e,n]);else try{r=this._listeners[t][o].apply(this,[e,n])}catch(e){m("jsPlumb: fire failed for event "+t+" : "+e)}o++,null!=this._listeners&&null!=this._listeners[t]||(s=!0)}}this.tick=!1,this._drain()}return this},this._drain=function(){var e=t.queue.pop();e&&t.fire.apply(t,e)},this.unbind=function(t,e){if(0===arguments.length)this._listeners={};else if(1===arguments.length){if("string"==typeof t)delete this._listeners[t];else if(t.__jsPlumb){var n=void 0;for(var i in t.__jsPlumb)n=t.__jsPlumb[i],h(this._listeners[n]||[],t)}}else 2===arguments.length&&h(this._listeners[t]||[],e);return this},this.getListener=function(e){return t._listeners[e]},this.setSuspendEvents=function(e){t.eventsSuspended=e},this.isSuspendEvents=function(){return t.eventsSuspended},this.silently=function(e){t.setSuspendEvents(!0);try{e()}catch(t){m("Cannot execute silent function "+t)}t.setSuspendEvents(!1)},this.cleanupListeners=function(){for(var e in t._listeners)t._listeners[e]=null}}}();function y(t,e,n){var i=[t[0]-e[0],t[1]-e[1]],o=Math.cos(n/360*Math.PI*2),s=Math.sin(n/360*Math.PI*2);return[i[0]*o-i[1]*s+e[0],i[1]*o+i[0]*s+e[1],o,s]}t.EventGenerator=v,t.rotatePoint=y,t.rotateAnchorOrientation=function(t,e){var n=y(t,[0,0],e);return[Math.round(n[0]),Math.round(n[1])]}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil.matchesSelector=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},this.jsPlumbUtil.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.jsPlumbUtil.sizeElement=function(t,e,n,i,o){t&&(t.style.height=o+"px",t.height=o,t.style.width=i+"px",t.width=i,t.style.left=e+"px",t.style.top=n+"px")}}.call("undefined"!=typeof window?window:s),function(){var t={deriveAnchor:function(t,e,n,i){return{top:["TopRight","TopLeft"],bottom:["BottomRight","BottomLeft"]}[t][e]}},e=function(t,e){this.count=0,this.instance=t,this.lists={},this.options=e||{},this.instance.addList=function(t,e){return this.listManager.addList(t,e)},this.instance.removeList=function(t){this.listManager.removeList(t)},this.instance.bind("manageElement",function(t){for(var e=this.instance.getSelector(t.el,"[jtk-scrollable-list]"),n=0;n<e.length;n++)this.addList(e[n])}.bind(this)),this.instance.bind("unmanageElement",function(t){this.removeList(t.el)}),this.instance.bind("connection",function(t,e){null==e&&(this._maybeUpdateParentList(t.source),this._maybeUpdateParentList(t.target))}.bind(this))};this.jsPlumbListManager=e,e.prototype={addList:function(e,i){var o=this.instance.extend({},t);this.instance.extend(o,this.options),i=this.instance.extend(o,i||{});var s=[this.instance.getInstanceIndex(),this.count++].join("_");this.lists[s]=new n(this.instance,e,i,s)},removeList:function(t){var e=this.lists[t._jsPlumbList];e&&(e.destroy(),delete this.lists[t._jsPlumbList])},_maybeUpdateParentList:function(t){for(var e=t.parentNode,n=this.instance.getContainer();null!=e&&e!==n;){if(null!=e._jsPlumbList&&null!=this.lists[e._jsPlumbList])return void e._jsPlumbScrollHandler();e=e.parentNode}}};var n=function(t,e,n,i){function o(t,e,i,o){return n.anchor?n.anchor:n.deriveAnchor(t,e,i,o)}function s(t,e,i,o){return n.deriveEndpoint?n.deriveEndpoint(t,e,i,o):n.endpoint?n.endpoint:i.type}e._jsPlumbList=i;var r=function(n){for(var i=t.getSelector(e,".jtk-managed"),r=t.getId(e),a=0;a<i.length;a++){if(i[a].offsetTop<e.scrollTop)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("top",0,n.endpoints[0],n)},function(){return o("top",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("top",1,n.endpoints[1],n)},function(){return o("top",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a].offsetTop+i[a].offsetHeight>e.scrollTop+e.offsetHeight)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("bottom",0,n.endpoints[0],n)},function(){return o("bottom",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("bottom",1,n.endpoints[1],n)},function(){return o("bottom",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a]._jsPlumbProxies){for(var l=0;l<i[a]._jsPlumbProxies.length;l++)t.unproxyConnection(i[a]._jsPlumbProxies[l][0],i[a]._jsPlumbProxies[l][1],r);delete i[a]._jsPlumbProxies}t.revalidate(i[a])}!function(e){for(var n=e.parentNode,i=t.getContainer();null!=n&&n!==i;){if(t.hasClass(n,"jtk-managed"))return void t.recalculateOffsets(n);n=n.parentNode}}(e)};t.setAttribute(e,"jtk-scrollable-list","true"),e._jsPlumbScrollHandler=r,t.on(e,"scroll",r),r(),this.destroy=function(){t.off(e,"scroll",r),delete e._jsPlumbScrollHandler;for(var n=t.getSelector(e,".jtk-managed"),i=t.getId(e),o=0;o<n.length;o++)if(n[o]._jsPlumbProxies){for(var s=0;s<n[o]._jsPlumbProxies.length;s++)t.unproxyConnection(n[o]._jsPlumbProxies[s][0],n[o]._jsPlumbProxies[s][1],i);delete n[o]._jsPlumbProxies}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,n=t.jsPlumbUtil,i=function(t){if(t._jsPlumb.paintStyle&&t._jsPlumb.hoverPaintStyle){var e={};d.extend(e,t._jsPlumb.paintStyle),d.extend(e,t._jsPlumb.hoverPaintStyle),delete t._jsPlumb.hoverPaintStyle,e.gradient&&t._jsPlumb.paintStyle.fill&&delete e.gradient,t._jsPlumb.hoverPaintStyle=e}},o=["tap","dbltap","click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","contextmenu"],s=function(t){return null==t?null:t.split(" ")},r=function(t,e,n){for(var i in e)t[i]=n},a=function(t,e,i){if(t.getDefaultType){var o=t.getTypeDescriptor(),s={},a=t.getDefaultType(),l=n.merge({},a);r(s,a,"__default");for(var u=0,c=t._jsPlumb.types.length;u<c;u++){var h=t._jsPlumb.types[u];if("__default"!==h){var d=t._jsPlumb.instance.getType(h,o);if(null!=d){var p=["anchor","anchors","connector","paintStyle","hoverPaintStyle","endpoint","endpoints","connectorOverlays","connectorStyle","connectorHoverStyle","endpointStyle","endpointHoverStyle"],f=[];"override"===d.mergeStrategy?Array.prototype.push.apply(p,["events","overlays","cssClass"]):f.push("cssClass"),l=n.merge(l,d,f,p),r(s,d,h)}}}e&&(l=n.populate(l,e,"_")),t.applyType(l,i,s),i||t.repaint()}},l=t.jsPlumbUIComponent=function(t){n.EventGenerator.apply(this,arguments);var e=arguments,i=this.idPrefix+(new Date).getTime();this._jsPlumb={instance:t._jsPlumb,parameters:t.parameters||{},paintStyle:null,hoverPaintStyle:null,paintStyleInUse:null,hover:!1,beforeDetach:t.beforeDetach,beforeDrop:t.beforeDrop,overlayPlacements:[],hoverClass:t.hoverClass||t._jsPlumb.Defaults.HoverClass,types:[],typeCache:{}},this.cacheTypeItem=function(t,e,n){this._jsPlumb.typeCache[n]=this._jsPlumb.typeCache[n]||{},this._jsPlumb.typeCache[n][t]=e},this.getCachedTypeItem=function(t,e){return this._jsPlumb.typeCache[e]?this._jsPlumb.typeCache[e][t]:null},this.getId=function(){return i};var o=t.overlays||[],s={};if(this.defaultOverlayKeys){for(var r=0;r<this.defaultOverlayKeys.length;r++)Array.prototype.push.apply(o,this._jsPlumb.instance.Defaults[this.defaultOverlayKeys[r]]||[]);for(r=0;r<o.length;r++){var a=d.convertToFullOverlaySpec(o[r]);s[a[1].id]=a}}var l={overlays:s,parameters:t.parameters||{},scope:t.scope||this._jsPlumb.instance.getDefaultScope()};if(this.getDefaultType=function(){return l},this.appendToDefaultType=function(t){for(var e in t)l[e]=t[e]},t.events)for(var u in t.events)this.bind(u,t.events[u]);this.clone=function(){var t=Object.create(this.constructor.prototype);return this.constructor.apply(t,e),t}.bind(this),this.isDetachAllowed=function(t){var e=!0;if(this._jsPlumb.beforeDetach)try{e=this._jsPlumb.beforeDetach(t)}catch(t){n.log("jsPlumb: beforeDetach callback failed",t)}return e},this.isDropAllowed=function(t,e,i,o,s,r,a){var l=this._jsPlumb.instance.checkCondition("beforeDrop",{sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a});if(this._jsPlumb.beforeDrop)try{l=this._jsPlumb.beforeDrop({sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a})}catch(t){n.log("jsPlumb: beforeDrop callback failed",t)}return l};var c=[];this.setListenerComponent=function(t){for(var e=0;e<c.length;e++)c[e][3]=t}},u=function(t,e){var n=t._jsPlumb.types[e],i=t._jsPlumb.instance.getType(n,t.getTypeDescriptor());null!=i&&i.cssClass&&t.canvas&&t._jsPlumb.instance.removeClass(t.canvas,i.cssClass)};n.extend(t.jsPlumbUIComponent,n.EventGenerator,{getParameter:function(t){return this._jsPlumb.parameters[t]},setParameter:function(t,e){this._jsPlumb.parameters[t]=e},getParameters:function(){return this._jsPlumb.parameters},setParameters:function(t){this._jsPlumb.parameters=t},getClass:function(){return d.getClass(this.canvas)},hasClass:function(t){return d.hasClass(this.canvas,t)},addClass:function(t){d.addClass(this.canvas,t)},removeClass:function(t){d.removeClass(this.canvas,t)},updateClasses:function(t,e){d.updateClasses(this.canvas,t,e)},setType:function(t,e,n){this.clearTypes(),this._jsPlumb.types=s(t)||[],a(this,e,n)},getType:function(){return this._jsPlumb.types},reapplyTypes:function(t,e){a(this,t,e)},hasType:function(t){return-1!==this._jsPlumb.types.indexOf(t)},addType:function(t,e,n){var i=s(t),o=!1;if(null!=i){for(var r=0,l=i.length;r<l;r++)this.hasType(i[r])||(this._jsPlumb.types.push(i[r]),o=!0);o&&a(this,e,n)}},removeType:function(t,e,n){var i=s(t),o=!1,r=function(t){var e=this._jsPlumb.types.indexOf(t);return-1!==e&&(u(this,e),this._jsPlumb.types.splice(e,1),!0)}.bind(this);if(null!=i){for(var l=0,c=i.length;l<c;l++)o=r(i[l])||o;o&&a(this,e,n)}},clearTypes:function(t,e){for(var n=this._jsPlumb.types.length,i=0;i<n;i++)u(this,0),this._jsPlumb.types.splice(0,1);a(this,t,e)},toggleType:function(t,e,n){var i=s(t);if(null!=i){for(var o=0,r=i.length;o<r;o++){var l=this._jsPlumb.types.indexOf(i[o]);-1!==l?(u(this,l),this._jsPlumb.types.splice(l,1)):this._jsPlumb.types.push(i[o])}a(this,e,n)}},applyType:function(t,e){if(this.setPaintStyle(t.paintStyle,e),this.setHoverPaintStyle(t.hoverPaintStyle,e),t.parameters)for(var n in t.parameters)this.setParameter(n,t.parameters[n]);this._jsPlumb.paintStyleInUse=this.getPaintStyle()},setPaintStyle:function(t,e){this._jsPlumb.paintStyle=t,this._jsPlumb.paintStyleInUse=this._jsPlumb.paintStyle,i(this),e||this.repaint()},getPaintStyle:function(){return this._jsPlumb.paintStyle},setHoverPaintStyle:function(t,e){this._jsPlumb.hoverPaintStyle=t,i(this),e||this.repaint()},getHoverPaintStyle:function(){return this._jsPlumb.hoverPaintStyle},destroy:function(t){(t||null==this.typeId)&&(this.cleanupListeners(),this.clone=null,this._jsPlumb=null)},isHover:function(){return this._jsPlumb.hover},setHover:function(t,e,n){if(this._jsPlumb&&!this._jsPlumb.instance.currentlyDragging&&!this._jsPlumb.instance.isHoverSuspended()){this._jsPlumb.hover=t;var i=t?"addClass":"removeClass";null!=this.canvas&&(null!=this._jsPlumb.instance.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.instance.hoverClass),null!=this._jsPlumb.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.hoverClass)),null!=this._jsPlumb.hoverPaintStyle&&(this._jsPlumb.paintStyleInUse=t?this._jsPlumb.hoverPaintStyle:this._jsPlumb.paintStyle,this._jsPlumb.instance.isSuspendDrawing()||(n=n||jsPlumbUtil.uuid(),this.repaint({timestamp:n,recalc:!1}))),this.getAttachedElements&&!e&&function(t,e,n,i){var o=t.getAttachedElements();if(o)for(var s=0,r=o.length;s<r;s++)i&&i===o[s]||o[s].setHover(e,!0,n)}(this,t,jsPlumbUtil.uuid(),this)}}});var c=0,h=t.jsPlumbInstance=function(e){this.version="2.15.6",this.Defaults={Anchor:"Bottom",Anchors:[null,null],ConnectionsDetachable:!0,ConnectionOverlays:[],Connector:"Bezier",Container:null,DoNotThrowErrors:!1,DragOptions:{},DropOptions:{},Endpoint:"Dot",EndpointOverlays:[],Endpoints:[null,null],EndpointStyle:{fill:"#456"},EndpointStyles:[null,null],EndpointHoverStyle:null,EndpointHoverStyles:[null,null],HoverPaintStyle:null,LabelStyle:{color:"black"},ListStyle:{},LogEnabled:!1,Overlays:[],MaxConnections:1,PaintStyle:{"stroke-width":4,stroke:"#456"},ReattachConnections:!1,RenderMode:"svg",Scope:"jsPlumb_DefaultScope"},e&&d.extend(this.Defaults,e),this.logEnabled=this.Defaults.LogEnabled,this._connectionTypes={},this._endpointTypes={},n.EventGenerator.apply(this);var i=this,s=function(){var t=c+1;return c++,t}(),r=i.bind,a={},u=1,h=function(t){if(null==t)return null;if(3===t.nodeType||8===t.nodeType)return{el:t,text:!0};var e=i.getElement(t);return{el:e,id:n.isString(t)&&null==e?t:B(e)}};for(var p in this.getInstanceIndex=function(){return s},this.setZoom=function(t,e){return u=t,i.fire("zoom",u),e&&i.repaintEverything(),!0},this.getZoom=function(){return u},this.Defaults)a[p]=this.Defaults[p];var f,g=[];this.unbindContainer=function(){if(null!=f&&g.length>0)for(var t=0;t<g.length;t++)i.off(f,g[t][0],g[t][1])},this.setContainer=function(t){this.unbindContainer(),t=this.getElement(t),this.select().each(function(e){e.moveParent(t)}),this.selectEndpoints().each(function(e){e.moveParent(t)});var e=f;f=t,g.length=0;for(var n={endpointclick:"endpointClick",endpointdblclick:"endpointDblClick"},s=function(t,e,o){var s=e.srcElement||e.target,r=(s&&s.parentNode?s.parentNode._jsPlumb:null)||(s?s._jsPlumb:null)||(s&&s.parentNode&&s.parentNode.parentNode?s.parentNode.parentNode._jsPlumb:null);if(r){r.fire(t,r,e);var a=o&&n[o+t]||t;i.fire(a,r.component||r,e)}},r=function(t,e,n){g.push([t,n]),i.on(f,t,e,n)},a=function(t){r(t,".jtk-connector",function(e){s(t,e)}),r(t,".jtk-endpoint",function(e){s(t,e,"endpoint")}),r(t,".jtk-overlay",function(e){s(t,e)})},l=0;l<o.length;l++)a(o[l]);for(var u in x){var c=x[u].el;c.parentNode===e&&(e.removeChild(c),f.appendChild(c))}},this.getContainer=function(){return f},this.bind=function(t,e){"ready"===t&&v?e():r.apply(i,[t,e])},i.importDefaults=function(t){for(var e in t)i.Defaults[e]=t[e];return t.Container&&i.setContainer(t.Container),i},i.restoreDefaults=function(){return i.Defaults=d.extend({},a),i};var m=null,v=!1,y=[],b={},P={},x={},C={},_={},j=!1,E=[],S=!1,w=null,D=this.Defaults.Scope,A=1,I=function(){return""+A++},k=function(t,e){f?f.appendChild(t):e?this.getElement(e).appendChild(t):this.appendToRoot(t)}.bind(this),O=function(t,e,n,o){var s={c:[],e:[]};if(!S&&null!=(t=i.getElement(t))){var r=B(t),a=t.querySelectorAll(".jtk-managed");null==n&&(n=jsPlumbUtil.uuid());it({elId:r,offset:e,recalc:!1,timestamp:n});for(var l=0;l<a.length;l++)it({elId:a[l].getAttribute("id"),recalc:!0,timestamp:n});var u=i.router.redraw(r,e,n,null,o);if(Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e),a)for(var c=0;c<a.length;c++)u=i.router.redraw(a[c].getAttribute("id"),null,n,null,o,!0),Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e)}return s},M=function(t){return P[t]},T=function(t,e){var o=d.extend({},t);if(e&&d.extend(o,e),o.source&&(o.source.endpoint?o.sourceEndpoint=o.source:o.source=i.getElement(o.source)),o.target&&(o.target.endpoint?o.targetEndpoint=o.target:o.target=i.getElement(o.target)),t.uuids&&(o.sourceEndpoint=M(t.uuids[0]),o.targetEndpoint=M(t.uuids[1])),o.sourceEndpoint&&o.sourceEndpoint.isFull())n.log(i,"could not add connection; source endpoint is full");else if(o.targetEndpoint&&o.targetEndpoint.isFull())n.log(i,"could not add connection; target endpoint is full");else{if(!o.type&&o.sourceEndpoint&&(o.type=o.sourceEndpoint.connectionType),o.sourceEndpoint&&o.sourceEndpoint.connectorOverlays){o.overlays=o.overlays||[];for(var s=0,r=o.sourceEndpoint.connectorOverlays.length;s<r;s++)o.overlays.push(o.sourceEndpoint.connectorOverlays[s])}o.sourceEndpoint&&o.sourceEndpoint.scope&&(o.scope=o.sourceEndpoint.scope),!o["pointer-events"]&&o.sourceEndpoint&&o.sourceEndpoint.connectorPointerEvents&&(o["pointer-events"]=o.sourceEndpoint.connectorPointerEvents);var a=function(t,e,n){var s=function(t,e){var n=d.extend({},t);for(var i in e)e[i]&&(n[i]=e[i]);return n}(e,{anchor:o.anchors?o.anchors[n]:o.anchor,endpoint:o.endpoints?o.endpoints[n]:o.endpoint,paintStyle:o.endpointStyles?o.endpointStyles[n]:o.endpointStyle,hoverPaintStyle:o.endpointHoverStyles?o.endpointHoverStyles[n]:o.endpointHoverStyle});return i.addEndpoint(t,s)},l=function(t,e,n,i){if(o[t]&&!o[t].endpoint&&!o[t+"Endpoint"]&&!o.newConnection){var s=n[B(o[t])];if(s=s?s[i]:null){if(!s.enabled)return!1;var r=d.extend({},s.def);delete r.label;var l=null!=s.endpoint&&s.endpoint._jsPlumb?s.endpoint:a(o[t],r,e);if(l.isFull())return!1;o[t+"Endpoint"]=l,!o.scope&&r.scope&&(o.scope=r.scope),s.uniqueEndpoint?s.endpoint?l.finalEndpoint=s.endpoint:(s.endpoint=l,l.setDeleteOnEmpty(!1)):l.setDeleteOnEmpty(!0),0===e&&s.def.connectorOverlays&&(o.overlays=o.overlays||[],Array.prototype.push.apply(o.overlays,s.def.connectorOverlays))}}};if(!1!==l("source",0,this.sourceEndpointDefinitions,o.type||"default")&&!1!==l("target",1,this.targetEndpointDefinitions,o.type||"default"))return o.sourceEndpoint&&o.targetEndpoint&&(function(t,e){for(var n=t.scope.split(/\s/),i=e.scope.split(/\s/),o=0;o<n.length;o++)for(var s=0;s<i.length;s++)if(i[s]===n[o])return!0;return!1}(o.sourceEndpoint,o.targetEndpoint)||(o=null)),o}}.bind(i),F=function(t){var e=i.Defaults.ConnectionType||i.getDefaultConnectionType();t._jsPlumb=i,t.newConnection=F,t.newEndpoint=N,t.endpointsByUUID=P,t.endpointsByElement=b,t.finaliseConnection=L,t.id="con_"+I();var n=new e(t);return n.isDetachable()&&(n.endpoints[0].initDraggable("_jsPlumbSource"),n.endpoints[1].initDraggable("_jsPlumbTarget")),n},L=i.finaliseConnection=function(t,e,n,o){if(e=e||{},t.suspendedEndpoint||y.push(t),t.pending=null,t.endpoints[0].isTemporarySource=!1,!1!==o&&i.router.newConnection(t),O(t.source),!e.doNotFireConnectionEvent&&!1!==e.fireEvent){var s={connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]};i.fire("connection",s,n)}},N=function(t,e){var n=i.Defaults.EndpointType||d.Endpoint,o=d.extend({},t);o._jsPlumb=i,o.newConnection=F,o.newEndpoint=N,o.endpointsByUUID=P,o.endpointsByElement=b,o.fireDetachEvent=X,o.elementId=e||B(o.source);var s=new n(o);return s.id="ep_"+I(),nt(o.elementId,o.source),d.headless||i.getDragManager().endpointAdded(o.source,e),s},R=function(t,e,n){var i=b[t];if(i&&i.length)for(var o=0,s=i.length;o<s;o++){for(var r=0,a=i[o].connections.length;r<a;r++){if(e(i[o].connections[r]))return}n&&n(i[o])}},G=function(t,e,n){e="block"===e;var i=null;n&&(i=function(t){t.setVisible(e,!0,!0)});var o=h(t);R(o.id,function(t){if(e&&n){var i=t.sourceId===o.id?1:0;t.endpoints[i].isVisible()&&t.setVisible(!0)}else t.setVisible(e)},i)},B=function(t,e,o){if(n.isString(t))return t;if(null==t)return null;var r=i.getAttribute(t,"id");return r&&"undefined"!==r||(2===arguments.length&&void 0!==arguments[1]?r=e:(1===arguments.length||3===arguments.length&&!arguments[2])&&(r="jsPlumb_"+s+"_"+I()),o||i.setAttribute(t,"id",r)),r};this.setConnectionBeingDragged=function(t){j=t},this.isConnectionBeingDragged=function(){return j},this.getManagedElements=function(){return x},this.connectorClass="jtk-connector",this.connectorOutlineClass="jtk-connector-outline",this.connectedClass="jtk-connected",this.hoverClass="jtk-hover",this.endpointClass="jtk-endpoint",this.endpointConnectedClass="jtk-endpoint-connected",this.endpointFullClass="jtk-endpoint-full",this.endpointDropAllowedClass="jtk-endpoint-drop-allowed",this.endpointDropForbiddenClass="jtk-endpoint-drop-forbidden",this.overlayClass="jtk-overlay",this.draggingClass="jtk-dragging",this.elementDraggingClass="jtk-element-dragging",this.sourceElementDraggingClass="jtk-source-element-dragging",this.targetElementDraggingClass="jtk-target-element-dragging",this.endpointAnchorClassPrefix="jtk-endpoint-anchor",this.hoverSourceClass="jtk-source-hover",this.hoverTargetClass="jtk-target-hover",this.dragSelectClass="jtk-drag-select",this.Anchors={},this.Connectors={svg:{}},this.Endpoints={svg:{}},this.Overlays={svg:{}},this.ConnectorRenderers={},this.SVG="svg",this.addEndpoint=function(t,e,o){o=o||{};var s=d.extend({},o);d.extend(s,e),s.endpoint=s.endpoint||i.Defaults.Endpoint,s.paintStyle=s.paintStyle||i.Defaults.EndpointStyle;for(var r=[],a=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],l=0,u=a.length;l<u;l++){s.source=i.getElement(a[l]),et(s.source);var c=B(s.source),h=N(s,c),p=nt(c,s.source,null,!S).info.o;n.addToList(b,c,h),S||h.paint({anchorLoc:h.anchor.compute({xy:[p.left,p.top],wh:E[c],element:h,timestamp:w,rotation:this.getRotation(c)}),timestamp:w}),r.push(h)}return 1===r.length?r[0]:r},this.addEndpoints=function(t,e,o){for(var s=[],r=0,a=e.length;r<a;r++){var l=i.addEndpoint(t,e[r],o);n.isArray(l)?Array.prototype.push.apply(s,l):s.push(l)}return s},this.animate=function(t,e,o){if(!this.animationSupported)return!1;o=o||{};var s=i.getElement(t),r=B(s),a=d.animEvents.step,l=d.animEvents.complete;o[a]=n.wrap(o[a],function(){i.revalidate(r)}),o[l]=n.wrap(o[l],function(){i.revalidate(r)}),i.doAnimate(s,e,o)},this.checkCondition=function(t,e){var o=i.getListener(t),s=!0;if(o&&o.length>0){var r=Array.prototype.slice.call(arguments,1);try{for(var a=0,l=o.length;a<l;a++)s=s&&o[a].apply(o[a],r)}catch(e){n.log(i,"cannot check condition ["+t+"]"+e)}}return s},this.connect=function(t,e){var i,o=T(t,e);if(o){if(null==o.source&&null==o.sourceEndpoint)return void n.log("Cannot establish connection - source does not exist");if(null==o.target&&null==o.targetEndpoint)return void n.log("Cannot establish connection - target does not exist");et(o.source),i=F(o),L(i,o)}return i};var H=[{el:"source",elId:"sourceId",epDefs:"sourceEndpointDefinitions"},{el:"target",elId:"targetId",epDefs:"targetEndpointDefinitions"}],U=function(t,e,n,i){var o,s,r,a=H[n],l=t[a.elId],u=(t[a.el],t.endpoints[n]),c={index:n,originalSourceId:0===n?l:t.sourceId,newSourceId:t.sourceId,originalTargetId:1===n?l:t.targetId,newTargetId:t.targetId,connection:t};if(e.constructor===d.Endpoint)(o=e).addConnection(t),e=o.element;else if(s=B(e),r=this[a.epDefs][s],s===t[a.elId])o=null;else if(r)for(var h in r){if(!r[h].enabled)return;o=null!=r[h].endpoint&&r[h].endpoint._jsPlumb?r[h].endpoint:this.addEndpoint(e,r[h].def),r[h].uniqueEndpoint&&(r[h].endpoint=o),o.addConnection(t)}else o=t.makeEndpoint(0===n,e,s);return null!=o&&(u.detachFromConnection(t),t.endpoints[n]=o,t[a.el]=o.element,t[a.elId]=o.elementId,c[0===n?"newSourceId":"newTargetId"]=o.elementId,Y(c),i||t.repaint()),c.element=e,c}.bind(this);this.setSource=function(t,e,n){var i=U(t,e,0,n);this.router.sourceOrTargetChanged(i.originalSourceId,i.newSourceId,t,i.el,0)},this.setTarget=function(t,e,n){var i=U(t,e,1,n);this.router.sourceOrTargetChanged(i.originalTargetId,i.newTargetId,t,i.el,1)},this.deleteEndpoint=function(t,e,n){var o="string"==typeof t?P[t]:t;return o&&i.deleteObject({endpoint:o,dontUpdateHover:e,deleteAttachedObjects:n}),i},this.deleteEveryEndpoint=function(){var t=i.setSuspendDrawing(!0);for(var e in b){var n=b[e];if(n&&n.length)for(var o=0,s=n.length;o<s;o++)i.deleteEndpoint(n[o],!0)}b={},x={},P={},C={},_={},i.router.reset();var r=i.getDragManager();return r&&r.reset(),t||i.setSuspendDrawing(!1),i};var X=function(t,e,n){var o=i.Defaults.ConnectionType||i.getDefaultConnectionType(),s=t.constructor===o?{connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]}:t;e&&i.fire("connectionDetached",s,n),i.fire("internal.connectionDetached",s,n),i.router.connectionDetached(s)},Y=i.fireMoveEvent=function(t,e){i.fire("connectionMoved",t,e)};this.unregisterEndpoint=function(t){for(var e in t._jsPlumb.uuid&&(P[t._jsPlumb.uuid]=null),i.router.deleteEndpoint(t),b){var n=b[e];if(n){for(var o=[],s=0,r=n.length;s<r;s++)n[s]!==t&&o.push(n[s]);b[e]=o}b[e].length<1&&delete b[e]}};this.deleteConnection=function(t,e){return!(null==t||!(e=e||{}).force&&!n.functionChain(!0,!1,[[t.endpoints[0],"isDetachAllowed",[t]],[t.endpoints[1],"isDetachAllowed",[t]],[t,"isDetachAllowed",[t]],[i,"checkCondition",["beforeDetach",t]]]))&&(t.setHover(!1),X(t,!t.pending&&!1!==e.fireEvent,e.originalEvent),t.endpoints[0].detachFromConnection(t),t.endpoints[1].detachFromConnection(t),n.removeWithFunction(y,function(e){return t.id===e.id}),t.cleanup(),t.destroy(),!0)},this.deleteEveryConnection=function(t){t=t||{};var e=y.length,n=0;return i.batch(function(){for(var o=0;o<e;o++)n+=i.deleteConnection(y[0],t)?1:0}),n},this.deleteConnectionsForElement=function(t,e){e=e||{},t=i.getElement(t);var n=B(t),o=b[n];if(o&&o.length)for(var s=0,r=o.length;s<r;s++)o[s].deleteEveryConnection(e);return i},this.deleteObject=function(t){var e={endpoints:{},connections:{},endpointCount:0,connectionCount:0},o=!1!==t.deleteAttachedObjects,s=function(n){null!=n&&null==e.connections[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.connections[n.id]=n,e.connectionCount++)};for(var r in t.connection?s(t.connection):function(n){if(null!=n&&null==e.endpoints[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.endpoints[n.id]=n,e.endpointCount++,o))for(var i=0;i<n.connections.length;i++){var r=n.connections[i];s(r)}}(t.endpoint),e.connections){var a=e.connections[r];if(a._jsPlumb){n.removeWithFunction(y,function(t){return a.id===t.id}),X(a,!1!==t.fireEvent&&!a.pending,t.originalEvent);var l=null==t.deleteAttachedObjects?null:!t.deleteAttachedObjects;a.endpoints[0].detachFromConnection(a,null,l),a.endpoints[1].detachFromConnection(a,null,l),a.cleanup(!0),a.destroy(!0)}}for(var u in e.endpoints){var c=e.endpoints[u];c._jsPlumb&&(i.unregisterEndpoint(c),c.cleanup(!0),c.destroy(!0))}return e};var $=function(t,e,n){return function(){return function(t,e,n,i){for(var o=0,s=t.length;o<s;o++)t[o][e].apply(t[o],n);return i(t)}(t,e,arguments,n)}},z=function(t,e){return function(){return function(t,e,n){for(var i=[],o=0,s=t.length;o<s;o++)i.push([t[o][e].apply(t[o],n),t[o]]);return i}(t,e,arguments)}},W=function(t,e){var n=[];if(t)if("string"==typeof t){if("*"===t)return t;n.push(t)}else if(e)n=t;else if(t.length)for(var i=0,o=t.length;i<o;i++)n.push(h(t[i]).id);else n.push(h(t).id);return n},q=function(t,e,n){return"*"===t||(t.length>0?-1!==t.indexOf(e):!n)};this.getConnections=function(t,e){t?t.constructor===String&&(t={scope:t}):t={};for(var n=t.scope||i.getDefaultScope(),o=W(n,!0),s=W(t.source),r=W(t.target),a=!e&&o.length>1?{}:[],l=function(t,n){if(!e&&o.length>1){var i=a[t];null==i&&(i=a[t]=[]),i.push(n)}else a.push(n)},u=0,c=y.length;u<c;u++){var h=y[u],d=h.proxies&&h.proxies[0]?h.proxies[0].originalEp.elementId:h.sourceId,p=h.proxies&&h.proxies[1]?h.proxies[1].originalEp.elementId:h.targetId;q(o,h.scope)&&q(s,d)&&q(r,p)&&l(h.scope,h)}return a};var V=function(t,e){return function(n){for(var i=0,o=t.length;i<o;i++)n(t[i]);return e(t)}},J=function(t){return function(e){return t[e]}},Z=function(t,e){var n,i,o={length:t.length,each:V(t,e),get:J(t)},s=["setHover","removeAllOverlays","setLabel","addClass","addOverlay","removeOverlay","removeOverlays","showOverlay","hideOverlay","showOverlays","hideOverlays","setPaintStyle","setHoverPaintStyle","setSuspendEvents","setParameter","setParameters","setVisible","repaint","addType","toggleType","removeType","removeClass","setType","bind","unbind"],r=["getLabel","getOverlay","isHover","getParameter","getParameters","getPaintStyle","getHoverPaintStyle","isVisible","hasType","getType","isSuspendEvents"];for(n=0,i=s.length;n<i;n++)o[s[n]]=$(t,s[n],e);for(n=0,i=r.length;n<i;n++)o[r[n]]=z(t,r[n]);return o},K=function(t){var e=Z(t,K);return d.extend(e,{setDetachable:$(t,"setDetachable",K),setReattach:$(t,"setReattach",K),setConnector:$(t,"setConnector",K),delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteConnection(t[e])},isDetachable:z(t,"isDetachable"),isReattach:z(t,"isReattach")})},Q=function(t){var e=Z(t,Q);return d.extend(e,{setEnabled:$(t,"setEnabled",Q),setAnchor:$(t,"setAnchor",Q),isEnabled:z(t,"isEnabled"),deleteEveryConnection:function(){for(var e=0,n=t.length;e<n;e++)t[e].deleteEveryConnection()},delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteEndpoint(t[e])}})};this.select=function(t){return(t=t||{}).scope=t.scope||"*",K(t.connections||i.getConnections(t,!0))},this.selectEndpoints=function(t){(t=t||{}).scope=t.scope||"*";var e=!t.element&&!t.source&&!t.target,n=e?"*":W(t.element),i=e?"*":W(t.source),o=e?"*":W(t.target),s=W(t.scope,!0),r=[];for(var a in b){var l=q(n,a,!0),u=q(i,a,!0),c="*"!==i,h=q(o,a,!0),d="*"!==o;if(l||u||h)t:for(var p=0,f=b[a].length;p<f;p++){var g=b[a][p];if(q(s,g.scope,!0)){var m=c&&i.length>0&&!g.isSource,v=d&&o.length>0&&!g.isTarget;if(m||v)continue t;r.push(g)}}}return Q(r)},this.getAllConnections=function(){return y},this.getDefaultScope=function(){return D},this.getEndpoint=M,this.getEndpoints=function(t){return b[h(t).id]||[]},this.getDefaultEndpointType=function(){return d.Endpoint},this.getDefaultConnectionType=function(){return d.Connection},this.getId=B,this.draw=O,this.info=h,this.appendElement=k;var tt=!1;this.isHoverSuspended=function(){return tt},this.setHoverSuspended=function(t){tt=t},this.hide=function(t,e){return G(t,"none",e),i},this.idstamp=I;var et=function(t){if(!f&&t){var e=i.getElement(t);e.offsetParent&&i.setContainer(e.offsetParent)}},nt=i.manage=function(t,e,n,o){return x[t]?o&&(x[t].info=it({elId:t,timestamp:w,recalc:!0})):(x[t]={el:e,endpoints:[],connections:[],rotation:0},x[t].info=it({elId:t,timestamp:w}),i.addClass(e,"jtk-managed"),n||i.fire("manageElement",{id:t,info:x[t].info,el:e})),x[t]};this.unmanage=function(t){if(x[t]){var e=x[t].el;i.removeClass(e,"jtk-managed"),delete x[t],i.fire("unmanageElement",{id:t,el:e})}},this.rotate=function(t,e,n){return x[t]&&(x[t].rotation=e,x[t].el.style.transform="rotate("+e+"deg)",x[t].el.style.transformOrigin="center center",!0!==n)?this.revalidate(t):{c:[],e:[]}},this.getRotation=function(t){return x[t]&&x[t].rotation||0};var it=function(t){var e,n=t.timestamp,o=t.recalc,s=t.offset,r=t.elId;return S&&!n&&(n=w),!o&&n&&n===_[r]?{o:t.offset||C[r],s:E[r]}:(o||!s&&null==C[r]?null!=(e=x[r]?x[r].el:null)&&(E[r]=i.getSize(e),C[r]=i.getOffset(e),_[r]=n):(C[r]=s||C[r],null==E[r]&&null!=(e=x[r].el)&&(E[r]=i.getSize(e)),_[r]=n),C[r]&&!C[r].right&&(C[r].right=C[r].left+E[r][0],C[r].bottom=C[r].top+E[r][1],C[r].width=E[r][0],C[r].height=E[r][1],C[r].centerx=C[r].left+C[r].width/2,C[r].centery=C[r].top+C[r].height/2),{o:C[r],s:E[r]})};this.updateOffset=it,this.init=function(){v||(i.Defaults.Container&&i.setContainer(i.Defaults.Container),i.router=new t.jsPlumb.DefaultRouter(i),i.anchorManager=i.router.anchorManager,v=!0,i.fire("ready",i))}.bind(this),this.log=m,this.jsPlumbUIComponent=l,this.makeAnchor=function(){var e,o=function(e,n){if(t.jsPlumb.Anchors[e])return new t.jsPlumb.Anchors[e](n);if(!i.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown anchor type '"+e+"'"}};if(0===arguments.length)return null;var s=arguments[0],r=arguments[1],a=null;if(s.compute&&s.getOrientation)return s;if("string"==typeof s)a=o(arguments[0],{elementId:r,jsPlumbInstance:i});else if(n.isArray(s))if(n.isArray(s[0])||n.isString(s[0]))2===s.length&&n.isObject(s[1])?n.isString(s[0])?(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i},s[1]),a=o(s[0],e)):(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i,anchors:s[0]},s[1]),a=new t.jsPlumb.DynamicAnchor(e)):a=new d.DynamicAnchor({anchors:s,selector:null,elementId:r,jsPlumbInstance:i});else{var l={x:s[0],y:s[1],orientation:s.length>=4?[s[2],s[3]]:[0,0],offsets:s.length>=6?[s[4],s[5]]:[0,0],elementId:r,jsPlumbInstance:i,cssClass:7===s.length?s[6]:null};(a=new t.jsPlumb.Anchor(l)).clone=function(){return new t.jsPlumb.Anchor(l)}}return a.id||(a.id="anchor_"+I()),a},this.makeAnchors=function(e,o,s){for(var r=[],a=0,l=e.length;a<l;a++)"string"==typeof e[a]?r.push(t.jsPlumb.Anchors[e[a]]({elementId:o,jsPlumbInstance:s})):n.isArray(e[a])&&r.push(i.makeAnchor(e[a],o,s));return r},this.makeDynamicAnchor=function(e,n){return new t.jsPlumb.DynamicAnchor({anchors:e,selector:n,elementId:null,jsPlumbInstance:i})},this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={};var ot=function(e,o,s,r,a){var u=new l(o),c=o._jsPlumb.EndpointDropHandler({jsPlumb:i,enabled:function(){return e.def.enabled},isFull:function(){var t=i.select({target:e.id}).length;return e.def.maxConnections>0&&t>=e.def.maxConnections},element:e.el,elementId:e.id,isSource:r,isTarget:a,addClass:function(t){i.addClass(e.el,t)},removeClass:function(t){i.removeClass(e.el,t)},onDrop:function(t){t.endpoints[0].anchor.locked=!1},isDropAllowed:function(){return u.isDropAllowed.apply(u,arguments)},isRedrop:function(t){return null!=t.suspendedElement&&null!=t.suspendedEndpoint&&t.suspendedEndpoint.element===e.el},getEndpoint:function(n){var s=e.def.endpoint;if(null==s||null==s._jsPlumb){var r=i.deriveEndpointAndAnchorSpec(n.getType().join(" "),!0),a=r.endpoints?t.jsPlumb.extend(o,{endpoint:e.def.def.endpoint||r.endpoints[1]}):o;r.anchors&&(a=t.jsPlumb.extend(a,{anchor:e.def.def.anchor||r.anchors[1]})),(s=i.addEndpoint(e.el,a))._mtNew=!0}if(o.uniqueEndpoint&&(e.def.endpoint=s),s.setDeleteOnEmpty(!0),n.isDetachable()&&s.initDraggable(),null!=s.anchor.positionFinder){var l=i.getUIPosition(arguments,i.getZoom()),u=i.getOffset(e.el),c=i.getSize(e.el),h=null==l?[0,0]:s.anchor.positionFinder(l,u,c,s.anchor.constructorParams);s.anchor.x=h[0],s.anchor.y=h[1]}return s},maybeCleanup:function(t){t._mtNew&&0===t.connections.length?i.deleteObject({endpoint:t}):delete t._mtNew}}),h=t.jsPlumb.dragEvents.drop;return s.scope=s.scope||o.scope||i.Defaults.Scope,s[h]=n.wrap(s[h],c,!0),s.rank=o.rank||0,a&&(s[t.jsPlumb.dragEvents.over]=function(){return!0}),!1===o.allowLoopback&&(s.canDrop=function(t){return t.getDragElement()._jsPlumbRelatedElement!==e.el}),i.initDroppable(e.el,s,"internal"),c};this.makeTarget=function(e,n,o){var s=t.jsPlumb.extend({_jsPlumb:this},o);t.jsPlumb.extend(s,n);for(var r=s.maxConnections||-1,a=function(e){var n=h(e),o=n.id,a=t.jsPlumb.extend({},s.dropOptions||{}),l=s.connectionType||"default";this.targetEndpointDefinitions[o]=this.targetEndpointDefinitions[o]||{},et(o),n.el._isJsPlumbGroup&&null==a.rank&&(a.rank=-1);var u={def:t.jsPlumb.extend({},s),uniqueEndpoint:s.uniqueEndpoint,maxConnections:r,enabled:!0};s.createEndpoint&&(u.uniqueEndpoint=!0,u.endpoint=i.addEndpoint(e,u.def),u.endpoint.setDeleteOnEmpty(!1)),n.def=u,this.targetEndpointDefinitions[o][l]=u,ot(n,s,a,!0===s.isSource,!0),n.el._katavorioDrop[n.el._katavorioDrop.length-1].targetDef=u}.bind(this),l=e.length&&e.constructor!==String?e:[e],u=0,c=l.length;u<c;u++)a(l[u]);return this},this.unmakeTarget=function(t,e){var n=h(t);return i.destroyDroppable(n.el,"internal"),e||delete this.targetEndpointDefinitions[n.id],this},this.makeSource=function(e,o,s){var r=t.jsPlumb.extend({_jsPlumb:this},s);t.jsPlumb.extend(r,o);var a=r.connectionType||"default",l=i.deriveEndpointAndAnchorSpec(a);r.endpoint=r.endpoint||l.endpoints[0],r.anchor=r.anchor||l.anchors[0];for(var c=r.maxConnections||-1,d=r.onMaxConnections,p=function(o){var s=o.id,l=this.getElement(o.el);this.sourceEndpointDefinitions[s]=this.sourceEndpointDefinitions[s]||{},et(s);var h={def:t.jsPlumb.extend({},r),uniqueEndpoint:r.uniqueEndpoint,maxConnections:c,enabled:!0};r.createEndpoint&&(h.uniqueEndpoint=!0,h.endpoint=i.addEndpoint(e,h.def),h.endpoint.setDeleteOnEmpty(!1)),this.sourceEndpointDefinitions[s][a]=h,o.def=h;var p=t.jsPlumb.dragEvents.stop,f=t.jsPlumb.dragEvents.drag,g=t.jsPlumb.extend({},r.dragOptions||{}),m=g.drag,v=g.stop,y=null,b=!1;g.scope=g.scope||r.scope,g[f]=n.wrap(g[f],function(){m&&m.apply(this,arguments),b=!1}),g[p]=n.wrap(g[p],function(){if(v&&v.apply(this,arguments),this.currentlyDragging=!1,null!=y._jsPlumb){var t=r.anchor||this.Defaults.Anchor,e=y.anchor,n=y.connections[0],o=this.makeAnchor(t,s,this),a=y.element;if(null!=o.positionFinder){var l=i.getOffset(a),u=this.getSize(a),c={left:l.left+e.x*u[0],top:l.top+e.y*u[1]},h=o.positionFinder(c,l,u,o.constructorParams);o.x=h[0],o.y=h[1]}y.setAnchor(o,!0),y.repaint(),this.repaint(y.elementId),null!=n&&this.repaint(n.targetId)}}.bind(this));var P=function(e){if(3!==e.which&&2!==e.button){s=this.getId(this.getElement(o.el));var h=this.sourceEndpointDefinitions[s][a];if(h.enabled){if(r.filter)if(!1===(n.isString(r.filter)?function(t,e,n,i,o){for(var s=t.target||t.srcElement,r=!1,a=i.getSelector(e,n),l=0;l<a.length;l++)if(a[l]===s){r=!0;break}return o?!r:r}(e,o.el,r.filter,this,r.filterExclude):r.filter(e,o.el)))return;var p=this.select({source:s}).length;if(h.maxConnections>=0&&p>=h.maxConnections)return d&&d({element:o.el,maxConnections:c},e),!1;var f=t.jsPlumb.getPositionOnElement(e,l,u),m={};t.jsPlumb.extend(m,h.def),m.isTemporarySource=!0,m.anchor=[f[0],f[1],0,0],m.dragOptions=g,h.def.scope&&(m.scope=h.def.scope),y=this.addEndpoint(s,m),b=!0,y.setDeleteOnEmpty(!0),h.uniqueEndpoint&&(h.endpoint?y.finalEndpoint=h.endpoint:(h.endpoint=y,y.setDeleteOnEmpty(!1)));var v=function(){i.off(y.canvas,"mouseup",v),i.off(o.el,"mouseup",v),b&&(b=!1,i.deleteEndpoint(y))};i.on(y.canvas,"mouseup",v),i.on(o.el,"mouseup",v);var P={};if(h.def.extract)for(var x in h.def.extract){var C=(e.srcElement||e.target).getAttribute(x);C&&(P[h.def.extract[x]]=C)}i.trigger(y.canvas,"mousedown",e,P),n.consume(e)}}}.bind(this);this.on(o.el,"mousedown",P),h.trigger=P,r.filter&&(n.isString(r.filter)||n.isFunction(r.filter))&&i.setDragFilter(o.el,r.filter);var x=t.jsPlumb.extend({},r.dropOptions||{});ot(o,r,x,!0,!0===r.isTarget)}.bind(this),f=e.length&&e.constructor!==String?e:[e],g=0,m=f.length;g<m;g++)p(h(f[g]));return this},this.unmakeSource=function(t,e,n){var o=h(t);i.destroyDroppable(o.el,"internal");var s=this.sourceEndpointDefinitions[o.id];if(s)for(var r in s)if(null==e||e===r){var a=s[r].trigger;a&&i.off(o.el,"mousedown",a),n||delete this.sourceEndpointDefinitions[o.id][r]}return this},this.unmakeEverySource=function(){for(var t in this.sourceEndpointDefinitions)i.unmakeSource(t,null,!0);return this.sourceEndpointDefinitions={},this};var st=function(t,e,i){e=n.isArray(e)?e:[e];var o=B(t);i=i||"default";for(var s=0;s<e.length;s++){var r=this[e[s]][o];if(r&&r[i])return r[i].def.scope||this.Defaults.Scope}}.bind(this),rt=function(t,e,i,o){i=n.isArray(i)?i:[i];var s=B(t);o=o||"default";for(var r=0;r<i.length;r++){var a=this[i[r]][s];a&&a[o]&&(a[o].def.scope=e)}}.bind(this);this.getScope=function(t,e){return st(t,["sourceEndpointDefinitions","targetEndpointDefinitions"])},this.getSourceScope=function(t){return st(t,"sourceEndpointDefinitions")},this.getTargetScope=function(t){return st(t,"targetEndpointDefinitions")},this.setScope=function(t,e,n){this.setSourceScope(t,e,n),this.setTargetScope(t,e,n)},this.setSourceScope=function(t,e,n){rt(t,e,"sourceEndpointDefinitions",n),this.setDragScope(t,e)},this.setTargetScope=function(t,e,n){rt(t,e,"targetEndpointDefinitions",n),this.setDropScope(t,e)},this.unmakeEveryTarget=function(){for(var t in this.targetEndpointDefinitions)i.unmakeTarget(t,!0);return this.targetEndpointDefinitions={},this};var at=function(t,e,o,s,r){var a,l,u,c="source"===t?this.sourceEndpointDefinitions:this.targetEndpointDefinitions;if(r=r||"default",e.length&&!n.isString(e)){a=[];for(var d=0,p=e.length;d<p;d++)c[(l=h(e[d])).id]&&c[l.id][r]&&(a[d]=c[l.id][r].enabled,u=s?!a[d]:o,c[l.id][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}else{var f=(l=h(e)).id;c[f]&&c[f][r]&&(a=c[f][r].enabled,u=s?!a:o,c[f][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}return a}.bind(this),lt=function(t,e){if(null!=t){if(n.isString(t)||!t.length)return e.apply(this,[t]);if(t.length)return e.apply(this,[t[0]])}}.bind(this);this.toggleSourceEnabled=function(t,e){return at("source",t,null,!0,e),this.isSourceEnabled(t,e)},this.setSourceEnabled=function(t,e,n){return at("source",t,e,null,n)},this.isSource=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isSourceEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.toggleTargetEnabled=function(t,e){return at("target",t,null,!0,e),this.isTargetEnabled(t,e)},this.isTarget=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isTargetEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.setTargetEnabled=function(t,e,n){return at("target",t,e,null,n)},this.ready=function(t){i.bind("ready",t)};this.repaint=function(t,e,n){return function(t,e){if("object"==typeof t&&t.length)for(var n=0,o=t.length;n<o;n++)e(t[n]);else e(t);return i}(t,function(t){O(t,e,n)})},this.revalidate=function(t,e,n){var o=n?t:i.getId(t);i.updateOffset({elId:o,recalc:!0,timestamp:e});var s=i.getDragManager();return s&&s.updateOffsets(o),O(t,null,e)},this.repaintEverything=function(){var t,e=jsPlumbUtil.uuid();for(t in b)i.updateOffset({elId:t,recalc:!0,timestamp:e});for(t in b)O(t,null,e);return this},this.removeAllEndpoints=function(t,e,n){n=n||[];var o=function(t){var s,r,a=h(t),l=b[a.id];if(l)for(n.push(a),s=0,r=l.length;s<r;s++)i.deleteEndpoint(l[s],!1);if(delete b[a.id],e&&a.el&&3!==a.el.nodeType&&8!==a.el.nodeType)for(s=0,r=a.el.childNodes.length;s<r;s++)o(a.el.childNodes[s])};return o(t),this};var ut=function(t,e){i.removeAllEndpoints(t.id,!0,e);for(var n=i.getDragManager(),o=function(t){n&&n.elementRemoved(t.id),i.router.elementRemoved(t.id),i.isSource(t.el)&&i.unmakeSource(t.el),i.isTarget(t.el)&&i.unmakeTarget(t.el),i.destroyDraggable(t.el),i.destroyDroppable(t.el),delete i.floatingConnections[t.id],delete x[t.id],delete C[t.id],t.el&&(i.removeElement(t.el),t.el._jsPlumb=null)},s=1;s<e.length;s++)o(e[s]);o(t)};this.remove=function(t,e){var n=h(t),o=[];return n.text&&n.el.parentNode?n.el.parentNode.removeChild(n.el):n.id&&i.batch(function(){ut(n,o)},!0===e),i},this.empty=function(t,e){var n=[],o=function(t,e){var i=h(t);if(i.text)i.el.parentNode.removeChild(i.el);else if(i.el){for(;i.el.childNodes.length>0;)o(i.el.childNodes[0]);e||ut(i,n)}};return i.batch(function(){o(t,!0)},!1===e),i},this.reset=function(t){i.silently(function(){tt=!1,i.removeAllGroups(),i.removeGroupManager(),i.deleteEveryEndpoint(),t||i.unbind(),this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={},y.length=0,this.doReset&&this.doReset()}.bind(this))},this.destroy=function(){this.reset(),f=null,g=null};var ct=function(t){t.canvas&&t.canvas.parentNode&&t.canvas.parentNode.removeChild(t.canvas),t.cleanup(),t.destroy()};this.clear=function(){i.select().each(ct),i.selectEndpoints().each(ct),b={},P={}},this.setDefaultScope=function(t){return D=t,i},this.deriveEndpointAndAnchorSpec=function(t,e){for(var n=((e?"":"default ")+t).split(/[\s]/),o=null,s=null,r=null,a=null,l=0;l<n.length;l++){var u=i.getType(n[l],"connection");u&&(u.endpoints&&(o=u.endpoints),u.endpoint&&(s=u.endpoint),u.anchors&&(a=u.anchors),u.anchor&&(r=u.anchor))}return{endpoints:o||[s,s],anchors:a||[r,r]}},this.setId=function(t,e,i){var o;n.isString(t)?o=t:(t=this.getElement(t),o=this.getId(t));var s=this.getConnections({source:o,scope:"*"},!0),r=this.getConnections({target:o,scope:"*"},!0);e=""+e,i?t=this.getElement(e):(t=this.getElement(o),this.setAttribute(t,"id",e)),b[e]=b[o]||[];for(var a=0,l=b[e].length;a<l;a++)b[e][a].setElementId(e),b[e][a].setReferenceElement(t);delete b[o],this.sourceEndpointDefinitions[e]=this.sourceEndpointDefinitions[o],delete this.sourceEndpointDefinitions[o],this.targetEndpointDefinitions[e]=this.targetEndpointDefinitions[o],delete this.targetEndpointDefinitions[o],this.router.changeId(o,e);var u=this.getDragManager();u&&u.changeId(o,e),x[e]=x[o],delete x[o];var c=function(n,i,o){for(var s=0,r=n.length;s<r;s++)n[s].endpoints[i].setElementId(e),n[s].endpoints[i].setReferenceElement(t),n[s][o+"Id"]=e,n[s][o]=t};c(s,0,"source"),c(r,1,"target"),this.repaint(e)},this.setDebugLog=function(t){m=t},this.setSuspendDrawing=function(t,e){var n=S;return S=t,w=t?(new Date).getTime():null,e&&this.repaintEverything(),n},this.isSuspendDrawing=function(){return S},this.getSuspendedAt=function(){return w},this.batch=function(t,e){var i=this.isSuspendDrawing();i||this.setSuspendDrawing(!0);try{t()}catch(t){n.log("Function run while suspended failed",t)}i||this.setSuspendDrawing(!1,!e)},this.doWhileSuspended=this.batch,this.getCachedData=function(t){var e=C[t];return e?{o:e,s:E[t]}:it({elId:t})},this.show=function(t,e){return G(t,"block",e),i},this.toggleVisible=function(t,e){var n=null;e&&(n=function(t){var e=t.isVisible();t.setVisible(!e)}),R(t,function(t){var e=t.isVisible();t.setVisible(!e)},n)},this.addListener=this.bind;var ht=[];this.registerFloatingConnection=function(t,e,i){ht[t.id]=e,n.addToList(b,t.id,i)},this.getFloatingConnectionFor=function(t){return ht[t]},this.listManager=new t.jsPlumbListManager(this,this.Defaults.ListStyle)};n.extend(t.jsPlumbInstance,n.EventGenerator,{setAttribute:function(t,e,n){this.setAttribute(t,e,n)},getAttribute:function(e,n){return this.getAttribute(t.jsPlumb.getElement(e),n)},convertToFullOverlaySpec:function(t){return n.isString(t)&&(t=[t,{}]),t[1].id=t[1].id||n.uuid(),t},registerConnectionType:function(e,n){if(this._connectionTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._connectionTypes[e].overlays=i}},registerConnectionTypes:function(t){for(var e in t)this.registerConnectionType(e,t[e])},registerEndpointType:function(e,n){if(this._endpointTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._endpointTypes[e].overlays=i}},registerEndpointTypes:function(t){for(var e in t)this.registerEndpointType(e,t[e])},getType:function(t,e){return"connection"===e?this._connectionTypes[t]:this._endpointTypes[t]},setIdChanged:function(t,e){this.setId(t,e,!0)},setParent:function(t,e){var n=this.getElement(t),i=this.getId(n),o=this.getElement(e),s=this.getId(o),r=this.getDragManager();n.parentNode.removeChild(n),o.appendChild(n),r&&r.setParent(n,i,o,s)},extend:function(t,e,n){var i;if(n)for(i=0;i<n.length;i++)t[n[i]]=e[n[i]];else for(i in e)t[i]=e[i];return t},floatingConnections:{},getFloatingAnchorIndex:function(t){return t.endpoints[0].isFloating()?0:t.endpoints[1].isFloating()?1:-1},proxyConnection:function(t,e,n,i,o,s){var r,a=t.endpoints[e].elementId,l=t.endpoints[e];t.proxies=t.proxies||[],(r=t.proxies[e]?t.proxies[e].ep:this.addEndpoint(n,{endpoint:o(t,e),anchor:s(t,e),parameters:{isProxyEndpoint:!0}})).setDeleteOnEmpty(!0),t.proxies[e]={ep:r,originalEp:l},0===e?this.router.sourceOrTargetChanged(a,i,t,n,0):this.router.sourceOrTargetChanged(a,i,t,n,1),l.detachFromConnection(t,null,!0),r.connections=[t],t.endpoints[e]=r,l.setVisible(!1),t.setVisible(!0),this.revalidate(n)},unproxyConnection:function(t,e,n){if(null!=t._jsPlumb&&null!=t.proxies&&null!=t.proxies[e]){var i=t.proxies[e].originalEp.element,o=t.proxies[e].originalEp.elementId;t.endpoints[e]=t.proxies[e].originalEp,0===e?this.router.sourceOrTargetChanged(n,o,t,i,0):this.router.sourceOrTargetChanged(n,o,t,i,1),t.proxies[e].ep.detachFromConnection(t,null),t.proxies[e].originalEp.addConnection(t),t.isVisible()&&t.proxies[e].originalEp.setVisible(!0),delete t.proxies[e]}}});var d=new h;t.jsPlumb=d,d.getInstance=function(t,e){var n=new h(t);if(e)for(var i in e)n[i]=e[i];return n.init(),n},d.each=function(t,e){if(null!=t)if("string"==typeof t)e(d.getElement(t));else if(null!=t.length)for(var n=0;n<t.length;n++)e(d.getElement(t[n]));else e(t)},e.jsPlumb=d}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil;e.OverlayCapableJsPlumbUIComponent=function(e){t.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.overlays={},this._jsPlumb.overlayPositions={},e.label&&(this.getDefaultType().overlays.__label=["Label",{label:e.label,location:e.labelLocation||this.defaultLabelLocation||.5,labelStyle:e.labelStyle||this._jsPlumb.instance.Defaults.LabelStyle,id:"__label"}]),this.setListenerComponent=function(t){if(this._jsPlumb)for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].setListenerComponent(t)}},e.OverlayCapableJsPlumbUIComponent.applyType=function(t,e){if(e.overlays){var n,i={};for(n in e.overlays){var o=t._jsPlumb.overlays[e.overlays[n][1].id];if(o)o.updateFrom(e.overlays[n][1]),i[e.overlays[n][1].id]=!0,o.reattach(t._jsPlumb.instance,t);else{var s=t.getCachedTypeItem("overlay",e.overlays[n][1].id);null!=s?(s.reattach(t._jsPlumb.instance,t),s.setVisible(!0),s.updateFrom(e.overlays[n][1]),t._jsPlumb.overlays[s.id]=s):s=t.addOverlay(e.overlays[n],!0),i[s.id]=!0}}for(n in t._jsPlumb.overlays)null==i[t._jsPlumb.overlays[n].id]&&t.removeOverlay(t._jsPlumb.overlays[n].id,!0)}},n.extend(e.OverlayCapableJsPlumbUIComponent,t.jsPlumbUIComponent,{setHover:function(t,e){if(this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged())for(var n in this._jsPlumb.overlays)this._jsPlumb.overlays[n][t?"addClass":"removeClass"](this._jsPlumb.instance.hoverClass)},addOverlay:function(t,i){var o=function(t,i){var o=null;if(n.isArray(i)){var s=i[0],r=e.extend({component:t,_jsPlumb:t._jsPlumb.instance},i[1]);3===i.length&&e.extend(r,i[2]),o=new(e.Overlays[t._jsPlumb.instance.getRenderMode()][s])(r)}else o=i.constructor===String?new(e.Overlays[t._jsPlumb.instance.getRenderMode()][i])({component:t,_jsPlumb:t._jsPlumb.instance}):i;return o.id=o.id||n.uuid(),t.cacheTypeItem("overlay",o,o.id),t._jsPlumb.overlays[o.id]=o,o}(this,t);if(this.getData&&"Label"===o.type&&n.isArray(t)){var s=this.getData(),r=t[1];if(s){var a=r.labelLocationAttribute||"labelLocation",l=s?s[a]:null;l&&(o.loc=l)}}return i||this.repaint(),o},getOverlay:function(t){return this._jsPlumb.overlays[t]},getOverlays:function(){return this._jsPlumb.overlays},hideOverlay:function(t){var e=this.getOverlay(t);e&&e.hide()},hideOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].hide()},showOverlay:function(t){var e=this.getOverlay(t);e&&e.show()},showOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].show()},removeAllOverlays:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup&&this._jsPlumb.overlays[e].cleanup();this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null,this._jsPlumb.overlayPlacements={},t||this.repaint()},removeOverlay:function(t,e){var n=this._jsPlumb.overlays[t];n&&(n.setVisible(!1),!e&&n.cleanup&&n.cleanup(),delete this._jsPlumb.overlays[t],this._jsPlumb.overlayPositions&&delete this._jsPlumb.overlayPositions[t],this._jsPlumb.overlayPlacements&&delete this._jsPlumb.overlayPlacements[t])},removeOverlays:function(){for(var t=0,e=arguments.length;t<e;t++)this.removeOverlay(arguments[t])},moveParent:function(t){if(this.bgCanvas&&(this.bgCanvas.parentNode.removeChild(this.bgCanvas),t.appendChild(this.bgCanvas)),this.canvas&&this.canvas.parentNode)for(var e in this.canvas.parentNode.removeChild(this.canvas),t.appendChild(this.canvas),this._jsPlumb.overlays)if(this._jsPlumb.overlays[e].isAppendedAtTopLevel){var n=this._jsPlumb.overlays[e].getElement();n.parentNode.removeChild(n),t.appendChild(n)}},getLabel:function(){var t=this.getOverlay("__label");return null!=t?t.getLabel():null},getLabelOverlay:function(){return this.getOverlay("__label")},setLabel:function(t){var n=this.getOverlay("__label");n?t.constructor===String||t.constructor===Function?n.setLabel(t):(t.label&&n.setLabel(t.label),t.location&&n.setLocation(t.location)):(n=function(t,n){var i={cssClass:n.cssClass,labelStyle:t.labelStyle,id:"__label",component:t,_jsPlumb:t._jsPlumb.instance},o=e.extend(i,n);return new(e.Overlays[t._jsPlumb.instance.getRenderMode()].Label)(o)}(this,t.constructor===String||t.constructor===Function?{label:t}:t),this._jsPlumb.overlays.__label=n);this._jsPlumb.instance.isSuspendDrawing()||this.repaint()},cleanup:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup(t),this._jsPlumb.overlays[e].destroy(t);t&&(this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null)},setVisible:function(t){this[t?"showOverlays":"hideOverlays"]()},setAbsoluteOverlayPosition:function(t,e){this._jsPlumb.overlayPositions[t.id]=e},getAbsoluteOverlayPosition:function(t){return this._jsPlumb.overlayPositions?this._jsPlumb.overlayPositions[t.id]:null},_clazzManip:function(t,e,n){if(!n)for(var i in this._jsPlumb.overlays)this._jsPlumb.overlays[i][t+"Class"](e)},addClass:function(t,e){this._clazzManip("add",t,e)},removeClass:function(t,e){this._clazzManip("remove",t,e)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=["connectorStyle","connectorHoverStyle","connectorOverlays","connector","connectionType","connectorClass","connectorHoverClass"];t.Endpoint=function(i){var o=i._jsPlumb,s=i.newConnection,r=i.newEndpoint;this.idPrefix="_jsplumb_e_",this.defaultLabelLocation=[.5,.5],this.defaultOverlayKeys=["Overlays","EndpointOverlays"],t.OverlayCapableJsPlumbUIComponent.apply(this,arguments),this.appendToDefaultType({connectionType:i.connectionType,maxConnections:null==i.maxConnections?this._jsPlumb.instance.Defaults.MaxConnections:i.maxConnections,paintStyle:i.endpointStyle||i.paintStyle||i.style||this._jsPlumb.instance.Defaults.EndpointStyle||t.Defaults.EndpointStyle,hoverPaintStyle:i.endpointHoverStyle||i.hoverPaintStyle||this._jsPlumb.instance.Defaults.EndpointHoverStyle||t.Defaults.EndpointHoverStyle,connectorStyle:i.connectorStyle,connectorHoverStyle:i.connectorHoverStyle,connectorClass:i.connectorClass,connectorHoverClass:i.connectorHoverClass,connectorOverlays:i.connectorOverlays,connector:i.connector,connectorTooltip:i.connectorTooltip}),this._jsPlumb.enabled=!(!1===i.enabled),this._jsPlumb.visible=!0,this.element=t.getElement(i.source),this._jsPlumb.uuid=i.uuid,this._jsPlumb.floatingEndpoint=null,this._jsPlumb.uuid&&(i.endpointsByUUID[this._jsPlumb.uuid]=this),this.elementId=i.elementId,this.dragProxy=i.dragProxy,this._jsPlumb.connectionCost=i.connectionCost,this._jsPlumb.connectionsDirected=i.connectionsDirected,this._jsPlumb.currentAnchorClass="",this._jsPlumb.events={};var a=!0===i.deleteOnEmpty;this.setDeleteOnEmpty=function(t){a=t};var l=function(){var e=o.endpointAnchorClassPrefix+"-"+this._jsPlumb.currentAnchorClass;this._jsPlumb.currentAnchorClass=this.anchor.getCssClass();var n=o.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");this.removeClass(e),this.addClass(n),t.updateClasses(this.element,n,e)}.bind(this);this.prepareAnchor=function(t){var e=this._jsPlumb.instance.makeAnchor(t,this.elementId,o);return e.bind("anchorChanged",function(t){this.fire("anchorChanged",{endpoint:this,anchor:t}),l()}.bind(this)),e},this.setPreparedAnchor=function(t,e){return this._jsPlumb.instance.continuousAnchorFactory.clear(this.elementId),this.anchor=t,l(),e||this._jsPlumb.instance.repaint(this.elementId),this},this.setAnchor=function(t,e){var n=this.prepareAnchor(t);return this.setPreparedAnchor(n,e),this};var u=function(t){if(this.connections.length>0)for(var e=0;e<this.connections.length;e++)this.connections[e].setHover(t,!1);else this.setHover(t)}.bind(this);this.bind("mouseover",function(){u(!0)}),this.bind("mouseout",function(){u(!1)}),i._transient||this._jsPlumb.instance.router.addEndpoint(this,this.elementId),this.prepareEndpoint=function(n,s){var r,a=function(e,n){var i=o.getRenderMode();if(t.Endpoints[i][e])return new t.Endpoints[i][e](n);if(!o.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown endpoint type '"+e+"'"}},l={_jsPlumb:this._jsPlumb.instance,cssClass:i.cssClass,container:i.container,tooltip:i.tooltip,connectorTooltip:i.connectorTooltip,endpoint:this};return e.isString(n)?r=a(n,l):e.isArray(n)?(l=e.merge(n[1],l),r=a(n[0],l)):r=n.clone(),r.clone=function(){return e.isString(n)?a(n,l):e.isArray(n)?(l=e.merge(n[1],l),a(n[0],l)):void 0}.bind(this),r.typeId=s,r},this.setEndpoint=function(t,e){var n=this.prepareEndpoint(t);this.setPreparedEndpoint(n,!0)},this.setPreparedEndpoint=function(t,e){null!=this.endpoint&&(this.endpoint.cleanup(),this.endpoint.destroy()),this.endpoint=t,this.type=this.endpoint.type,this.canvas=this.endpoint.canvas},t.extend(this,i,n),this.isSource=i.isSource||!1,this.isTemporarySource=i.isTemporarySource||!1,this.isTarget=i.isTarget||!1,this.connections=i.connections||[],this.connectorPointerEvents=i["connector-pointer-events"],this.scope=i.scope||o.getDefaultScope(),this.timestamp=null,this.reattachConnections=i.reattach||o.Defaults.ReattachConnections,this.connectionsDetachable=o.Defaults.ConnectionsDetachable,!1!==i.connectionsDetachable&&!1!==i.detachable||(this.connectionsDetachable=!1),this.dragAllowedWhenFull=!1!==i.dragAllowedWhenFull,i.onMaxConnections&&this.bind("maxConnections",i.onMaxConnections),this.addConnection=function(t){this.connections.push(t),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)},this.detachFromConnection=function(t,e,n){(e=null==e?this.connections.indexOf(t):e)>=0&&(this.connections.splice(e,1),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)),!n&&a&&0===this.connections.length&&o.deleteObject({endpoint:this,fireEvent:!1,deleteAttachedObjects:!0!==n})},this.deleteEveryConnection=function(t){for(var e=this.connections.length,n=0;n<e;n++)o.deleteConnection(this.connections[0],t)},this.detachFrom=function(t,e,n){for(var i=[],s=0;s<this.connections.length;s++)this.connections[s].endpoints[1]!==t&&this.connections[s].endpoints[0]!==t||i.push(this.connections[s]);for(var r=0,a=i.length;r<a;r++)o.deleteConnection(i[0]);return this},this.getElement=function(){return this.element},this.setElement=function(n){var s=this._jsPlumb.instance.getId(n),r=this.elementId;return e.removeWithFunction(i.endpointsByElement[this.elementId],function(t){return t.id===this.id}.bind(this)),this.element=t.getElement(n),this.elementId=o.getId(this.element),o.router.rehomeEndpoint(this,r,this.element),o.dragManager.endpointAdded(this.element),e.addToList(i.endpointsByElement,s,this),this},this.makeInPlaceCopy=function(){var t=this.anchor.getCurrentLocation({element:this}),e=this.anchor.getOrientation(this),n=this.anchor.getCssClass(),o={bind:function(){},compute:function(){return[t[0],t[1]]},getCurrentLocation:function(){return[t[0],t[1]]},getOrientation:function(){return e},getCssClass:function(){return n}};return r({dropOptions:i.dropOptions,anchor:o,source:this.element,paintStyle:this.getPaintStyle(),endpoint:i.hideOnDrag?"Blank":this.endpoint,_transient:!0,scope:this.scope,reference:this})},this.connectorSelector=function(){return this.connections[0]},this.setStyle=this.setPaintStyle,this.paint=function(t){var e=(t=t||{}).timestamp,n=!(!1===t.recalc);if(!e||this.timestamp!==e){var i=o.updateOffset({elId:this.elementId,timestamp:e}),s=t.offset?t.offset.o:i.o;if(null!=s){var r=t.anchorPoint,a=t.connectorPaintStyle;if(null==r){var l=t.dimensions||i.s,u={xy:[s.left,s.top],wh:l,element:this,timestamp:e};if(n&&this.anchor.isDynamic&&this.connections.length>0){var c=function(t,e){var n=0;if(null!=e)for(var i=0;i<t.connections.length;i++)if(t.connections[i].sourceId===e||t.connections[i].targetId===e){n=i;break}return t.connections[n]}(this,t.elementWithPrecedence),h=c.endpoints[0]===this?1:0,d=0===h?c.sourceId:c.targetId,p=o.getCachedData(d),f=p.o,g=p.s;u.index=0===h?1:0,u.connection=c,u.txy=[f.left,f.top],u.twh=g,u.tElement=c.endpoints[h],u.tRotation=o.getRotation(d)}else this.connections.length>0&&(u.connection=this.connections[0]);u.rotation=o.getRotation(this.elementId),r=this.anchor.compute(u)}for(var m in this.endpoint.compute(r,this.anchor.getOrientation(this),this._jsPlumb.paintStyleInUse,a||this.paintStyleInUse),this.endpoint.paint(this._jsPlumb.paintStyleInUse,this.anchor),this.timestamp=e,this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&(this._jsPlumb.overlayPlacements[m]=v.draw(this.endpoint,this._jsPlumb.paintStyleInUse),v.paint(this._jsPlumb.overlayPlacements[m]))}}}},this.getTypeDescriptor=function(){return"endpoint"},this.isVisible=function(){return this._jsPlumb.visible},this.repaint=this.paint;var c=!1;this.initDraggable=function(){if(!c&&t.isDragSupported(this.element)){var n,a={id:null,element:null},l=null,u=!1,h=null,d=function(t,e,n){var i=!1;return{drag:function(){if(i)return i=!1,!0;if(e.element){var o=n.getUIPosition(arguments,n.getZoom());null!=o&&n.setPosition(e.element,o),n.repaint(e.element,o),t.paint({anchorPoint:t.anchor.getCurrentLocation({element:t})})}},stopDrag:function(){i=!0}}}(this,a,o),p=i.dragOptions||{},f=t.dragEvents.start,g=t.dragEvents.stop,m=t.dragEvents.drag,v=t.dragEvents.beforeStart,y=function(e){l=this.connectorSelector();var c=!0;this.isEnabled()||(c=!1),null!=l||this.isSource||this.isTemporarySource||(c=!1),!this.isSource||!this.isFull()||null!=l&&this.dragAllowedWhenFull||(c=!1),null==l||l.isDetachable(this)||(this.isFull()?c=!1:l=null);var p=o.checkCondition(null==l?"beforeDrag":"beforeStartDetach",{endpoint:this,source:this.element,sourceId:this.elementId,connection:l});if(!1===p?c=!1:"object"==typeof p?t.extend(p,n||{}):p=n||{},!1===c)return o.stopDrag&&o.stopDrag(this.canvas),d.stopDrag(),!1;for(var f=0;f<this.connections.length;f++)this.connections[f].setHover(!1);this.addClass("endpointDrag"),o.setConnectionBeingDragged(!0),l&&!this.isFull()&&this.isSource&&(l=null),o.updateOffset({elId:this.elementId});var g=this._jsPlumb.instance.getOffset(this.canvas),m=this.canvas,v=this._jsPlumb.instance.getSize(this.canvas);!function(t,e,n,i){var o=e.createElement("div",{position:"absolute"});e.appendElement(o);var s=e.getId(o);e.setPosition(o,n),o.style.width=i[0]+"px",o.style.height=i[1]+"px",e.manage(s,o,!0),t.id=s,t.element=o}(a,o,g,v),o.setAttributes(this.canvas,{dragId:a.id,elId:this.elementId});var y=this.dragProxy||this.endpoint;if(null==this.dragProxy&&null!=this.connectionType){var b=this._jsPlumb.instance.deriveEndpointAndAnchorSpec(this.connectionType);b.endpoints[1]&&(y=b.endpoints[1])}var P=this._jsPlumb.instance.makeAnchor("Center");P.isFloating=!0,this._jsPlumb.floatingEndpoint=function(e,n,i,o,s,r,a,l){return a({paintStyle:e,endpoint:i,anchor:new t.FloatingAnchor({reference:n,referenceCanvas:o,jsPlumbInstance:r}),source:s,scope:l})}(this.getPaintStyle(),P,y,this.canvas,a.element,o,r,this.scope);var x=this._jsPlumb.floatingEndpoint.anchor;if(null==l)this.setHover(!1,!1),(l=s({sourceEndpoint:this,targetEndpoint:this._jsPlumb.floatingEndpoint,source:this.element,target:a.element,anchors:[this.anchor,this._jsPlumb.floatingEndpoint.anchor],paintStyle:i.connectorStyle,hoverPaintStyle:i.connectorHoverStyle,connector:i.connector,overlays:i.connectorOverlays,type:this.connectionType,cssClass:this.connectorClass,hoverClass:this.connectorHoverClass,scope:i.scope,data:p})).pending=!0,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.anchor=x,o.fire("connectionDrag",l),o.router.newConnection(l);else{u=!0,l.setHover(!1);var C=l.endpoints[0].id===this.id?0:1;this.detachFromConnection(l,null,!0);var _=o.getDragScope(m);o.setAttribute(this.canvas,"originalScope",_),o.fire("connectionDrag",l),0===C?(h=[l.source,l.sourceId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,0)):(h=[l.target,l.targetId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,1)),l.suspendedEndpoint=l.endpoints[C],l.suspendedElement=l.endpoints[C].getElement(),l.suspendedElementId=l.endpoints[C].elementId,l.suspendedElementType=0===C?"source":"target",l.suspendedEndpoint.setHover(!1),this._jsPlumb.floatingEndpoint.referenceEndpoint=l.suspendedEndpoint,l.endpoints[C]=this._jsPlumb.floatingEndpoint,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass)}o.registerFloatingConnection(a,l,this._jsPlumb.floatingEndpoint),o.currentlyDragging=!0}.bind(this),b=function(){if(o.setConnectionBeingDragged(!1),l&&null!=l.endpoints){var t=o.getDropEvent(arguments),e=o.getFloatingAnchorIndex(l);if(l.endpoints[0===e?1:0].anchor.locked=!1,l.removeClass(o.draggingClass),this._jsPlumb&&(l.deleteConnectionNow||l.endpoints[e]===this._jsPlumb.floatingEndpoint)&&u&&l.suspendedEndpoint){0===e?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=h[0],l.sourceId=h[1]):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=h[0],l.targetId=h[1]);var n=this._jsPlumb.floatingEndpoint;o.setDragScope(h[2],h[3]),l.endpoints[e]=l.suspendedEndpoint,l.isReattach()||l._forceReattach||l._forceDetach||!o.deleteConnection(l,{originalEvent:t})?(l.setHover(!1),l._forceDetach=null,l._forceReattach=null,this._jsPlumb.floatingEndpoint.detachFromConnection(l),l.suspendedEndpoint.addConnection(l),1===e?o.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,e):o.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,e),o.repaint(h[1])):o.deleteObject({endpoint:n})}this.deleteAfterDragStop?o.deleteObject({endpoint:this}):this._jsPlumb&&this.paint({recalc:!1}),o.fire("connectionDragStop",l,t),l.pending&&o.fire("connectionAborted",l,t),o.currentlyDragging=!1,l.suspendedElement=null,l.suspendedEndpoint=null,l=null}a&&a.element&&o.remove(a.element,!1,!1),this._jsPlumb&&(this.canvas.style.visibility="visible",this.anchor.locked=!1,this._jsPlumb.floatingEndpoint=null)}.bind(this);(p=t.extend({},p)).scope=this.scope||p.scope,p[v]=e.wrap(p[v],function(t){n=t.e.payload||{}},!1),p[f]=e.wrap(p[f],y,!1),p[m]=e.wrap(p[m],d.drag),p[g]=e.wrap(p[g],b),p.multipleDrop=!1,p.canDrag=function(){return this.isSource||this.isTemporarySource||this.connections.length>0&&!1!==this.connectionsDetachable}.bind(this),o.initDraggable(this.canvas,p,"internal"),this.canvas._jsPlumbRelatedElement=this.element,c=!0}};var h=i.endpoint||this._jsPlumb.instance.Defaults.Endpoint||t.Defaults.Endpoint;this.setEndpoint(h,!0);var d=i.anchor?i.anchor:i.anchors?i.anchors:o.Defaults.Anchor||"Top";this.setAnchor(d,!0);var p=["default",i.type||""].join(" ");this.addType(p,i.data,!0),this.canvas=this.endpoint.canvas,this.canvas._jsPlumb=this,this.initDraggable();var f=function(n,s,r,a){if(t.isDropSupported(this.element)){var l=i.dropOptions||o.Defaults.DropOptions||t.Defaults.DropOptions;(l=t.extend({},l)).scope=l.scope||this.scope;var u=t.dragEvents.drop,c=t.dragEvents.over,h=t.dragEvents.out,d=this,p=o.EndpointDropHandler({getEndpoint:function(){return d},jsPlumb:o,enabled:function(){return null==r||r.isEnabled()},isFull:function(){return r.isFull()},element:this.element,elementId:this.elementId,isSource:this.isSource,isTarget:this.isTarget,addClass:function(t){d.addClass(t)},removeClass:function(t){d.removeClass(t)},isDropAllowed:function(){return d.isDropAllowed.apply(d,arguments)},reference:a,isRedrop:function(t,e){return t.suspendedEndpoint&&e.reference&&t.suspendedEndpoint.id===e.reference.id}});l[u]=e.wrap(l[u],p,!0),l[c]=e.wrap(l[c],function(){var e=t.getDragObject(arguments),n=o.getAttribute(t.getElement(e),"dragId"),i=o.getFloatingConnectionFor(n);if(null!=i){var s=o.getFloatingAnchorIndex(i);if(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id){var r=o.checkCondition("checkDropAllowed",{sourceEndpoint:i.endpoints[s],targetEndpoint:this,connection:i});this[(r?"add":"remove")+"Class"](o.endpointDropAllowedClass),this[(r?"remove":"add")+"Class"](o.endpointDropForbiddenClass),i.endpoints[s].anchor.over(this.anchor,this)}}}.bind(this)),l[h]=e.wrap(l[h],function(){var e=t.getDragObject(arguments),n=null==e?null:o.getAttribute(t.getElement(e),"dragId"),i=n?o.getFloatingConnectionFor(n):null;if(null!=i){var s=o.getFloatingAnchorIndex(i);(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id)&&(this.removeClass(o.endpointDropAllowedClass),this.removeClass(o.endpointDropForbiddenClass),i.endpoints[s].anchor.out())}}.bind(this)),o.initDroppable(n,l,"internal",s)}}.bind(this);return this.anchor.isFloating||f(this.canvas,!(i._transient||this.anchor.isFloating),this,i.reference),this},e.extend(t.Endpoint,t.OverlayCapableJsPlumbUIComponent,{setVisible:function(t,e,n){if(this._jsPlumb.visible=t,this.canvas&&(this.canvas.style.display=t?"block":"none"),this[t?"showOverlays":"hideOverlays"](),!e)for(var i=0;i<this.connections.length;i++)if(this.connections[i].setVisible(t),!n){var o=this===this.connections[i].endpoints[0]?1:0;1===this.connections[i].endpoints[o].connections.length&&this.connections[i].endpoints[o].setVisible(t,!0,!0)}},getAttachedElements:function(){return this.connections},applyType:function(e,i){this.setPaintStyle(e.endpointStyle||e.paintStyle,i),this.setHoverPaintStyle(e.endpointHoverStyle||e.hoverPaintStyle,i),null!=e.maxConnections&&(this._jsPlumb.maxConnections=e.maxConnections),e.scope&&(this.scope=e.scope),t.extend(this,e,n),null!=e.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,e.cssClass),t.OverlayCapableJsPlumbUIComponent.applyType(this,e)},isEnabled:function(){return this._jsPlumb.enabled},setEnabled:function(t){this._jsPlumb.enabled=t},cleanup:function(){var e=this._jsPlumb.instance.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");t.removeClass(this.element,e),this.anchor=null,this.endpoint.cleanup(!0),this.endpoint.destroy(),this.endpoint=null,this._jsPlumb.instance.destroyDraggable(this.canvas,"internal"),this._jsPlumb.instance.destroyDroppable(this.canvas,"internal")},setHover:function(t){this.endpoint&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&this.endpoint.setHover(t)},isFull:function(){return 0===this._jsPlumb.maxConnections||!(this.isFloating()||this._jsPlumb.maxConnections<0||this.connections.length<this._jsPlumb.maxConnections)},isFloating:function(){return null!=this.anchor&&this.anchor.isFloating},isConnectedTo:function(t){var e=!1;if(t)for(var n=0;n<this.connections.length;n++)if(this.connections[n].endpoints[1]===t||this.connections[n].endpoints[0]===t){e=!0;break}return e},getConnectionCost:function(){return this._jsPlumb.connectionCost},setConnectionCost:function(t){this._jsPlumb.connectionCost=t},areConnectionsDirected:function(){return this._jsPlumb.connectionsDirected},setConnectionsDirected:function(t){this._jsPlumb.connectionsDirected=t},setElementId:function(t){this.elementId=t,this.anchor.elementId=t},setReferenceElement:function(e){this.element=t.getElement(e)},setDragAllowedWhenFull:function(t){this.dragAllowedWhenFull=t},equals:function(t){return this.anchor.equals(t.anchor)},getUuid:function(){return this._jsPlumb.uuid},computeAnchor:function(t){return this.anchor.compute(t)}}),this.jsPlumbInstance.prototype.EndpointDropHandler=function(t){return function(n){var i=t.jsPlumb;t.removeClass(i.endpointDropAllowedClass),t.removeClass(i.endpointDropForbiddenClass);var o=i.getDropEvent(arguments),s=i.getDragObject(arguments),r=i.getAttribute(s,"dragId"),a=(i.getAttribute(s,"elId"),i.getAttribute(s,"originalScope")),l=i.getFloatingConnectionFor(r);if(null!=l){var u=null!=l.suspendedEndpoint;if(!u||null!=l.suspendedEndpoint._jsPlumb){var c=t.getEndpoint(l);if(null!=c){if(t.isRedrop(l,t))return l._forceReattach=!0,l.setHover(!1),void(t.maybeCleanup&&t.maybeCleanup(c));var h=i.getFloatingAnchorIndex(l);if(0===h&&!t.isSource||1===h&&!t.isTarget)t.maybeCleanup&&t.maybeCleanup(c);else{t.onDrop&&t.onDrop(l),a&&i.setDragScope(s,a);var d=t.isFull(n);if(d&&c.fire("maxConnections",{endpoint:this,connection:l,maxConnections:c._jsPlumb.maxConnections},o),!d&&t.enabled()){var p=!0;0===h?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=t.element,l.sourceId=i.getId(t.element)):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=t.element,l.targetId=i.getId(t.element)),u&&l.suspendedEndpoint.id!==c.id&&(l.isDetachAllowed(l)&&l.endpoints[h].isDetachAllowed(l)&&l.suspendedEndpoint.isDetachAllowed(l)&&i.checkCondition("beforeDetach",l)||(p=!1));var f=function(n){l.endpoints[h].detachFromConnection(l),l.suspendedEndpoint&&l.suspendedEndpoint.detachFromConnection(l),l.endpoints[h]=c,c.addConnection(l);var s=c.getParameters();for(var r in s)l.setParameter(r,s[r]);if(u){var a=l.suspendedEndpoint.elementId;i.fireMoveEvent({index:h,originalSourceId:0===h?a:l.sourceId,newSourceId:0===h?c.elementId:l.sourceId,originalTargetId:1===h?a:l.targetId,newTargetId:1===h?c.elementId:l.targetId,originalSourceEndpoint:0===h?l.suspendedEndpoint:l.endpoints[0],newSourceEndpoint:0===h?c:l.endpoints[0],originalTargetEndpoint:1===h?l.suspendedEndpoint:l.endpoints[1],newTargetEndpoint:1===h?c:l.endpoints[1],connection:l},o)}else s.draggable&&i.initDraggable(this.element,t.dragOptions,"internal",i);(1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),l.endpoints[0].finalEndpoint)&&(l.endpoints[0].detachFromConnection(l),l.endpoints[0]=l.endpoints[0].finalEndpoint,l.endpoints[0].addConnection(l));e.isObject(n)&&l.mergeData(n),i.finaliseConnection(l,null,o,!1),l.setHover(!1),i.revalidate(l.endpoints[0].element)}.bind(this);if(p=p&&t.isDropAllowed(l.sourceId,l.targetId,l.scope,l,c))return f(p),!0;l.suspendedEndpoint&&(l.endpoints[h]=l.suspendedEndpoint,l.setHover(!1),l._forceDetach=!0,0===h?(l.source=l.suspendedEndpoint.element,l.sourceId=l.suspendedEndpoint.elementId):(l.target=l.suspendedEndpoint.element,l.targetId=l.suspendedEndpoint.elementId),l.suspendedEndpoint.addConnection(l),1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),i.repaint(l.sourceId),l._forceDetach=!1)}t.maybeCleanup&&t.maybeCleanup(c),i.currentlyDragging=!1}}}}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=function(t,i,o,s,r){if(e.Connectors[i]=e.Connectors[i]||{},null==e.Connectors[i][o]){if(null==e.Connectors[o]){if(t.Defaults.DoNotThrowErrors)return null;throw new TypeError("jsPlumb: unknown connector type '"+o+"'")}e.Connectors[i][o]=function(){e.Connectors[o].apply(this,arguments),e.ConnectorRenderers[i].apply(this,arguments)},n.extend(e.Connectors[i][o],[e.Connectors[o],e.ConnectorRenderers[i]])}return new e.Connectors[i][o](s,r)},o=function(t,e,n){return t?n.makeAnchor(t,e,n):null},s=function(t,e,i,o){null!=e&&(e._jsPlumbConnections=e._jsPlumbConnections||{},o?delete e._jsPlumbConnections[t.id]:e._jsPlumbConnections[t.id]=!0,n.isEmpty(e._jsPlumbConnections)?i.removeClass(e,i.connectedClass):i.addClass(e,i.connectedClass))};e.Connection=function(t){var i=t.newEndpoint;this.id=t.id,this.connector=null,this.idPrefix="_jsplumb_c_",this.defaultLabelLocation=.5,this.defaultOverlayKeys=["Overlays","ConnectionOverlays"],this.previousConnection=t.previousConnection,this.source=e.getElement(t.source),this.target=e.getElement(t.target),e.OverlayCapableJsPlumbUIComponent.apply(this,arguments),t.sourceEndpoint?(this.source=t.sourceEndpoint.getElement(),this.sourceId=t.sourceEndpoint.elementId):this.sourceId=this._jsPlumb.instance.getId(this.source),t.targetEndpoint?(this.target=t.targetEndpoint.getElement(),this.targetId=t.targetEndpoint.elementId):this.targetId=this._jsPlumb.instance.getId(this.target),this.scope=t.scope,this.endpoints=[],this.endpointStyles=[];var o=this._jsPlumb.instance;o.manage(this.sourceId,this.source),o.manage(this.targetId,this.target),this._jsPlumb.visible=!0,this._jsPlumb.params={cssClass:t.cssClass,container:t.container,"pointer-events":t["pointer-events"],editorParams:t.editorParams,overlays:t.overlays},this._jsPlumb.lastPaintedAt=null,this.bind("mouseover",function(){this.setHover(!0)}.bind(this)),this.bind("mouseout",function(){this.setHover(!1)}.bind(this)),this.makeEndpoint=function(e,n,s,r,a){return s=s||this._jsPlumb.instance.getId(n),this.prepareEndpoint(o,i,this,r,e?0:1,t,n,s,a)},t.type&&(t.endpoints=t.endpoints||this._jsPlumb.instance.deriveEndpointAndAnchorSpec(t.type).endpoints);var s=this.makeEndpoint(!0,this.source,this.sourceId,t.sourceEndpoint),r=this.makeEndpoint(!1,this.target,this.targetId,t.targetEndpoint);s&&n.addToList(t.endpointsByElement,this.sourceId,s),r&&n.addToList(t.endpointsByElement,this.targetId,r),this.scope||(this.scope=this.endpoints[0].scope),null!=t.deleteEndpointsOnEmpty&&(this.endpoints[0].setDeleteOnEmpty(t.deleteEndpointsOnEmpty),this.endpoints[1].setDeleteOnEmpty(t.deleteEndpointsOnEmpty));var a=o.Defaults.ConnectionsDetachable;!1===t.detachable&&(a=!1),!1===this.endpoints[0].connectionsDetachable&&(a=!1),!1===this.endpoints[1].connectionsDetachable&&(a=!1);var l=t.reattach||this.endpoints[0].reattachConnections||this.endpoints[1].reattachConnections||o.Defaults.ReattachConnections;this.appendToDefaultType({detachable:a,reattach:l,paintStyle:this.endpoints[0].connectorStyle||this.endpoints[1].connectorStyle||t.paintStyle||o.Defaults.PaintStyle||e.Defaults.PaintStyle,hoverPaintStyle:this.endpoints[0].connectorHoverStyle||this.endpoints[1].connectorHoverStyle||t.hoverPaintStyle||o.Defaults.HoverPaintStyle||e.Defaults.HoverPaintStyle});var u=o.getSuspendedAt();if(!o.isSuspendDrawing()){var c=o.getCachedData(this.sourceId),h=c.o,d=c.s,p=o.getCachedData(this.targetId),f=p.o,g=p.s,m=u||jsPlumbUtil.uuid(),v=this.endpoints[0].anchor.compute({xy:[h.left,h.top],wh:d,element:this.endpoints[0],elementId:this.endpoints[0].elementId,txy:[f.left,f.top],twh:g,tElement:this.endpoints[1],timestamp:m,rotation:o.getRotation(this.endpoints[0].elementId)});this.endpoints[0].paint({anchorLoc:v,timestamp:m}),v=this.endpoints[1].anchor.compute({xy:[f.left,f.top],wh:g,element:this.endpoints[1],elementId:this.endpoints[1].elementId,txy:[h.left,h.top],twh:d,tElement:this.endpoints[0],timestamp:m,rotation:o.getRotation(this.endpoints[1].elementId)}),this.endpoints[1].paint({anchorLoc:v,timestamp:m})}this.getTypeDescriptor=function(){return"connection"},this.getAttachedElements=function(){return this.endpoints},this.isDetachable=function(t){return!1!==this._jsPlumb.detachable&&(null!=t?!0===t.connectionsDetachable:!0===this._jsPlumb.detachable)},this.setDetachable=function(t){this._jsPlumb.detachable=!0===t},this.isReattach=function(){return!0===this._jsPlumb.reattach||!0===this.endpoints[0].reattachConnections||!0===this.endpoints[1].reattachConnections},this.setReattach=function(t){this._jsPlumb.reattach=!0===t},this._jsPlumb.cost=t.cost||this.endpoints[0].getConnectionCost(),this._jsPlumb.directed=t.directed,null==t.directed&&(this._jsPlumb.directed=this.endpoints[0].areConnectionsDirected());var y=e.extend({},this.endpoints[1].getParameters());e.extend(y,this.endpoints[0].getParameters()),e.extend(y,this.getParameters()),this.setParameters(y),this.setConnector(this.endpoints[0].connector||this.endpoints[1].connector||t.connector||o.Defaults.Connector||e.Defaults.Connector,!0);var b=null!=t.data&&n.isObject(t.data)?t.data:{};this.getData=function(){return b},this.setData=function(t){b=t||{}},this.mergeData=function(t){b=e.extend(b,t)};var P=["default",this.endpoints[0].connectionType,this.endpoints[1].connectionType,t.type].join(" ");/[^\s]/.test(P)&&this.addType(P,t.data,!0),this.updateConnectedClass()},n.extend(e.Connection,e.OverlayCapableJsPlumbUIComponent,{applyType:function(t,n,i){var o=null;null!=t.connector&&(null==(o=this.getCachedTypeItem("connector",i.connector))&&(o=this.prepareConnector(t.connector,i.connector),this.cacheTypeItem("connector",o,i.connector)),this.setPreparedConnector(o)),null!=t.detachable&&this.setDetachable(t.detachable),null!=t.reattach&&this.setReattach(t.reattach),t.scope&&(this.scope=t.scope),null!=t.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,t.cssClass);var s=null;t.anchor?null==(s=this.getCachedTypeItem("anchors",i.anchor))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchor),this._jsPlumb.instance.makeAnchor(t.anchor)],this.cacheTypeItem("anchors",s,i.anchor)):t.anchors&&null==(s=this.getCachedTypeItem("anchors",i.anchors))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchors[0]),this._jsPlumb.instance.makeAnchor(t.anchors[1])],this.cacheTypeItem("anchors",s,i.anchors)),null!=s&&(this.endpoints[0].anchor=s[0],this.endpoints[1].anchor=s[1],this.endpoints[1].anchor.isDynamic&&this._jsPlumb.instance.repaint(this.endpoints[1].elementId)),e.OverlayCapableJsPlumbUIComponent.applyType(this,t)},addClass:function(t,e){e&&(this.endpoints[0].addClass(t),this.endpoints[1].addClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.addClass(t)),this.connector&&this.connector.addClass(t)},removeClass:function(t,e){e&&(this.endpoints[0].removeClass(t),this.endpoints[1].removeClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.removeClass(t)),this.connector&&this.connector.removeClass(t)},isVisible:function(){return this._jsPlumb.visible},setVisible:function(t){this._jsPlumb.visible=t,this.connector&&this.connector.setVisible(t),this.repaint()},cleanup:function(){this.updateConnectedClass(!0),this.endpoints=null,this.source=null,this.target=null,null!=this.connector&&(this.connector.cleanup(!0),this.connector.destroy(!0)),this.connector=null},updateConnectedClass:function(t){this._jsPlumb&&(s(this,this.source,this._jsPlumb.instance,t),s(this,this.target,this._jsPlumb.instance,t))},setHover:function(e){this.connector&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&(this.connector.setHover(e),t.jsPlumb[e?"addClass":"removeClass"](this.source,this._jsPlumb.instance.hoverSourceClass),t.jsPlumb[e?"addClass":"removeClass"](this.target,this._jsPlumb.instance.hoverTargetClass))},getUuids:function(){return[this.endpoints[0].getUuid(),this.endpoints[1].getUuid()]},getCost:function(){return this._jsPlumb?this._jsPlumb.cost:-1/0},setCost:function(t){this._jsPlumb.cost=t},isDirected:function(){return this._jsPlumb.directed},getConnector:function(){return this.connector},prepareConnector:function(t,e){var o,s={_jsPlumb:this._jsPlumb.instance,cssClass:this._jsPlumb.params.cssClass,container:this._jsPlumb.params.container,"pointer-events":this._jsPlumb.params["pointer-events"]},r=this._jsPlumb.instance.getRenderMode();return n.isString(t)?o=i(this._jsPlumb.instance,r,t,s,this):n.isArray(t)&&(o=1===t.length?i(this._jsPlumb.instance,r,t[0],s,this):i(this._jsPlumb.instance,r,t[0],n.merge(t[1],s),this)),null!=e&&(o.typeId=e),o},setPreparedConnector:function(t,e,n,i){if(this.connector!==t){var o,s="";if(null!=this.connector&&(s=(o=this.connector).getClass(),this.connector.cleanup(),this.connector.destroy()),this.connector=t,i&&this.cacheTypeItem("connector",t,i),this.canvas=this.connector.canvas,this.bgCanvas=this.connector.bgCanvas,this.connector.reattach(this._jsPlumb.instance),this.addClass(s),this.canvas&&(this.canvas._jsPlumb=this),this.bgCanvas&&(this.bgCanvas._jsPlumb=this),null!=o)for(var r=this.getOverlays(),a=0;a<r.length;a++)r[a].transfer&&r[a].transfer(this.connector);n||this.setListenerComponent(this.connector),e||this.repaint()}},setConnector:function(t,e,n,i){var o=this.prepareConnector(t,i);this.setPreparedConnector(o,e,n,i)},paint:function(t){if(!this._jsPlumb.instance.isSuspendDrawing()&&this._jsPlumb.visible){var e=(t=t||{}).timestamp,n=this.targetId,i=this.sourceId;if(null==e||e!==this._jsPlumb.lastPaintedAt){var o=this._jsPlumb.instance.updateOffset({elId:i}).o,s=this._jsPlumb.instance.updateOffset({elId:n}).o,r=this.endpoints[0],a=this.endpoints[1],l=r.anchor.getCurrentLocation({xy:[o.left,o.top],wh:[o.width,o.height],element:r,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.sourceId)}),u=a.anchor.getCurrentLocation({xy:[s.left,s.top],wh:[s.width,s.height],element:a,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.targetId)});this.connector.resetBounds(),this.connector.compute({sourcePos:l,targetPos:u,sourceOrientation:r.anchor.getOrientation(r),targetOrientation:a.anchor.getOrientation(a),sourceEndpoint:this.endpoints[0],targetEndpoint:this.endpoints[1],"stroke-width":this._jsPlumb.paintStyleInUse.strokeWidth,sourceInfo:o,targetInfo:s});var c={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0};for(var h in this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(h)){var d=this._jsPlumb.overlays[h];d.isVisible()&&(this._jsPlumb.overlayPlacements[h]=d.draw(this.connector,this._jsPlumb.paintStyleInUse,this.getAbsoluteOverlayPosition(d)),c.minX=Math.min(c.minX,this._jsPlumb.overlayPlacements[h].minX),c.maxX=Math.max(c.maxX,this._jsPlumb.overlayPlacements[h].maxX),c.minY=Math.min(c.minY,this._jsPlumb.overlayPlacements[h].minY),c.maxY=Math.max(c.maxY,this._jsPlumb.overlayPlacements[h].maxY))}var p=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||1)/2,f=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||0),g={xmin:Math.min(this.connector.bounds.minX-(p+f),c.minX),ymin:Math.min(this.connector.bounds.minY-(p+f),c.minY),xmax:Math.max(this.connector.bounds.maxX+(p+f),c.maxX),ymax:Math.max(this.connector.bounds.maxY+(p+f),c.maxY)};for(var m in this.connector.paintExtents=g,this.connector.paint(this._jsPlumb.paintStyleInUse,null,g),this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&v.paint(this._jsPlumb.overlayPlacements[m],g)}}this._jsPlumb.lastPaintedAt=e}},repaint:function(t){var e=jsPlumb.extend(t||{},{});e.elId=this.sourceId,this.paint(e)},prepareEndpoint:function(t,n,i,s,r,a,l,u,c){var h;if(s)i.endpoints[r]=s,s.addConnection(i);else{a.endpoints||(a.endpoints=[null,null]);var d=c||a.endpoints[r]||a.endpoint||t.Defaults.Endpoints[r]||e.Defaults.Endpoints[r]||t.Defaults.Endpoint||e.Defaults.Endpoint;a.endpointStyles||(a.endpointStyles=[null,null]),a.endpointHoverStyles||(a.endpointHoverStyles=[null,null]);var p=a.endpointStyles[r]||a.endpointStyle||t.Defaults.EndpointStyles[r]||e.Defaults.EndpointStyles[r]||t.Defaults.EndpointStyle||e.Defaults.EndpointStyle;null==p.fill&&null!=a.paintStyle&&(p.fill=a.paintStyle.stroke),null==p.outlineStroke&&null!=a.paintStyle&&(p.outlineStroke=a.paintStyle.outlineStroke),null==p.outlineWidth&&null!=a.paintStyle&&(p.outlineWidth=a.paintStyle.outlineWidth);var f=a.endpointHoverStyles[r]||a.endpointHoverStyle||t.Defaults.EndpointHoverStyles[r]||e.Defaults.EndpointHoverStyles[r]||t.Defaults.EndpointHoverStyle||e.Defaults.EndpointHoverStyle;null!=a.hoverPaintStyle&&(null==f&&(f={}),null==f.fill&&(f.fill=a.hoverPaintStyle.stroke));var g=a.anchors?a.anchors[r]:a.anchor?a.anchor:o(t.Defaults.Anchors[r],u,t)||o(e.Defaults.Anchors[r],u,t)||o(t.Defaults.Anchor,u,t)||o(e.Defaults.Anchor,u,t);h=n({paintStyle:p,hoverPaintStyle:f,endpoint:d,connections:[i],uuid:a.uuids?a.uuids[r]:null,anchor:g,source:l,scope:a.scope,reattach:a.reattach||t.Defaults.ReattachConnections,detachable:a.detachable||t.Defaults.ConnectionsDetachable}),null==s&&h.setDeleteOnEmpty(!0),i.endpoints[r]=h,!1===a.drawEndpoints&&h.setVisible(!1,!0,!0)}return h},replaceEndpoint:function(t,e){var n=this.endpoints[t],i=n.elementId,o=this._jsPlumb.instance.getEndpoints(i),s=o.indexOf(n),r=this.makeEndpoint(0===t,n.element,i,null,e);this.endpoints[t]=r,o.splice(s,1,r),this._jsPlumb.instance.deleteObject({endpoint:n,deleteAttachedObjects:!1}),this._jsPlumb.instance.fire("endpointReplaced",{previous:n,current:r}),this._jsPlumb.instance.router.sourceOrTargetChanged(this.endpoints[1].elementId,this.endpoints[1].elementId,this,this.endpoints[1].element,1)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumbUtil,e=this.jsPlumb;e.AnchorManager=function(n){var i={},o={},s={},r={},a=this,l={},u=n.jsPlumbInstance,c={},h=function(t,e){return e[0][0]-t[0][0]},d=function(t,e){return(t[0][0]<0?-Math.PI-t[0][0]:Math.PI-t[0][0])-(e[0][0]<0?-Math.PI-e[0][0]:Math.PI-e[0][0])},p={top:d,right:h,bottom:h,left:d},f=function(t,e){var n=u.getCachedData(t),i=n.s,r=n.o,a=function(e,n,i,r,a,l,c){if(r.length>0)for(var h=function(t,e,n,i,o,s,r,a){for(var l=[],u=e[o?0:1]/(i.length+1),c=0;c<i.length;c++){var h=(c+1)*u,d=s*e[o?1:0];r&&(h=e[o?0:1]-h);var p=o?h:d,f=n.left+p,g=p/e[0],m=o?d:h,v=n.top+m,y=m/e[1];if(0!==a){var b=jsPlumbUtil.rotatePoint([f,v],[n.centerx,n.centery],a);f=b[0],v=b[1]}l.push([f,v,g,y,i[c][1],i[c][2]])}return l}(0,n,i,(y=p[e],r.sort(y)),a,l,"right"===e||"top"===e,u.getRotation(t)),d=function(t,e){o[t.id]=[e[0],e[1],e[2],e[3]],s[t.id]=c},f=0;f<h.length;f++){var g=h[f][4],m=g.endpoints[0].elementId===t,v=g.endpoints[1].elementId===t;m&&d(g.endpoints[0],h[f]),v&&d(g.endpoints[1],h[f])}var y};a("bottom",i,r,e.bottom,!0,1,[0,1]),a("top",i,r,e.top,!0,0,[0,-1]),a("left",i,r,e.left,!1,0,[-1,0]),a("right",i,r,e.right,!1,1,[1,0])};this.reset=function(){i={},r={},l={}},this.addFloatingConnection=function(t,e){c[t]=e},this.newConnection=function(n){var i=n.sourceId,o=n.targetId,s=n.endpoints,a=!0,l=function(l,u,c,h,d){i===o&&c.isContinuous&&(n._jsPlumb.instance.removeElement(s[1].canvas),a=!1),t.addToList(r,h,[d,u,c.constructor===e.DynamicAnchor])};l(0,s[0],s[0].anchor,o,n),a&&l(0,s[1],s[1].anchor,i,n)};var g=function(e){!function(e,n){if(e){var i=function(t){return t[4]===n};t.removeWithFunction(e.top,i),t.removeWithFunction(e.left,i),t.removeWithFunction(e.bottom,i),t.removeWithFunction(e.right,i)}}(l[e.elementId],e.id)};this.connectionDetached=function(e,n){var i=e.connection||e,o=e.sourceId,s=e.targetId,l=i.endpoints,u=function(e,n,i,o,s){t.removeWithFunction(r[o],function(t){return t[0].id===s.id})};u(0,l[1],l[1].anchor,o,i),u(0,l[0],l[0].anchor,s,i),i.floatingId&&(u(i.floatingIndex,i.floatingEndpoint,i.floatingEndpoint.anchor,i.floatingId,i),g(i.floatingEndpoint)),g(i.endpoints[0]),g(i.endpoints[1]),n||(a.redraw(i.sourceId),i.targetId!==i.sourceId&&a.redraw(i.targetId))},this.addEndpoint=function(e,n){t.addToList(i,n,e)},this.changeId=function(t,e){r[e]=r[t],i[e]=i[t],delete r[t],delete i[t]},this.getConnectionsFor=function(t){return r[t]||[]},this.getEndpointsFor=function(t){return i[t]||[]},this.deleteEndpoint=function(e){t.removeWithFunction(i[e.elementId],function(t){return t.id===e.id}),g(e)},this.elementRemoved=function(t){delete c[t],delete i[t],i[t]=[]};var m=function(e,i,o,s,r,a,l,u,c,h,d,p){var f,g,m=-1,v=s.endpoints[l],y=v.id,b=[1,0][l],P=[[i,o],s,r,a,y],x=e[c],C=v._continuousAnchorEdge?e[v._continuousAnchorEdge]:null;if(C){var _=t.findWithFunction(C,function(t){return t[4]===y});if(-1!==_)for(C.splice(_,1),f=0;f<C.length;f++)g=C[f][1],t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,C[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,C[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id})}for(f=0;f<x.length;f++)g=x[f][1],1===n.idx&&x[f][3]===a&&-1===m&&(m=f),t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,x[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,x[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id});var j=u?-1!==m?m:0:x.length;x.splice(j,0,P),v._continuousAnchorEdge=c};this.sourceOrTargetChanged=function(n,i,o,s,a){if(0===a){if(n!==i){o.sourceId=i,o.source=s,t.removeWithFunction(r[n],function(t){return t[0].id===o.id});var l=t.findWithFunction(r[o.targetId],function(t){return t[0].id===o.id});l>-1&&(r[o.targetId][l][0]=o,r[o.targetId][l][1]=o.endpoints[0],r[o.targetId][l][2]=o.endpoints[0].anchor.constructor===e.DynamicAnchor),t.addToList(r,i,[o,o.endpoints[1],o.endpoints[1].anchor.constructor===e.DynamicAnchor]),o.endpoints[1].anchor.isContinuous&&(o.source===o.target?o._jsPlumb.instance.removeElement(o.endpoints[1].canvas):null==o.endpoints[1].canvas.parentNode&&o._jsPlumb.instance.appendElement(o.endpoints[1].canvas)),o.updateConnectedClass()}}else if(1===a){var u=o.endpoints[0].elementId;o.target=s,o.targetId=i;var c=t.findWithFunction(r[u],function(t){return t[0].id===o.id}),h=t.findWithFunction(r[n],function(t){return t[0].id===o.id});-1!==c&&(r[u][c][0]=o,r[u][c][1]=o.endpoints[1],r[u][c][2]=o.endpoints[1].anchor.constructor===e.DynamicAnchor),h>-1&&(r[n].splice(h,1),t.addToList(r,i,[o,o.endpoints[0],o.endpoints[0].anchor.constructor===e.DynamicAnchor])),o.updateConnectedClass()}},this.rehomeEndpoint=function(t,e,n){var o=i[e]||[],s=u.getId(n);if(s!==e){var r=o.indexOf(t);if(r>-1){var l=o.splice(r,1)[0];a.add(l,s)}}for(var c=0;c<t.connections.length;c++)t.connections[c].sourceId===e?a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,0):t.connections[c].targetId===e&&a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,1)},this.redraw=function(n,o,s,a,h,d){var p=[],g=[],v=[];if(!u.isSuspendDrawing()){var y=i[n]||[],b=r[n]||[];s=s||jsPlumbUtil.uuid(),a=a||{left:0,top:0},o&&(o={left:o.left+a.left,top:o.top+a.top});for(var P=u.updateOffset({elId:n,offset:o,recalc:!1,timestamp:s}),x={},C=0;C<b.length;C++){var _=b[C][0],j=_.sourceId,E=_.targetId,S=_.endpoints[0].anchor.isContinuous,w=_.endpoints[1].anchor.isContinuous;if(S||w){var D=j+"_"+E,A=x[D],I=_.sourceId===n?1:0,k=u.getRotation(E),O=u.getRotation(j);S&&!l[j]&&(l[j]={top:[],right:[],bottom:[],left:[]}),w&&!l[E]&&(l[E]={top:[],right:[],bottom:[],left:[]}),n!==E&&u.updateOffset({elId:E,timestamp:s}),n!==j&&u.updateOffset({elId:j,timestamp:s});var M=u.getCachedData(E),T=u.getCachedData(j);E===j&&(S||w)?(m(l[j],-Math.PI/2,0,_,!1,E,0,!1,"top",0,p,g),m(l[E],-Math.PI/2,0,_,!1,j,1,!1,"top",0,p,g)):(A||(A=this.calculateOrientation(j,E,T.o,M.o,_.endpoints[0].anchor,_.endpoints[1].anchor,_,O,k),x[D]=A),S&&m(l[j],A.theta,0,_,!1,E,0,!1,A.a[0],0,p,g),w&&m(l[E],A.theta2,-1,_,!0,j,1,!0,A.a[1],0,p,g)),S&&t.addWithFunction(v,j,function(t){return t===j}),w&&t.addWithFunction(v,E,function(t){return t===E}),t.addWithFunction(p,_,function(t){return t.id===_.id}),(S&&0===I||w&&1===I)&&t.addWithFunction(g,_.endpoints[I],function(t){return t.id===_.endpoints[I].id})}}for(C=0;C<y.length;C++)0===y[C].connections.length&&y[C].anchor.isContinuous&&(l[n]||(l[n]={top:[],right:[],bottom:[],left:[]}),m(l[n],-Math.PI/2,0,{endpoints:[y[C],y[C]],paint:function(){}},!1,n,0,!1,y[C].anchor.getDefaultFace(),0,p,g),t.addWithFunction(v,n,function(t){return t===n}));for(C=0;C<v.length;C++)f(v[C],l[v[C]]);for(C=0;C<y.length;C++)y[C].paint({timestamp:s,offset:P,dimensions:P.s,recalc:!0!==d});for(C=0;C<g.length;C++){var F=u.getCachedData(g[C].elementId);g[C].paint({timestamp:null,offset:F,dimensions:F.s})}for(C=0;C<b.length;C++){var L=b[C][1];if(L.anchor.constructor===e.DynamicAnchor){L.paint({elementWithPrecedence:n,timestamp:s}),t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id});for(var N=0;N<L.connections.length;N++)L.connections[N]!==b[C][0]&&t.addWithFunction(p,L.connections[N],function(t){return t.id===L.connections[N].id})}else t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id})}var R=c[n];for(R&&R.paint({timestamp:s,recalc:!1,elId:n}),C=0;C<p.length;C++)p[C].paint({elId:n,timestamp:null,recalc:!1,clearEdits:h})}return{c:p,e:g}};var v=function(e){t.EventGenerator.apply(this),this.type="Continuous",this.isDynamic=!0,this.isContinuous=!0;for(var n=e.faces||["top","right","bottom","left"],i=!(!1===e.clockwise),r={},a={top:"bottom",right:"left",left:"right",bottom:"top"},l={top:"right",right:"bottom",left:"top",bottom:"left"},u={top:"left",right:"top",left:"bottom",bottom:"right"},c=i?l:u,h=i?u:l,d=e.cssClass||"",p=null,f=null,g=["left","right"],m=["top","bottom"],v=null,y=0;y<n.length;y++)r[n[y]]=!0;this.getDefaultFace=function(){return 0===n.length?"top":n[0]},this.isRelocatable=function(){return!0},this.isSnapOnRelocate=function(){return!0},this.verifyEdge=function(t){return r[t]?t:r[a[t]]?a[t]:r[c[t]]?c[t]:r[h[t]]?h[t]:t},this.isEdgeSupported=function(t){return null==v?null==f?!0===r[t]:f===t:-1!==v.indexOf(t)},this.setCurrentFace=function(t,e){p=t,e&&null!=f&&(f=p)},this.getCurrentFace=function(){return p},this.getSupportedFaces=function(){var t=[];for(var e in r)r[e]&&t.push(e);return t},this.lock=function(){f=p},this.unlock=function(){f=null},this.isLocked=function(){return null!=f},this.lockCurrentAxis=function(){null!=p&&(v="left"===p||"right"===p?g:m)},this.unlockCurrentAxis=function(){v=null},this.compute=function(t){return o[t.element.id]||[0,0]},this.getCurrentLocation=function(t){return o[t.element.id]||[0,0]},this.getOrientation=function(t){return s[t.id]||[0,0]},this.getCssClass=function(){return d}};u.continuousAnchorFactory={get:function(t){return new v(t)},clear:function(t){delete o[t]}}},e.AnchorManager.prototype.calculateOrientation=function(t,e,n,i,o,s,r,a,l){var u=["left","top","right","bottom"];if(t===e)return{orientation:"identity",a:["top","top"]};var c=Math.atan2(i.centery-n.centery,i.centerx-n.centerx),h=Math.atan2(n.centery-i.centery,n.centerx-i.centerx),d=[],p={};!function(t,e){for(var n=0;n<t.length;n++)if(p[t[n]]={left:[e[n][0].left,e[n][0].centery],right:[e[n][0].right,e[n][0].centery],top:[e[n][0].centerx,e[n][0].top],bottom:[e[n][0].centerx,e[n][0].bottom]},0!==e[n][1])for(var i in p[t[n]])p[t[n]][i]=jsPlumbUtil.rotatePoint(p[t[n]][i],[e[n][0].centerx,e[n][0].centery],e[n][1])}(["source","target"],[[n,a],[i,l]]);for(var f=0;f<u.length;f++)for(var g=0;g<u.length;g++)d.push({source:u[f],target:u[g],dist:Biltong.lineLength(p.source[u[f]],p.target[u[g]])});d.sort(function(t,e){return t.dist<e.dist?-1:t.dist>e.dist?1:0});for(var m=d[0].source,v=d[0].target,y=0;y<d.length&&(m=o.isContinuous&&o.locked?o.getCurrentFace():!o.isContinuous||o.isEdgeSupported(d[y].source)?d[y].source:null,v=s.isContinuous&&s.locked?s.getCurrentFace():!s.isContinuous||s.isEdgeSupported(d[y].target)?d[y].target:null,null==m||null==v);y++);return o.isContinuous&&o.setCurrentFace(m),s.isContinuous&&s.setCurrentFace(v),{a:[m,v],theta:c,theta2:h}},e.Anchor=function(e){this.x=e.x||0,this.y=e.y||0,this.elementId=e.elementId,this.cssClass=e.cssClass||"",this.orientation=e.orientation||[0,0],this.lastReturnValue=null,this.offsets=e.offsets||[0,0],this.timestamp=null,this._unrotatedOrientation=[this.orientation[0],this.orientation[1]],this.relocatable=!1!==e.relocatable,this.snapOnRelocate=!1!==e.snapOnRelocate,this.locked=!1,t.EventGenerator.apply(this),this.compute=function(t){var e=t.xy,n=t.wh,i=t.timestamp;if(i&&i===this.timestamp)return this.lastReturnValue;var o=[e[0]+this.x*n[0]+this.offsets[0],e[1]+this.y*n[1]+this.offsets[1],this.x,this.y],s=t.rotation;if(null!=s&&0!==s){var r=jsPlumbUtil.rotatePoint(o,[e[0]+n[0]/2,e[1]+n[1]/2],s);this.orientation[0]=Math.round(this._unrotatedOrientation[0]*r[2]-this._unrotatedOrientation[1]*r[3]),this.orientation[1]=Math.round(this._unrotatedOrientation[1]*r[2]+this._unrotatedOrientation[0]*r[3]),this.lastReturnValue=[r[0],r[1],this.x,this.y]}else this.orientation[0]=this._unrotatedOrientation[0],this.orientation[1]=this._unrotatedOrientation[1],this.lastReturnValue=o;return this.timestamp=i,this.lastReturnValue},this.getCurrentLocation=function(t){return t=t||{},null==this.lastReturnValue||null!=t.timestamp&&this.timestamp!==t.timestamp?this.compute(t):this.lastReturnValue},this.setPosition=function(t,e,n,i,o){this.locked&&!o||(this.x=t,this.y=e,this.orientation=[n,i],this.lastReturnValue=null)}},t.extend(e.Anchor,t.EventGenerator,{equals:function(t){if(!t)return!1;var e=t.getOrientation(),n=this.getOrientation();return this.x===t.x&&this.y===t.y&&this.offsets[0]===t.offsets[0]&&this.offsets[1]===t.offsets[1]&&n[0]===e[0]&&n[1]===e[1]},getOrientation:function(){return this.orientation},getCssClass:function(){return this.cssClass}}),e.FloatingAnchor=function(t){e.Anchor.apply(this,arguments);var n=t.reference,i=t.referenceCanvas,o=e.getSize(i),s=null,r=null;this.orientation=null,this.x=0,this.y=0,this.isFloating=!0,this.compute=function(t){var e=t.xy,n=[e[0]+o[0]/2,e[1]+o[1]/2];return r=n,n},this.getOrientation=function(t){if(s)return s;var e=n.getOrientation(t);return[0*Math.abs(e[0])*-1,0*Math.abs(e[1])*-1]},this.over=function(t,e){s=t.getOrientation(e)},this.out=function(){s=null},this.getCurrentLocation=function(t){return null==r?this.compute(t):r}},t.extend(e.FloatingAnchor,e.Anchor);e.DynamicAnchor=function(t){e.Anchor.apply(this,arguments),this.isDynamic=!0,this.anchors=[],this.elementId=t.elementId,this.jsPlumbInstance=t.jsPlumbInstance;for(var n=0;n<t.anchors.length;n++)this.anchors[n]=(i=t.anchors[n],o=this.jsPlumbInstance,s=this.elementId,i.constructor===e.Anchor?i:o.makeAnchor(i,s,o));var i,o,s;this.getAnchors=function(){return this.anchors};var r=this.anchors.length>0?this.anchors[0]:null,a=r,l=function(t,e,n,i,o,s,r){var a=i[0]+t.x*o[0],l=i[1]+t.y*o[1],u=i[0]+o[0]/2,c=i[1]+o[1]/2;if(null!=s&&0!==s){var h=jsPlumbUtil.rotatePoint([a,l],[u,c],s);a=h[0],l=h[1]}return Math.sqrt(Math.pow(e-a,2)+Math.pow(n-l,2))+Math.sqrt(Math.pow(u-a,2)+Math.pow(c-l,2))},u=t.selector||function(t,e,n,i,o,s,r){for(var a=n[0]+i[0]/2,u=n[1]+i[1]/2,c=-1,h=1/0,d=0;d<r.length;d++){var p=l(r[d],a,u,t,e,o);p<h&&(c=d+0,h=p)}return r[c]};this.compute=function(t){var e=t.xy,n=t.wh,i=t.txy,o=t.twh,s=t.rotation,l=t.tRotation;return this.timestamp=t.timestamp,this.locked||null==i||null==o?(this.lastReturnValue=r.compute(t),this.lastReturnValue):(t.timestamp=null,r=u(e,n,i,o,s,l,this.anchors),this.x=r.x,this.y=r.y,r!==a&&this.fire("anchorChanged",r),a=r,this.lastReturnValue=r.compute(t),this.lastReturnValue)},this.getCurrentLocation=function(t){return null!=r?r.getCurrentLocation(t):null},this.getOrientation=function(t){return null!=r?r.getOrientation(t):[0,0]},this.over=function(t,e){null!=r&&r.over(t,e)},this.out=function(){null!=r&&r.out()},this.setAnchor=function(t){r=t},this.getCssClass=function(){return r&&r.getCssClass()||""},this.setAnchorCoordinates=function(t){var e=jsPlumbUtil.findWithFunction(this.anchors,function(e){return e.x===t[0]&&e.y===t[1]});return-1!==e&&(this.setAnchor(this.anchors[e]),!0)}},t.extend(e.DynamicAnchor,e.Anchor);var n=function(t,n,i,o,s,r){e.Anchors[s]=function(e){var a=e.jsPlumbInstance.makeAnchor([t,n,i,o,0,0],e.elementId,e.jsPlumbInstance);return a.type=s,r&&r(a,e),a}};n(.5,0,0,-1,"TopCenter"),n(.5,1,0,1,"BottomCenter"),n(0,.5,-1,0,"LeftMiddle"),n(1,.5,1,0,"RightMiddle"),n(.5,0,0,-1,"Top"),n(.5,1,0,1,"Bottom"),n(0,.5,-1,0,"Left"),n(1,.5,1,0,"Right"),n(.5,.5,0,0,"Center"),n(1,0,0,-1,"TopRight"),n(1,1,0,1,"BottomRight"),n(0,0,0,-1,"TopLeft"),n(0,1,0,1,"BottomLeft"),e.Defaults.DynamicAnchors=function(t){return t.jsPlumbInstance.makeAnchors(["TopCenter","RightMiddle","BottomCenter","LeftMiddle"],t.elementId,t.jsPlumbInstance)},e.Anchors.AutoDefault=function(t){var n=t.jsPlumbInstance.makeDynamicAnchor(e.Defaults.DynamicAnchors(t));return n.type="AutoDefault",n};var i=function(t,n){e.Anchors[t]=function(e){var i=e.jsPlumbInstance.makeAnchor(["Continuous",{faces:n}],e.elementId,e.jsPlumbInstance);return i.type=t,i}};e.Anchors.Continuous=function(t){return t.jsPlumbInstance.continuousAnchorFactory.get(t)},i("ContinuousLeft",["left"]),i("ContinuousTop",["top"]),i("ContinuousBottom",["bottom"]),i("ContinuousRight",["right"]),n(0,0,0,0,"Assign",function(t,e){var n=e.position||"Fixed";t.positionFinder=n.constructor===String?e.jsPlumbInstance.AnchorPositionFinders[n]:n,t.constructorParams=e}),this.jsPlumbInstance.prototype.AnchorPositionFinders={Fixed:function(t,e,n){return[(t.left-e.left)/n[0],(t.top-e.top)/n[1]]},Grid:function(t,e,n,i){var o=t.left-e.left,s=t.top-e.top,r=n[0]/i.grid[0],a=n[1]/i.grid[1],l=Math.floor(o/r),u=Math.floor(s/a);return[(l*r+r/2)/n[0],(u*a+a/2)/n[1]]}},e.Anchors.Perimeter=function(t){var e=(t=t||{}).anchorCount||60,n=t.shape;if(!n)throw new Error("no shape supplied to Perimeter Anchor type");var i=function(){for(var t=2*Math.PI/e,n=0,i=[],o=0;o<e;o++){var s=.5+.5*Math.sin(n),r=.5+.5*Math.cos(n);i.push([s,r,0,0]),n+=t}return i},o=function(t){for(var n=e/t.length,i=[],o=function(t,o,s,r,a,l,u){for(var c=(s-t)/(n=e*a),h=(r-o)/n,d=0;d<n;d++)i.push([t+c*d,o+h*d,null==l?0:l,null==u?0:u])},s=0;s<t.length;s++)o.apply(null,t[s]);return i},s=function(t){for(var e=[],n=0;n<t.length;n++)e.push([t[n][0],t[n][1],t[n][2],t[n][3],1/t.length,t[n][4],t[n][5]]);return o(e)},r=function(){return s([[0,0,1,0,0,-1],[1,0,1,1,1,0],[1,1,0,1,0,1],[0,1,0,0,-1,0]])},a={Circle:i,Ellipse:i,Diamond:function(){return s([[.5,0,1,.5],[1,.5,.5,1],[.5,1,0,.5],[0,.5,.5,0]])},Rectangle:r,Square:r,Triangle:function(){return s([[.5,0,1,1],[1,1,0,1],[0,1,.5,0]])},Path:function(t){for(var e=t.points,n=[],i=0,s=0;s<e.length-1;s++){var r=Math.sqrt(Math.pow(e[s][2]-e[s][0])+Math.pow(e[s][3]-e[s][1]));i+=r,n.push([e[s][0],e[s][1],e[s+1][0],e[s+1][1],r])}for(var a=0;a<n.length;a++)n[a][4]=n[a][4]/i;return o(n)}};if(!a[n])throw new Error("Shape ["+n+"] is unknown by Perimeter Anchor type");var l=a[n](t);t.rotation&&(l=function(t,e){for(var n=[],i=e/180*Math.PI,o=0;o<t.length;o++){var s=t[o][0]-.5,r=t[o][1]-.5;n.push([s*Math.cos(i)-r*Math.sin(i)+.5,s*Math.sin(i)+r*Math.cos(i)+.5,t[o][2],t[o][3]])}return n}(l,t.rotation));var u=t.jsPlumbInstance.makeDynamicAnchor(l);return u.type="Perimeter",u}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil;var t=this.jsPlumb;t.DefaultRouter=function(e){this.jsPlumbInstance=e,this.anchorManager=new t.AnchorManager({jsPlumbInstance:e}),this.sourceOrTargetChanged=function(t,e,n,i,o){this.anchorManager.sourceOrTargetChanged(t,e,n,i,o)},this.reset=function(){this.anchorManager.reset()},this.changeId=function(t,e){this.anchorManager.changeId(t,e)},this.elementRemoved=function(t){this.anchorManager.elementRemoved(t)},this.newConnection=function(t){this.anchorManager.newConnection(t)},this.connectionDetached=function(t,e){this.anchorManager.connectionDetached(t,e)},this.redraw=function(t,e,n,i,o,s){return this.anchorManager.redraw(t,e,n,i,o,s)},this.deleteEndpoint=function(t){this.anchorManager.deleteEndpoint(t)},this.rehomeEndpoint=function(t,e,n){this.anchorManager.rehomeEndpoint(t,e,n)},this.addEndpoint=function(t,e){this.anchorManager.addEndpoint(t,e)}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Biltong;e.Segments={AbstractSegment:function(t){this.params=t,this.findClosestPointOnPath=function(t,e){return{d:1/0,x:null,y:null,l:null}},this.getBounds=function(){return{minX:Math.min(t.x1,t.x2),minY:Math.min(t.y1,t.y2),maxX:Math.max(t.x1,t.x2),maxY:Math.max(t.y1,t.y2)}},this.lineIntersection=function(t,e,n,i){return[]},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.y)}},Straight:function(t){var n,o,s,r,a,l,u;e.Segments.AbstractSegment.apply(this,arguments);this.type="Straight",this.getLength=function(){return n},this.getGradient=function(){return o},this.getCoordinates=function(){return{x1:r,y1:l,x2:a,y2:u}},this.setCoordinates=function(t){r=t.x1,l=t.y1,a=t.x2,u=t.y2,n=Math.sqrt(Math.pow(a-r,2)+Math.pow(u-l,2)),o=i.gradient({x:r,y:l},{x:a,y:u}),s=-1/o},this.setCoordinates({x1:t.x1,y1:t.y1,x2:t.x2,y2:t.y2}),this.getBounds=function(){return{minX:Math.min(r,a),minY:Math.min(l,u),maxX:Math.max(r,a),maxY:Math.max(l,u)}},this.pointOnPath=function(t,e){if(0!==t||e){if(1!==t||e){var o=e?t>0?t:n+t:t*n;return i.pointOnLine({x:r,y:l},{x:a,y:u},o)}return{x:a,y:u}}return{x:r,y:l}},this.gradientAtPoint=function(t){return o},this.pointAlongPathFrom=function(t,e,n){var o=this.pointOnPath(t,n),s=e<=0?{x:r,y:l}:{x:a,y:u};return e<=0&&Math.abs(e)>1&&(e*=-1),i.pointOnLine(o,s,e)};var c=function(t,e,n){return n>=Math.min(t,e)&&n<=Math.max(t,e)},h=function(t,e,n){return Math.abs(n-t)<Math.abs(n-e)?t:e};this.findClosestPointOnPath=function(t,e){var d={d:1/0,x:null,y:null,l:null,x1:r,x2:a,y1:l,y2:u};if(0===o)d.y=l,d.x=c(r,a,t)?t:h(r,a,t);else if(o===1/0||o===-1/0)d.x=r,d.y=c(l,u,e)?e:h(l,u,e);else{var p=l-o*r,f=(e-s*t-p)/(o-s),g=o*f+p;d.x=c(r,a,f)?f:h(r,a,f),d.y=c(l,u,g)?g:h(l,u,g)}var m=i.lineLength([d.x,d.y],[r,l]);return d.d=i.lineLength([t,e],[d.x,d.y]),d.l=m/n,d};var d=function(t,e,n){return n>e?e<=t&&t<=n:e>=t&&t>=n};this.lineIntersection=function(t,e,n,s){var c=Math.abs(i.gradient({x:t,y:e},{x:n,y:s})),h=Math.abs(o),p=h===1/0?r:l-h*r,f=[],g=c===1/0?t:e-c*t;if(c!==h)if(c===1/0&&0===h)d(t,r,a)&&d(l,e,s)&&(f=[t,l]);else if(0===c&&h===1/0)d(e,l,u)&&d(r,t,n)&&(f=[r,e]);else{var m,v;c===1/0?d(m=t,r,a)&&d(v=h*t+p,e,s)&&(f=[m,v]):0===c?d(v=e,l,u)&&d(m=(e-p)/h,t,n)&&(f=[m,v]):(v=h*(m=(g-p)/(h-c))+p,d(m,r,a)&&d(v,l,u)&&(f=[m,v]))}return f},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.h)}},Arc:function(t){e.Segments.AbstractSegment.apply(this,arguments);var n=function(e,n){return i.theta([t.cx,t.cy],[e,n])},o=2*Math.PI;this.radius=t.r,this.anticlockwise=t.ac,this.type="Arc",t.startAngle&&t.endAngle?(this.startAngle=t.startAngle,this.endAngle=t.endAngle,this.x1=t.cx+this.radius*Math.cos(t.startAngle),this.y1=t.cy+this.radius*Math.sin(t.startAngle),this.x2=t.cx+this.radius*Math.cos(t.endAngle),this.y2=t.cy+this.radius*Math.sin(t.endAngle)):(this.startAngle=n(t.x1,t.y1),this.endAngle=n(t.x2,t.y2),this.x1=t.x1,this.y1=t.y1,this.x2=t.x2,this.y2=t.y2),this.endAngle<0&&(this.endAngle+=o),this.startAngle<0&&(this.startAngle+=o);var s=this.endAngle<this.startAngle?this.endAngle+o:this.endAngle;this.sweep=Math.abs(s-this.startAngle),this.anticlockwise&&(this.sweep=o-this.sweep);var r=2*Math.PI*this.radius,a=this.sweep/o,l=r*a;this.getLength=function(){return l},this.getBounds=function(){return{minX:t.cx-t.r,maxX:t.cx+t.r,minY:t.cy-t.r,maxY:t.cy+t.r}};var u=function(t){var e=Math.floor(t),n=Math.ceil(t);return t-e<1e-10?e:n-t<1e-10?n:t};this.pointOnPath=function(e,n){if(0===e)return{x:this.x1,y:this.y1,theta:this.startAngle};if(1===e)return{x:this.x2,y:this.y2,theta:this.endAngle};n&&(e/=l);var i=function(t,e){if(t.anticlockwise){var n=t.startAngle<t.endAngle?t.startAngle+o:t.startAngle;return n-Math.abs(n-t.endAngle)*e}var i=t.endAngle<t.startAngle?t.endAngle+o:t.endAngle,s=Math.abs(i-t.startAngle);return t.startAngle+s*e}(this,e),s=t.cx+t.r*Math.cos(i),r=t.cy+t.r*Math.sin(i);return{x:u(s),y:u(r),theta:i}},this.gradientAtPoint=function(e,n){var o=this.pointOnPath(e,n),s=i.normal([t.cx,t.cy],[o.x,o.y]);return this.anticlockwise||s!==1/0&&s!==-1/0||(s*=-1),s},this.pointAlongPathFrom=function(e,n,i){var o=this.pointOnPath(e,i),s=n/r*2*Math.PI,a=this.anticlockwise?-1:1,l=o.theta+a*s;return{x:t.cx+this.radius*Math.cos(l),y:t.cy+this.radius*Math.sin(l)}}},Bezier:function(n){this.curve=[{x:n.x1,y:n.y1},{x:n.cp1x,y:n.cp1y},{x:n.cp2x,y:n.cp2y},{x:n.x2,y:n.y2}];var i=function(t){var e={x:0,y:0};if(0===t)return this.curve[0];var n=this.curve.length-1;if(1===t)return this.curve[n];var i=this.curve,o=1-t;if(0===n)return this.curve[0];if(1===n)return{x:o*i[0].x+t*i[1].x,y:o*i[0].y+t*i[1].y};if(n<4){var s,r,a,l=o*o,u=t*t,c=0;return 2===n?(i=[i[0],i[1],i[2],e],s=l,r=o*t*2,a=u):3===n&&(s=l*o,r=l*t*3,a=o*u*3,c=t*u),{x:s*i[0].x+r*i[1].x+a*i[2].x+c*i[3].x,y:s*i[0].y+r*i[1].y+a*i[2].y+c*i[3].y}}return e}.bind(this),o=function(){var t;(t=this.curve)[0].x===t[1].x&&t[0].y===t[1].y&&(this.length=0);var e,n,o=function(t){var e=[];t--;for(var n=0;n<=t;n++)e.push(i(n/t));return e}(16);this.length=0;for(var s=0;s<15;s++){var r=o[s],a=o[s+1];this.length+=(e=r,n=a,Math.sqrt(Math.pow(e.x-n.x,2)+Math.pow(e.y-n.y,2)))}}.bind(this);e.Segments.AbstractSegment.apply(this,arguments);this.bounds={minX:Math.min(n.x1,n.x2,n.cp1x,n.cp2x),minY:Math.min(n.y1,n.y2,n.cp1y,n.cp2y),maxX:Math.max(n.x1,n.x2,n.cp1x,n.cp2x),maxY:Math.max(n.y1,n.y2,n.cp1y,n.cp2y)},this.type="Bezier",o();var s=function(e,n,i){return i&&(n=t.jsBezier.locationAlongCurveFrom(e,n>0?0:1,n)),n};this.pointOnPath=function(e,n){return e=s(this.curve,e,n),t.jsBezier.pointOnCurve(this.curve,e)},this.gradientAtPoint=function(e,n){return e=s(this.curve,e,n),t.jsBezier.gradientAtPoint(this.curve,e)},this.pointAlongPathFrom=function(e,n,i){return e=s(this.curve,e,i),t.jsBezier.pointAlongCurveFrom(this.curve,e,n)},this.getLength=function(){return this.length},this.getBounds=function(){return this.bounds},this.findClosestPointOnPath=function(e,n){var i=t.jsBezier.nearestPointOnCurve({x:e,y:n},this.curve);return{d:Math.sqrt(Math.pow(i.point.x-e,2)+Math.pow(i.point.y-n,2)),x:i.point.x,y:i.point.y,l:1-i.location,s:this}},this.lineIntersection=function(e,n,i,o){return t.jsBezier.lineIntersection(e,n,i,o,this.curve)}}},e.SegmentRenderer={getPath:function(t,e){return{Straight:function(e){var n=t.getCoordinates();return(e?"M "+n.x1+" "+n.y1+" ":"")+"L "+n.x2+" "+n.y2},Bezier:function(e){var n=t.params;return(e?"M "+n.x2+" "+n.y2+" ":"")+"C "+n.cp2x+" "+n.cp2y+" "+n.cp1x+" "+n.cp1y+" "+n.x1+" "+n.y1},Arc:function(e){var n=t.params,i=t.sweep>Math.PI?1:0,o=t.anticlockwise?0:1;return(e?"M"+t.x1+" "+t.y1+" ":"")+"A "+t.radius+" "+n.r+" 0 "+i+","+o+" "+t.x2+" "+t.y2}}[t.type](e)}};var o=function(){this.resetBounds=function(){this.bounds={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0}},this.resetBounds()};e.Connectors.AbstractConnector=function(t){o.apply(this,arguments);var s=[],r=0,a=[],l=[],u=t.stub||0,c=n.isArray(u)?u[0]:u,h=n.isArray(u)?u[1]:u,d=t.gap||0,p=n.isArray(d)?d[0]:d,f=n.isArray(d)?d[1]:d,g=null,m=null;this.getPathData=function(){for(var t="",n=0;n<s.length;n++)t+=e.SegmentRenderer.getPath(s[n],0===n),t+=" ";return t},this.findSegmentForPoint=function(t,e){for(var n={d:1/0,s:null,x:null,y:null,l:null},i=0;i<s.length;i++){var o=s[i].findClosestPointOnPath(t,e);o.d<n.d&&(n.d=o.d,n.l=o.l,n.x=o.x,n.y=o.y,n.s=s[i],n.x1=o.x1,n.x2=o.x2,n.y1=o.y1,n.y2=o.y2,n.index=i,n.connectorLocation=a[i][0]+o.l*(a[i][1]-a[i][0]))}return n},this.lineIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].lineIntersection(t,e,n,i));return o},this.boxIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].boxIntersection(t,e,n,i));return o},this.boundingBoxIntersection=function(t){for(var e=[],n=0;n<s.length;n++)e.push.apply(e,s[n].boundingBoxIntersection(t));return e};var v=function(t,e){var n,i,o;if(e&&(t=t>0?t/r:(r+t)/r),1===t)n=s.length-1,o=1;else if(0===t)o=0,n=0;else if(t>=.5){for(n=0,o=0,i=a.length-1;i>-1;i--)if(a[i][1]>=t&&a[i][0]<=t){n=i,o=(t-a[i][0])/l[i];break}}else for(n=a.length-1,o=1,i=0;i<a.length;i++)if(a[i][1]>=t){n=i,o=(t-a[i][0])/l[i];break}return{segment:s[n],proportion:o,index:n}};this.setSegments=function(t){g=[],r=0;for(var e=0;e<t.length;e++)g.push(t[e]),r+=t[e].getLength()},this.getLength=function(){return r};var y=function(t){this.strokeWidth=t.strokeWidth;var e=i.quadrant(t.sourcePos,t.targetPos),n=t.targetPos[0]<t.sourcePos[0],o=t.targetPos[1]<t.sourcePos[1],s=t.strokeWidth||1,r=t.sourceEndpoint.anchor.getOrientation(t.sourceEndpoint),a=t.targetEndpoint.anchor.getOrientation(t.targetEndpoint),l=n?t.targetPos[0]:t.sourcePos[0],u=o?t.targetPos[1]:t.sourcePos[1],d=Math.abs(t.targetPos[0]-t.sourcePos[0]),g=Math.abs(t.targetPos[1]-t.sourcePos[1]);if(0===r[0]&&0===r[1]||0===a[0]&&0===a[1]){var m=d>g?0:1,v=[1,0][m];a=[],(r=[])[m]=t.sourcePos[m]>t.targetPos[m]?-1:1,a[m]=t.sourcePos[m]>t.targetPos[m]?1:-1,r[v]=0,a[v]=0}var y=n?d+p*r[0]:p*r[0],b=o?g+p*r[1]:p*r[1],P=n?f*a[0]:d+f*a[0],x=o?f*a[1]:g+f*a[1],C=r[0]*a[0]+r[1]*a[1],_={sx:y,sy:b,tx:P,ty:x,lw:s,xSpan:Math.abs(P-y),ySpan:Math.abs(x-b),mx:(y+P)/2,my:(b+x)/2,so:r,to:a,x:l,y:u,w:d,h:g,segment:e,startStubX:y+r[0]*c,startStubY:b+r[1]*c,endStubX:P+a[0]*h,endStubY:x+a[1]*h,isXGreaterThanStubTimes2:Math.abs(y-P)>c+h,isYGreaterThanStubTimes2:Math.abs(b-x)>c+h,opposite:-1===C,perpendicular:0===C,orthogonal:1===C,sourceAxis:0===r[0]?"y":"x",points:[l,u,d,g,y,b,P,x],stubs:[c,h]};return _.anchorOrientation=_.opposite?"opposite":_.orthogonal?"orthogonal":"perpendicular",_};return this.getSegments=function(){return s},this.updateBounds=function(t){var e=t.getBounds();this.bounds.minX=Math.min(this.bounds.minX,e.minX),this.bounds.maxX=Math.max(this.bounds.maxX,e.maxX),this.bounds.minY=Math.min(this.bounds.minY,e.minY),this.bounds.maxY=Math.max(this.bounds.maxY,e.maxY)},this.pointOnPath=function(t,e){var n=v(t,e);return n.segment&&n.segment.pointOnPath(n.proportion,!1)||[0,0]},this.gradientAtPoint=function(t,e){var n=v(t,e);return n.segment&&n.segment.gradientAtPoint(n.proportion,!1)||0},this.pointAlongPathFrom=function(t,e,n){var i=v(t,n);return i.segment&&i.segment.pointAlongPathFrom(i.proportion,e,!1)||[0,0]},this.compute=function(t){m=y.call(this,t),r=s.length=a.length=l.length=0,this._compute(m,t),this.x=m.points[0],this.y=m.points[1],this.w=m.points[2],this.h=m.points[3],this.segment=m.segment,function(){for(var t=0,e=0;e<s.length;e++){var n=s[e].getLength();l[e]=n/r,a[e]=[t,t+=n/r]}}()},{addSegment:function(t,n,i){if(i.x1!==i.x2||i.y1!==i.y2){var o=new e.Segments[n](i);s.push(o),r+=o.getLength(),t.updateBounds(o)}},prepareCompute:y,sourceStub:c,targetStub:h,maxStub:Math.max(c,h),sourceGap:p,targetGap:f,maxGap:Math.max(p,f)}},n.extend(e.Connectors.AbstractConnector,o),e.Endpoints.AbstractEndpoint=function(t){return o.apply(this,arguments),{compute:this.compute=function(t,e,n,i){var o=this._compute.apply(this,arguments);return this.x=o[0],this.y=o[1],this.w=o[2],this.h=o[3],this.bounds.minX=this.x,this.bounds.minY=this.y,this.bounds.maxX=this.x+this.w,this.bounds.maxY=this.y+this.h,o},cssClass:t.cssClass}},n.extend(e.Endpoints.AbstractEndpoint,o),e.Endpoints.Dot=function(t){this.type="Dot";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.radius=t.radius||10,this.defaultOffset=.5*this.radius,this.defaultInnerRadius=this.radius/3,this._compute=function(t,e,n,i){this.radius=n.radius||this.radius;var o=t[0]-this.radius,s=t[1]-this.radius,r=2*this.radius,a=2*this.radius;if(n.stroke){var l=n.strokeWidth||1;o-=l,s-=l,r+=2*l,a+=2*l}return[o,s,r,a,this.radius]}},n.extend(e.Endpoints.Dot,e.Endpoints.AbstractEndpoint),e.Endpoints.Rectangle=function(t){this.type="Rectangle";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.width=t.width||20,this.height=t.height||20,this._compute=function(t,e,n,i){var o=n.width||this.width,s=n.height||this.height;return[t[0]-o/2,t[1]-s/2,o,s]}},n.extend(e.Endpoints.Rectangle,e.Endpoints.AbstractEndpoint);var s=function(t){e.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.displayElements=[]};n.extend(s,e.jsPlumbUIComponent,{getDisplayElements:function(){return this._jsPlumb.displayElements},appendDisplayElement:function(t){this._jsPlumb.displayElements.push(t)}}),e.Endpoints.Image=function(i){this.type="Image",s.apply(this,arguments),e.Endpoints.AbstractEndpoint.apply(this,arguments);var o=i.onload,r=i.src||i.url,a=i.cssClass?" "+i.cssClass:"";this._jsPlumb.img=new Image,this._jsPlumb.ready=!1,this._jsPlumb.initialized=!1,this._jsPlumb.deleted=!1,this._jsPlumb.widthToUse=i.width,this._jsPlumb.heightToUse=i.height,this._jsPlumb.endpoint=i.endpoint,this._jsPlumb.img.onload=function(){null!=this._jsPlumb&&(this._jsPlumb.ready=!0,this._jsPlumb.widthToUse=this._jsPlumb.widthToUse||this._jsPlumb.img.width,this._jsPlumb.heightToUse=this._jsPlumb.heightToUse||this._jsPlumb.img.height,o&&o(this))}.bind(this),this._jsPlumb.endpoint.setImage=function(t,e){var n=t.constructor===String?t:t.src;o=e,this._jsPlumb.img.src=n,null!=this.canvas&&this.canvas.setAttribute("src",this._jsPlumb.img.src)}.bind(this),this._jsPlumb.endpoint.setImage(r,o),this._compute=function(t,e,n,i){return this.anchorPoint=t,this._jsPlumb.ready?[t[0]-this._jsPlumb.widthToUse/2,t[1]-this._jsPlumb.heightToUse/2,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse]:[0,0,0,0]},this.canvas=e.createElement("img",{position:"absolute",margin:0,padding:0,outline:0},this._jsPlumb.instance.endpointClass+a),this._jsPlumb.widthToUse&&this.canvas.setAttribute("width",this._jsPlumb.widthToUse),this._jsPlumb.heightToUse&&this.canvas.setAttribute("height",this._jsPlumb.heightToUse),this._jsPlumb.instance.appendElement(this.canvas),this.actuallyPaint=function(t,e,i){if(!this._jsPlumb.deleted){this._jsPlumb.initialized||(this.canvas.setAttribute("src",this._jsPlumb.img.src),this.appendDisplayElement(this.canvas),this._jsPlumb.initialized=!0);var o=this.anchorPoint[0]-this._jsPlumb.widthToUse/2,s=this.anchorPoint[1]-this._jsPlumb.heightToUse/2;n.sizeElement(this.canvas,o,s,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse)}},this.paint=function(e,n){null!=this._jsPlumb&&(this._jsPlumb.ready?this.actuallyPaint(e,n):t.setTimeout(function(){this.paint(e,n)}.bind(this),200))}},n.extend(e.Endpoints.Image,[s,e.Endpoints.AbstractEndpoint],{cleanup:function(t){t&&(this._jsPlumb.deleted=!0,this.canvas&&this.canvas.parentNode.removeChild(this.canvas),this.canvas=null)}}),e.Endpoints.Blank=function(t){e.Endpoints.AbstractEndpoint.apply(this,arguments);this.type="Blank",s.apply(this,arguments),this._compute=function(t,e,n,i){return[t[0],t[1],10,0]};var i=t.cssClass?" "+t.cssClass:"";this.canvas=e.createElement("div",{display:"block",width:"1px",height:"1px",background:"transparent",position:"absolute"},this._jsPlumb.instance.endpointClass+i),this._jsPlumb.instance.appendElement(this.canvas),this.paint=function(t,e){n.sizeElement(this.canvas,this.x,this.y,this.w,this.h)}},n.extend(e.Endpoints.Blank,[e.Endpoints.AbstractEndpoint,s],{cleanup:function(){this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas)}}),e.Endpoints.Triangle=function(t){this.type="Triangle",e.Endpoints.AbstractEndpoint.apply(this,arguments);var n=this;(t=t||{}).width=t.width||55,t.height=t.height||55,this.width=t.width,this.height=t.height,this._compute=function(t,e,i,o){var s=i.width||n.width,r=i.height||n.height;return[t[0]-s/2,t[1]-r/2,s,r]}};var r=e.Overlays.AbstractOverlay=function(t){this.visible=!0,this.isAppendedAtTopLevel=!0,this.component=t.component,this.loc=null==t.location?.5:t.location,this.endpointLoc=null==t.endpointLocation?[.5,.5]:t.endpointLocation,this.visible=!1!==t.visible};r.prototype={cleanup:function(t){t&&(this.component=null,this.canvas=null,this.endpointLoc=null)},reattach:function(t,e){},setVisible:function(t){this.visible=t,this.component.repaint()},isVisible:function(){return this.visible},hide:function(){this.setVisible(!1)},show:function(){this.setVisible(!0)},incrementLocation:function(t){this.loc+=t,this.component.repaint()},setLocation:function(t){this.loc=t,this.component.repaint()},getLocation:function(){return this.loc},updateFrom:function(){}},e.Overlays.Arrow=function(t){this.type="Arrow",r.apply(this,arguments),this.isAppendedAtTopLevel=!1,t=t||{};var o=this;this.length=t.length||20,this.width=t.width||20,this.id=t.id,this.direction=(t.direction||1)<0?-1:1;var s=t.paintStyle||{"stroke-width":1},a=t.foldback||.623;this.computeMaxSize=function(){return 1.5*o.width},this.elementCreated=function(n,i){if(this.path=n,t.events)for(var o in t.events)e.on(n,o,t.events[o])},this.draw=function(t,e){var o,r,l,u;if(t.pointAlongPathFrom){if(n.isString(this.loc)||this.loc>1||this.loc<0){var c=parseInt(this.loc,10),h=this.loc<0?1:0;o=t.pointAlongPathFrom(h,c,!1),r=t.pointAlongPathFrom(h,c-this.direction*this.length/2,!1),l=i.pointOnLine(o,r,this.length)}else if(1===this.loc){if(o=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,-this.length),l=i.pointOnLine(o,r,this.length),-1===this.direction){var d=l;l=o,o=d}}else if(0===this.loc){if(l=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,this.length),o=i.pointOnLine(l,r,this.length),-1===this.direction){var p=l;l=o,o=p}}else o=t.pointAlongPathFrom(this.loc,this.direction*this.length/2),r=t.pointOnPath(this.loc),l=i.pointOnLine(o,r,this.length);var f={hxy:o,tail:u=i.perpendicularLineTo(o,l,this.width),cxy:i.pointOnLine(o,l,a*this.length)},g=s.stroke||e.stroke,m=s.fill||e.stroke;return{component:t,d:f,"stroke-width":s.strokeWidth||e.strokeWidth,stroke:g,fill:m,minX:Math.min(o.x,u[0].x,u[1].x),maxX:Math.max(o.x,u[0].x,u[1].x),minY:Math.min(o.y,u[0].y,u[1].y),maxY:Math.max(o.y,u[0].y,u[1].y)}}return{component:t,minX:0,maxX:0,minY:0,maxY:0}}},n.extend(e.Overlays.Arrow,r,{updateFrom:function(t){this.length=t.length||this.length,this.width=t.width||this.width,this.direction=null!=t.direction?t.direction:this.direction,this.foldback=t.foldback||this.foldback},cleanup:function(){this.path&&this.path.parentNode&&this.path.parentNode.removeChild(this.path)}}),e.Overlays.PlainArrow=function(t){t=t||{};var n=e.extend(t,{foldback:1});e.Overlays.Arrow.call(this,n),this.type="PlainArrow"},n.extend(e.Overlays.PlainArrow,e.Overlays.Arrow),e.Overlays.Diamond=function(t){var n=(t=t||{}).length||40,i=e.extend(t,{length:n/2,foldback:2});e.Overlays.Arrow.call(this,i),this.type="Diamond"},n.extend(e.Overlays.Diamond,e.Overlays.Arrow);var a=function(t,e){return(null==t._jsPlumb.cachedDimensions||e)&&(t._jsPlumb.cachedDimensions=t.getDimensions()),t._jsPlumb.cachedDimensions},l=function(t){e.jsPlumbUIComponent.apply(this,arguments),r.apply(this,arguments);var i=this.fire;this.fire=function(){i.apply(this,arguments),this.component&&this.component.fire.apply(this.component,arguments)},this.detached=!1,this.id=t.id,this._jsPlumb.div=null,this._jsPlumb.initialised=!1,this._jsPlumb.component=t.component,this._jsPlumb.cachedDimensions=null,this._jsPlumb.create=t.create,this._jsPlumb.initiallyInvisible=!1===t.visible,this.getElement=function(){if(null==this._jsPlumb.div){var n=this._jsPlumb.div=e.getElement(this._jsPlumb.create(this._jsPlumb.component));n.style.position="absolute",jsPlumb.addClass(n,this._jsPlumb.instance.overlayClass+" "+(this.cssClass?this.cssClass:t.cssClass?t.cssClass:"")),this._jsPlumb.instance.appendElement(n),this._jsPlumb.instance.getId(n),this.canvas=n;var i="translate(-50%, -50%)";n.style.webkitTransform=i,n.style.mozTransform=i,n.style.msTransform=i,n.style.oTransform=i,n.style.transform=i,n._jsPlumb=this,!1===t.visible&&(n.style.display="none")}return this._jsPlumb.div},this.draw=function(t,e,i){var o=a(this);if(null!=o&&2===o.length){var s={x:0,y:0};if(i)s={x:i[0],y:i[1]};else if(t.pointOnPath){var r=this.loc,l=!1;(n.isString(this.loc)||this.loc<0||this.loc>1)&&(r=parseInt(this.loc,10),l=!0),s=t.pointOnPath(r,l)}else{var u=this.loc.constructor===Array?this.loc:this.endpointLoc;s={x:u[0]*t.w,y:u[1]*t.h}}var c=s.x-o[0]/2,h=s.y-o[1]/2;return{component:t,d:{minx:c,miny:h,td:o,cxy:s},minX:c,maxX:c+o[0],minY:h,maxY:h+o[1]}}return{minX:0,maxX:0,minY:0,maxY:0}}};n.extend(l,[e.jsPlumbUIComponent,r],{getDimensions:function(){return[1,1]},setVisible:function(t){this._jsPlumb.div&&(this._jsPlumb.div.style.display=t?"block":"none",t&&this._jsPlumb.initiallyInvisible&&(a(this,!0),this.component.repaint(),this._jsPlumb.initiallyInvisible=!1))},clearCachedDimensions:function(){this._jsPlumb.cachedDimensions=null},cleanup:function(t){t?null!=this._jsPlumb.div&&(this._jsPlumb.div._jsPlumb=null,this._jsPlumb.instance.removeElement(this._jsPlumb.div)):(this._jsPlumb&&this._jsPlumb.div&&this._jsPlumb.div.parentNode&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div),this.detached=!0)},reattach:function(t,e){null!=this._jsPlumb.div&&t.getContainer().appendChild(this._jsPlumb.div),this.detached=!1},computeMaxSize:function(){var t=a(this);return Math.max(t[0],t[1])},paint:function(t,e){this._jsPlumb.initialised||(this.getElement(),t.component.appendDisplayElement(this._jsPlumb.div),this._jsPlumb.initialised=!0,this.detached&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div)),this._jsPlumb.div.style.left=t.component.x+t.d.minx+"px",this._jsPlumb.div.style.top=t.component.y+t.d.miny+"px"}}),e.Overlays.Custom=function(t){this.type="Custom",l.apply(this,arguments)},n.extend(e.Overlays.Custom,l),e.Overlays.GuideLines=function(){var t=this;t.length=50,t.strokeWidth=5,this.type="GuideLines",r.apply(this,arguments),e.jsPlumbUIComponent.apply(this,arguments),this.draw=function(e,n){var o=e.pointAlongPathFrom(t.loc,t.length/2),s=e.pointOnPath(t.loc),r=i.pointOnLine(o,s,t.length),a=i.perpendicularLineTo(o,r,40),l=i.perpendicularLineTo(r,o,20);return{connector:e,head:o,tail:r,headLine:l,tailLine:a,minX:Math.min(o.x,r.x,l[0].x,l[1].x),minY:Math.min(o.y,r.y,l[0].y,l[1].y),maxX:Math.max(o.x,r.x,l[0].x,l[1].x),maxY:Math.max(o.y,r.y,l[0].y,l[1].y)}}},e.Overlays.Label=function(t){this.labelStyle=t.labelStyle,this.cssClass=null!=this.labelStyle?this.labelStyle.cssClass:null;var n=e.extend({create:function(){return e.createElement("div")}},t);if(e.Overlays.Custom.call(this,n),this.type="Label",this.label=t.label||"",this.labelText=null,this.labelStyle){var i=this.getElement();if(this.labelStyle.font=this.labelStyle.font||"12px sans-serif",i.style.font=this.labelStyle.font,i.style.color=this.labelStyle.color||"black",this.labelStyle.fill&&(i.style.background=this.labelStyle.fill),this.labelStyle.borderWidth>0){var o=this.labelStyle.borderStyle?this.labelStyle.borderStyle:"black";i.style.border=this.labelStyle.borderWidth+"px solid "+o}this.labelStyle.padding&&(i.style.padding=this.labelStyle.padding)}},n.extend(e.Overlays.Label,e.Overlays.Custom,{cleanup:function(t){t&&(this.div=null,this.label=null,this.labelText=null,this.cssClass=null,this.labelStyle=null)},getLabel:function(){return this.label},setLabel:function(t){this.label=t,this.labelText=null,this.clearCachedDimensions(),this.update(),this.component.repaint()},getDimensions:function(){return this.update(),l.prototype.getDimensions.apply(this,arguments)},update:function(){if("function"==typeof this.label){var t=this.label(this);this.getElement().innerHTML=t.replace(/\r\n/g,"<br/>")}else null==this.labelText&&(this.labelText=this.label,this.getElement().innerHTML=this.labelText.replace(/\r\n/g,"<br/>"))},updateFrom:function(t){null!=t.label&&this.setLabel(t.label)}})}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumbUtil,n=t.jsPlumbInstance,i="stop",o="revert",s="_jsPlumbGroup",r="show",a="hide",l=function(t){var n={},i={},o={},l=this;function u(e,n){for(var i=t.getContainer();;){if(null==e||e===i)return!1;if(e===n)return!0;e=e.parentNode}}function c(e,n){for(var i=e.getEl().querySelectorAll(".jtk-managed"),o=0;o<i.length;o++)t[n?r:a](i[o],!0)}t.bind("connection",function(n){var s=t.getGroupFor(n.source),r=t.getGroupFor(n.target);null!=s&&null!=r&&s===r?(i[n.connection.id]=s,o[n.connection.id]=s):(null!=s&&(e.suggest(s.connections.source,n.connection),i[n.connection.id]=s),null!=r&&(e.suggest(r.connections.target,n.connection),o[n.connection.id]=r))}),t.bind("internal.connectionDetached",function(t){!function(t){delete t.proxies;var n,s=i[t.id];null!=s&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete i[t.id]),null!=(s=o[t.id])&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete o[t.id])}(t.connection)}),t.bind("connectionMoved",function(t){var e=(0===t.index?i:o)[t.connection.id];if(e){var n=e.connections[0===t.index?"source":"target"],s=n.indexOf(t.connection);-1!==s&&n.splice(s,1)}}),this.addGroup=function(e){t.addClass(e.getEl(),"jtk-group-expanded"),n[e.id]=e,e.manager=this,p(e),t.fire("group:add",{group:e})},this.addToGroup=function(e,n,i){if(e=this.getGroup(e)){var o=e.getEl();if(n._isJsPlumbGroup)return;var s=n._jsPlumbGroup;if(s!==e){t.removeFromDragSelection(n);var r=t.getOffset(n,!0),a=e.collapsed?t.getOffset(o,!0):t.getOffset(e.getDragArea(),!0);null!=s&&(s.remove(n,!1,i,!1,e),l.updateConnectionsForGroup(s)),e.add(n,i);var u=function(t,n){var i=0===n?1:0;t.each(function(t){t.setVisible(!1),t.endpoints[i].element._jsPlumbGroup===e?(t.endpoints[i].setVisible(!1),d(t,i,e)):(t.endpoints[n].setVisible(!1),h(t,n,e))})};e.collapsed&&(u(t.select({source:n}),0),u(t.select({target:n}),1));var c=t.getId(n);t.dragManager.setParent(n,c,o,t.getId(o),r);var p={left:r.left-a.left,top:r.top-a.top};if(t.setPosition(n,p),t.dragManager.revalidateParent(n,c,r),l.updateConnectionsForGroup(e),t.revalidate(c),!i){var f={group:e,el:n,pos:p};s&&(f.sourceGroup=s),t.fire("group:addMember",f)}}}},this.removeFromGroup=function(t,e,n){if(t=this.getGroup(t)){if(t.collapsed){var i=function(n,i){for(var o=0;o<n.length;o++){var s=n[o];if(s.proxies)for(var r=0;r<s.proxies.length;r++)if(null!=s.proxies[r]){var a=s.proxies[r].originalEp.element;(a===e||u(a,e))&&d(s,i,t)}}};i(t.connections.source.slice(),0),i(t.connections.target.slice(),1)}t.remove(e,null,n)}},this.getGroup=function(t){var i=t;if(e.isString(t)&&null==(i=n[t]))throw new TypeError("No such group ["+t+"]");return i},this.getGroups=function(){var t=[];for(var e in n)t.push(n[e]);return t},this.removeGroup=function(e,i,o,s){e=this.getGroup(e),this.expandGroup(e,!0);var r=e[i?"removeAll":"orphanAll"](o,s);return t.remove(e.getEl()),delete n[e.id],delete t._groups[e.id],t.fire("group:remove",{group:e}),r},this.removeAllGroups=function(t,e,i){for(var o in n)this.removeGroup(n[o],t,e,i)};var h=function(e,n,i){var o=e.endpoints[0===n?1:0].element;if(!o[s]||o[s].shouldProxy()||!o[s].collapsed){var r=i.getEl(),a=t.getId(r);t.proxyConnection(e,n,r,a,function(t,e){return i.getEndpoint(t,e)},function(t,e){return i.getAnchor(t,e)})}};this.collapseGroup=function(e){if(null!=(e=this.getGroup(e))&&!e.collapsed){var n=e.getEl();if(c(e,!1),e.shouldProxy()){var i=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];h(o,n,e)}};i(e.connections.source,0),i(e.connections.target,1)}e.collapsed=!0,t.removeClass(n,"jtk-group-expanded"),t.addClass(n,"jtk-group-collapsed"),t.revalidate(n),t.fire("group:collapse",{group:e})}};var d=function(e,n,i){t.unproxyConnection(e,n,t.getId(i.getEl()))};function p(e){for(var n=e.getMembers().slice(),s=[],r=0;r<n.length;r++)Array.prototype.push.apply(s,n[r].querySelectorAll(".jtk-managed"));Array.prototype.push.apply(n,s);var a=t.getConnections({source:n,scope:"*"},!0),l=t.getConnections({target:n,scope:"*"},!0),u={};e.connections.source.length=0,e.connections.target.length=0;var c=function(n){for(var s=0;s<n.length;s++)if(!u[n[s].id]){u[n[s].id]=!0;var r=t.getGroupFor(n[s].source),a=t.getGroupFor(n[s].target);r===e?(a!==e&&e.connections.source.push(n[s]),i[n[s].id]=e):a===e&&(e.connections.target.push(n[s]),o[n[s].id]=e)}};c(a),c(l)}this.expandGroup=function(e,n){if(null!=(e=this.getGroup(e))&&e.collapsed){var i=e.getEl();if(c(e,!0),e.shouldProxy()){var o=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];d(o,n,e)}};o(e.connections.source,0),o(e.connections.target,1)}e.collapsed=!1,t.addClass(i,"jtk-group-expanded"),t.removeClass(i,"jtk-group-collapsed"),t.revalidate(i),this.repaintGroup(e),n||t.fire("group:expand",{group:e})}},this.repaintGroup=function(e){for(var n=(e=this.getGroup(e)).getMembers(),i=0;i<n.length;i++)t.revalidate(n[i])},this.updateConnectionsForGroup=p,this.refreshAllGroups=function(){for(var e in n)p(n[e]),t.dragManager.updateOffsets(t.getId(n[e].getEl()))}},u=function(n,r){var a=this,l=r.el;this.getEl=function(){return l},this.id=r.id||e.uuid(),l._isJsPlumbGroup=!0;var u=this.getDragArea=function(){var t=n.getSelector(l,"[jtk-group-content]");return t&&t.length>0?t[0]:l},c=!0===r.ghost,h=c||!0===r.constrain,d=!1!==r.revert,p=!0===r.orphan,f=!0===r.prune,g=!0===r.dropOverride,m=!1!==r.proxied,v=[];if(this.connections={source:[],target:[],internal:[]},this.getAnchor=function(t,e){return r.anchor||"Continuous"},this.getEndpoint=function(t,e){return r.endpoint||["Dot",{radius:10}]},this.collapsed=!1,!1!==r.draggable){var y={drag:function(){for(var t=0;t<v.length;t++)n.draw(v[t])},stop:function(t){n.fire("groupDragStop",jsPlumb.extend(t,{group:a}))},scope:"_jsPlumbGroupDrag"};r.dragOptions&&t.jsPlumb.extend(y,r.dragOptions),n.draggable(r.el,y)}!1!==r.droppable&&n.droppable(r.el,{drop:function(t){var e=t.drag.el;if(!e._isJsPlumbGroup){var i=e._jsPlumbGroup;if(i!==a){if(null!=i&&i.overrideDrop(e,a))return;n.getGroupManager().addToGroup(a,e,!1)}}}});var b=function(t,e){for(var n=null==t.nodeType?t:[t],i=0;i<n.length;i++)e(n[i])};function P(t,e){var i=function(t){return t.offsetParent}(t),o=n.getSize(i),s=n.getSize(t),r=e[0],a=r+s[0],l=e[1],u=l+s[1];return a>0&&r<o[0]&&u>0&&l<o[1]}function x(t){var e=n.getId(t),i=n.getOffset(t);return t.parentNode.removeChild(t),n.getContainer().appendChild(t),n.setPosition(t,i),j(t),n.dragManager.clearParent(t,e),[e,i]}function C(t){var e=[];function i(t,e,i){var o=null;if(!P(t,[e,i])){var s=t._jsPlumbGroup;f?n.remove(t):o=x(t),s.remove(t)}return o}for(var o=0;o<t.selection.length;o++)e.push(i(t.selection[o][0],t.selection[o][1].left,t.selection[o][1].top));return 1===e.length?e[0]:e}function _(t){var e=n.getId(t);n.revalidate(t),n.dragManager.revalidateParent(t,e)}function j(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.off(i,C),f||p||!d||(t._katavorioDrag.off(o,_),t._katavorioDrag.setRevert(null)))}function E(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.on(i,C),h&&t._katavorioDrag.setConstrain(!0),c&&t._katavorioDrag.setUseGhostProxy(!0),f||p||!d||(t._katavorioDrag.on(o,_),t._katavorioDrag.setRevert(function(t,e){return!P(t,e)})))}this.overrideDrop=function(t,e){return g&&(d||f||p)},this.add=function(t,e){var i=u();b(t,function(t){if(null!=t._jsPlumbGroup){if(t._jsPlumbGroup===a)return;t._jsPlumbGroup.remove(t,!0,e,!1)}t._jsPlumbGroup=a,v.push(t),n.isAlreadyDraggable(t)&&E(t),t.parentNode!==i&&i.appendChild(t)}),n.getGroupManager().updateConnectionsForGroup(a)},this.remove=function(t,i,o,s,r){b(t,function(t){if(t._jsPlumbGroup===a){if(delete t._jsPlumbGroup,e.removeWithFunction(v,function(e){return e===t}),i)try{a.getDragArea().removeChild(t)}catch(t){jsPlumbUtil.log("Could not remove element from Group "+t)}if(j(t),!o){var s={group:a,el:t};r&&(s.targetGroup=r),n.fire("group:removeMember",s)}}}),s||n.getGroupManager().updateConnectionsForGroup(a)},this.removeAll=function(t,e){for(var i=0,o=v.length;i<o;i++){var s=v[0];a.remove(s,t,e,!0),n.remove(s,!0)}v.length=0,n.getGroupManager().updateConnectionsForGroup(a)},this.orphanAll=function(){for(var t={},e=0;e<v.length;e++){var n=x(v[e]);t[n[0]]=n[1]}return v.length=0,t},this.getMembers=function(){return v},l[s]=this,n.bind("elementDraggable",function(t){t.el._jsPlumbGroup===this&&E(t.el)}.bind(this)),this.shouldProxy=function(){return m},n.getGroupManager().addGroup(this)};n.prototype.addGroup=function(t){var e=this;if(e._groups=e._groups||{},null!=e._groups[t.id])throw new TypeError("cannot create Group ["+t.id+"]; a Group with that ID exists");if(null!=t.el[s])throw new TypeError("cannot create Group ["+t.id+"]; the given element is already a Group");var n=new u(e,t);return e._groups[n.id]=n,t.collapsed&&this.collapseGroup(n),n},n.prototype.addToGroup=function(t,e,n){var i=function(e){var i=this.getId(e);this.manage(i,e),this.getGroupManager().addToGroup(t,e,n)}.bind(this);if(Array.isArray(e))for(var o=0;o<e.length;o++)i(e[o]);else i(e)},n.prototype.removeFromGroup=function(t,e,n){this.getGroupManager().removeFromGroup(t,e,n),this.getContainer().appendChild(e)},n.prototype.removeGroup=function(t,e,n,i){return this.getGroupManager().removeGroup(t,e,n,i)},n.prototype.removeAllGroups=function(t,e,n){this.getGroupManager().removeAllGroups(t,e,n)},n.prototype.getGroup=function(t){return this.getGroupManager().getGroup(t)},n.prototype.getGroups=function(){return this.getGroupManager().getGroups()},n.prototype.expandGroup=function(t){this.getGroupManager().expandGroup(t)},n.prototype.collapseGroup=function(t){this.getGroupManager().collapseGroup(t)},n.prototype.repaintGroup=function(t){this.getGroupManager().repaintGroup(t)},n.prototype.toggleGroup=function(t){null!=(t=this.getGroupManager().getGroup(t))&&this.getGroupManager()[t.collapsed?"expandGroup":"collapseGroup"](t)},n.prototype.getGroupManager=function(){var t=this._groupManager;return null==t&&(t=this._groupManager=new l(this)),t},n.prototype.removeGroupManager=function(){delete this._groupManager},n.prototype.getGroupFor=function(t){if(t=this.getElement(t)){for(var e=this.getContainer(),n=!1,i=null;!n;)null==t||t===e?n=!0:t[s]?(i=t[s],n=!0):t=t.parentNode;return i}}}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.Flowchart=function(e){this.type="Flowchart",(e=e||{}).stub=null==e.stub?30:e.stub;var n,i=t.Connectors.AbstractConnector.apply(this,arguments),o=null==e.midpoint||isNaN(e.midpoint)?.5:e.midpoint,s=!0===e.alwaysRespectStubs,r=null,a=null,l=null!=e.cornerRadius?e.cornerRadius:0,u=(e.loopbackRadius,function(t){return t<0?-1:0===t?0:1}),c=function(t){return[u(t[2]-t[0]),u(t[3]-t[1])]},h=function(t,e,n,i){if(r!==e||a!==n){var o=null==r?i.sx:r,s=null==a?i.sy:a,l=o===e?"v":"h";r=e,a=n,t.push([o,s,e,n,l])}},d=function(t){return Math.sqrt(Math.pow(t[0]-t[2],2)+Math.pow(t[1]-t[3],2))},p=function(t){var e=[];return e.push.apply(e,t),e};this.midpoint=o,this._compute=function(t,e){n=[],r=null,a=null;var u=function(){return[t.startStubX,t.startStubY,t.endStubX,t.endStubY]},f={perpendicular:u,orthogonal:u,opposite:function(e){var n=t,i="x"===e?0:1;return!s&&{x:function(){return 1===n.so[i]&&(n.startStubX>n.endStubX&&n.tx>n.startStubX||n.sx>n.endStubX&&n.tx>n.sx)||-1===n.so[i]&&(n.startStubX<n.endStubX&&n.tx<n.startStubX||n.sx<n.endStubX&&n.tx<n.sx)},y:function(){return 1===n.so[i]&&(n.startStubY>n.endStubY&&n.ty>n.startStubY||n.sy>n.endStubY&&n.ty>n.sy)||-1===n.so[i]&&(n.startStubY<n.endStubY&&n.ty<n.startStubY||n.sy<n.endStubY&&n.ty<n.sy)}}[e]()?{x:[(t.sx+t.tx)/2,t.startStubY,(t.sx+t.tx)/2,t.endStubY],y:[t.startStubX,(t.sy+t.ty)/2,t.endStubX,(t.sy+t.ty)/2]}[e]:[t.startStubX,t.startStubY,t.endStubX,t.endStubY]}}[t.anchorOrientation](t.sourceAxis),g="x"===t.sourceAxis?0:1,m="x"===t.sourceAxis?1:0,v=f[g],y=f[m],b=f[g+2],P=f[m+2];h(n,f[0],f[1],t);var x=t.startStubX+(t.endStubX-t.startStubX)*o,C=t.startStubY+(t.endStubY-t.startStubY)*o,_={x:[0,1],y:[1,0]},j={perpendicular:function(e){var n=t,i={x:[[n.startStubX,n.endStubX],null,[n.endStubX,n.startStubX]],y:[[n.startStubY,n.endStubY],null,[n.endStubY,n.startStubY]]},o={x:[[x,n.startStubY],[x,n.endStubY]],y:[[n.startStubX,C],[n.endStubX,C]]},s={x:[[n.endStubX,n.startStubY]],y:[[n.startStubX,n.endStubY]]},r={x:[[n.startStubX,n.endStubY],[n.endStubX,n.endStubY]],y:[[n.endStubX,n.startStubY],[n.endStubX,n.endStubY]]},a={x:[[n.startStubX,C],[n.endStubX,C],[n.endStubX,n.endStubY]],y:[[x,n.startStubY],[x,n.endStubY],[n.endStubX,n.endStubY]]},l={x:[n.startStubY,n.endStubY],y:[n.startStubX,n.endStubX]},u=_[e][0],c=_[e][1],h=n.so[u]+1,d=n.to[c]+1,p=-1===n.to[c]&&l[e][1]<l[e][0]||1===n.to[c]&&l[e][1]>l[e][0],f=i[e][h][0],g=i[e][h][1],m={x:[[[1,2,3,4],null,[2,1,4,3]],null,[[4,3,2,1],null,[3,4,1,2]]],y:[[[3,2,1,4],null,[2,3,4,1]],null,[[4,1,2,3],null,[1,4,3,2]]]}[e][h][d];return n.segment===m[3]||n.segment===m[2]&&p?o[e]:n.segment===m[2]&&g<f?s[e]:n.segment===m[2]&&g>=f||n.segment===m[1]&&!p?a[e]:n.segment===m[0]||n.segment===m[1]&&p?r[e]:void 0},orthogonal:function(e,n,i,o,s){var r=t,a={x:-1===r.so[0]?Math.min(n,o):Math.max(n,o),y:-1===r.so[1]?Math.min(n,o):Math.max(n,o)}[e];return{x:[[a,i],[a,s],[o,s]],y:[[i,a],[s,a],[s,o]]}[e]},opposite:function(n,o,s,r){var a=t,l={x:"y",y:"x"}[n],u={x:"height",y:"width"}[n],c=a["is"+n.toUpperCase()+"GreaterThanStubTimes2"];if(e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=s+(1-e.sourceEndpoint.anchor[l])*e.sourceInfo[u]+i.maxStub;return{x:[[o,h],[r,h]],y:[[h,o],[h,r]]}[n]}return!c||1===a.so[g]&&o>r||-1===a.so[g]&&o<r?{x:[[o,C],[r,C]],y:[[x,o],[x,r]]}[n]:1===a.so[g]&&o<r||-1===a.so[g]&&o>r?{x:[[x,a.sy],[x,a.ty]],y:[[a.sx,C],[a.tx,C]]}[n]:void 0}}[t.anchorOrientation](t.sourceAxis,v,y,b,P);if(j)for(var E=0;E<j.length;E++)h(n,j[E][0],j[E][1],t);h(n,f[2],f[3],t),h(n,t.tx,t.ty,t),function(t,e,n){for(var o,s,r,a=null,u=0;u<e.length-1;u++){if(a=a||p(e[u]),o=p(e[u+1]),s=c(a),r=c(o),l>0&&a[4]!==o[4]){var h=Math.min(d(a),d(o)),f=Math.min(l,h/2);a[2]-=s[0]*f,a[3]-=s[1]*f,o[0]+=r[0]*f,o[1]+=r[1]*f;var g=s[1]===r[0]&&1===r[0]||s[1]===r[0]&&0===r[0]&&s[0]!==r[1]||s[1]===r[0]&&-1===r[0],m=(o[1]>a[3]?1:-1)==(o[0]>a[2]?1:-1),v=m&&g||!m&&!g?o[0]:a[2],y=m&&g||!m&&!g?a[3]:o[1];i.addSegment(t,"Straight",{x1:a[0],y1:a[1],x2:a[2],y2:a[3]}),i.addSegment(t,"Arc",{r:f,x1:a[2],y1:a[3],x2:o[0],y2:o[1],cx:v,cy:y,ac:g})}else{var b=a[2]===a[0]?0:a[2]>a[0]?n.lw/2:-n.lw/2,P=a[3]===a[1]?0:a[3]>a[1]?n.lw/2:-n.lw/2;i.addSegment(t,"Straight",{x1:a[0]-b,y1:a[1]-P,x2:a[2]+b,y2:a[3]+P})}a=o}null!=o&&i.addSegment(t,"Straight",{x1:o[0],y1:o[1],x2:o[2],y2:o[3]})}(this,n,t)}},e.extend(t.Connectors.Flowchart,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.AbstractBezierConnector=function(e){var n,i=!1!==(e=e||{}).showLoopback,o=(e.curviness,e.margin||5),s=(e.proximityLimit,e.orientation&&"clockwise"===e.orientation),r=e.loopbackRadius||25;return this._compute=function(t,e){var a=e.sourcePos,l=e.targetPos,u=Math.abs(a[0]-l[0]),c=Math.abs(a[1]-l[1]);if(i&&e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=e.sourcePos[0],d=e.sourcePos[1]-o,p=h,f=d-r,g=p-r,m=f-r;u=2*r,c=2*r,t.points[0]=g,t.points[1]=m,t.points[2]=u,t.points[3]=c,n.addSegment(this,"Arc",{loopback:!0,x1:h-g+4,y1:d-m,startAngle:0,endAngle:2*Math.PI,r:r,ac:!s,x2:h-g-4,y2:d-m,cx:p-g,cy:f-m})}else this._computeBezier(t,e,a,l,u,c)},n=t.Connectors.AbstractConnector.apply(this,arguments)},e.extend(t.Connectors.AbstractBezierConnector,t.Connectors.AbstractConnector);var n=function(e){e=e||{},this.type="Bezier";var n=t.Connectors.AbstractBezierConnector.apply(this,arguments),i=e.curviness||150;this.getCurviness=function(){return i},this._findControlPoint=function(t,e,n,o,s,r,a){var l=[];return r[0]!==a[0]||r[1]===a[1]?(0===a[0]?l.push(n[0]<e[0]?t[0]+10:t[0]-10):l.push(t[0]+i*a[0]),0===a[1]?l.push(n[1]<e[1]?t[1]+10:t[1]-10):l.push(t[1]+i*r[1])):(0===r[0]?l.push(e[0]<n[0]?t[0]+10:t[0]-10):l.push(t[0]-i*r[0]),0===r[1]?l.push(e[1]<n[1]?t[1]+10:t[1]-10):l.push(t[1]+i*a[1])),l},this._computeBezier=function(t,e,i,o,s,r){var a,l,u=i[0]<o[0]?s:0,c=i[1]<o[1]?r:0,h=i[0]<o[0]?0:s,d=i[1]<o[1]?0:r;a=this._findControlPoint([u,c],i,o,e.sourceEndpoint,e.targetEndpoint,t.so,t.to),l=this._findControlPoint([h,d],o,i,e.targetEndpoint,e.sourceEndpoint,t.to,t.so),n.addSegment(this,"Bezier",{x1:u,y1:c,x2:h,y2:d,cp1x:a[0],cp1y:a[1],cp2x:l[0],cp2y:l[1]})}};t.Connectors.Bezier=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){e=e||{},this.type="StateMachine";var n,i=t.Connectors.AbstractBezierConnector.apply(this,arguments),o=e.curviness||10,s=e.margin||5,r=e.proximityLimit||80;e.orientation&&e.orientation;this._computeBezier=function(t,e,a,l,u,c){var h=e.sourcePos[0]<e.targetPos[0]?0:u,d=e.sourcePos[1]<e.targetPos[1]?0:c,p=e.sourcePos[0]<e.targetPos[0]?u:0,f=e.sourcePos[1]<e.targetPos[1]?c:0;0===e.sourcePos[2]&&(h-=s),1===e.sourcePos[2]&&(h+=s),0===e.sourcePos[3]&&(d-=s),1===e.sourcePos[3]&&(d+=s),0===e.targetPos[2]&&(p-=s),1===e.targetPos[2]&&(p+=s),0===e.targetPos[3]&&(f-=s),1===e.targetPos[3]&&(f+=s);var g,m,v,y,b,P,x,C,_=(h+p)/2,j=(d+f)/2,E=(P=d,C=f,(b=h)<=(x=p)&&C<=P?1:b<=x&&P<=C?2:x<=b&&C>=P?3:4),S=Math.sqrt(Math.pow(p-h,2)+Math.pow(f-d,2));g=(n=function(t,e,n,i,o,s,r,a,l){return a<=l?[t,e]:1===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:2===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:3===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:4===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:void 0}(_,j,E,e.sourcePos,e.targetPos,o,o,S,r))[0],m=n[0],v=n[1],y=n[1],i.addSegment(this,"Bezier",{x1:p,y1:f,x2:h,y2:d,cp1x:g,cp1y:v,cp2x:m,cp2y:y})}};t.Connectors.StateMachine=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){this.type="Straight";var n=t.Connectors.AbstractConnector.apply(this,arguments);this._compute=function(t,e){n.addSegment(this,"Straight",{x1:t.sx,y1:t.sy,x2:t.startStubX,y2:t.startStubY}),n.addSegment(this,"Straight",{x1:t.startStubX,y1:t.startStubY,x2:t.endStubX,y2:t.endStubY}),n.addSegment(this,"Straight",{x1:t.endStubX,y1:t.endStubY,x2:t.tx,y2:t.ty})}};t.Connectors.Straight=n,e.extend(n,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n={"stroke-linejoin":"stroke-linejoin","stroke-dashoffset":"stroke-dashoffset","stroke-linecap":"stroke-linecap"},i="http://www.w3.org/2000/svg",o=function(t,e){for(var n in e)t.setAttribute(n,""+e[n])},s=function(e,n){return(n=n||{}).version="1.1",n.xmlns=i,t.createElementNS(i,e,null,null,n)},r=function(t){return"position:absolute;left:"+t[0]+"px;top:"+t[1]+"px"},a=function(t){for(var e=t.querySelectorAll(" defs,linearGradient,radialGradient"),n=0;n<e.length;n++)e[n].parentNode.removeChild(e[n])},l=function(t,e,i,o,r){if(e.setAttribute("fill",i.fill?i.fill:"none"),e.setAttribute("stroke",i.stroke?i.stroke:"none"),i.gradient?function(t,e,n,i,o){var r,l="jsplumb_gradient_"+o._jsPlumb.instance.idstamp();a(t),r=n.gradient.offset?s("radialGradient",{id:l}):s("linearGradient",{id:l,gradientUnits:"userSpaceOnUse"});var u=s("defs");t.appendChild(u),u.appendChild(r);for(var c=0;c<n.gradient.stops.length;c++){var h=1===o.segment||2===o.segment?c:n.gradient.stops.length-1-c,d=n.gradient.stops[h][1],p=s("stop",{offset:Math.floor(100*n.gradient.stops[c][0])+"%","stop-color":d});r.appendChild(p)}var f=n.stroke?"stroke":"fill";e.setAttribute(f,"url(#"+l+")")}(t,e,i,0,r):(a(t),e.setAttribute("style","")),i.strokeWidth&&e.setAttribute("stroke-width",i.strokeWidth),i.dashstyle&&i.strokeWidth&&!i["stroke-dasharray"]){var l=-1===i.dashstyle.indexOf(",")?" ":",",u=i.dashstyle.split(l),c="";u.forEach(function(t){c+=Math.floor(t*i.strokeWidth)+l}),e.setAttribute("stroke-dasharray",c)}else i["stroke-dasharray"]&&e.setAttribute("stroke-dasharray",i["stroke-dasharray"]);for(var h in n)i[h]&&e.setAttribute(n[h],i[h])},u=function(t,e,n){t.childNodes.length>n?t.insertBefore(e,t.childNodes[n]):t.appendChild(e)};e.svg={node:s,attr:o,pos:r};var c=function(n){var i=n.pointerEventsSpec||"all",a={};t.jsPlumbUIComponent.apply(this,n.originalArgs),this.canvas=null,this.path=null,this.svg=null,this.bgCanvas=null;var l=n.cssClass+" "+(n.originalArgs[0].cssClass||""),u={style:"",width:0,height:0,"pointer-events":i,position:"absolute"};this.svg=s("svg",u),n.useDivWrapper?(this.canvas=t.createElement("div",{position:"absolute"}),e.sizeElement(this.canvas,0,0,1,1),this.canvas.className=l):(o(this.svg,{class:l}),this.canvas=this.svg),n._jsPlumb.appendElement(this.canvas,n.originalArgs[0].parent),n.useDivWrapper&&this.canvas.appendChild(this.svg);var c=[this.canvas];return this.getDisplayElements=function(){return c},this.appendDisplayElement=function(t){c.push(t)},this.paint=function(t,i,s){if(null!=t){var l,u=[this.x,this.y],c=[this.w,this.h];null!=s&&(s.xmin<0&&(u[0]+=s.xmin),s.ymin<0&&(u[1]+=s.ymin),c[0]=s.xmax+(s.xmin<0?-s.xmin:0),c[1]=s.ymax+(s.ymin<0?-s.ymin:0)),n.useDivWrapper?(e.sizeElement(this.canvas,u[0],u[1],c[0]>0?c[0]:1,c[1]>0?c[1]:1),u[0]=0,u[1]=0,l=r([0,0])):l=r([u[0],u[1]]),a.paint.apply(this,arguments),o(this.svg,{style:l,width:c[0]||1,height:c[1]||1})}},{renderer:a}};e.extend(c,t.jsPlumbUIComponent,{cleanup:function(t){t||null==this.typeId?(this.canvas&&(this.canvas._jsPlumb=null),this.svg&&(this.svg._jsPlumb=null),this.bgCanvas&&(this.bgCanvas._jsPlumb=null),this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.svg=null,this.canvas=null,this.path=null,this.group=null,this._jsPlumb=null):(this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.bgCanvas.parentNode.removeChild(this.bgCanvas))},reattach:function(t){var e=t.getContainer();this.canvas&&null==this.canvas.parentNode&&e.appendChild(this.canvas),this.bgCanvas&&null==this.bgCanvas.parentNode&&e.appendChild(this.bgCanvas)},setVisible:function(t){this.canvas&&(this.canvas.style.display=t?"block":"none")}}),t.ConnectorRenderers.svg=function(e){var n=this;c.apply(this,[{cssClass:e._jsPlumb.connectorClass,originalArgs:arguments,pointerEventsSpec:"none",_jsPlumb:e._jsPlumb}]).renderer.paint=function(i,r,a){var c=n.getSegments(),h=[0,0];if(a.xmin<0&&(h[0]=-a.xmin),a.ymin<0&&(h[1]=-a.ymin),c.length>0){var d={d:n.getPathData(),transform:"translate("+h[0]+","+h[1]+")","pointer-events":e["pointer-events"]||"visibleStroke"},p=null;n.x,n.y,n.w,n.h;if(i.outlineStroke){var f=i.outlineWidth||1,g=i.strokeWidth+2*f;delete(p=t.extend({},i)).gradient,p.stroke=i.outlineStroke,p.strokeWidth=g,null==n.bgPath?(n.bgPath=s("path",d),t.addClass(n.bgPath,t.connectorOutlineClass),u(n.svg,n.bgPath,0)):o(n.bgPath,d),l(n.svg,n.bgPath,p,0,n)}null==n.path?(n.path=s("path",d),u(n.svg,n.path,i.outlineStroke?1:0)):o(n.path,d),l(n.svg,n.path,i,0,n)}}},e.extend(t.ConnectorRenderers.svg,c);var h=t.SvgEndpoint=function(e){c.apply(this,[{cssClass:e._jsPlumb.endpointClass,originalArgs:arguments,pointerEventsSpec:"all",useDivWrapper:!0,_jsPlumb:e._jsPlumb}]).renderer.paint=function(e){var n=t.extend({},e);n.outlineStroke&&(n.stroke=n.outlineStroke),null==this.node?(this.node=this.makeNode(n),this.svg.appendChild(this.node)):null!=this.updateNode&&this.updateNode(this.node),l(this.svg,this.node,n,(this.x,this.y,this.w,this.h),this),r(this.node,(this.x,this.y))}.bind(this)};e.extend(h,c),t.Endpoints.svg.Dot=function(){t.Endpoints.Dot.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("circle",{cx:this.w/2,cy:this.h/2,r:this.radius})},this.updateNode=function(t){o(t,{cx:this.w/2,cy:this.h/2,r:this.radius})}},e.extend(t.Endpoints.svg.Dot,[t.Endpoints.Dot,h]),t.Endpoints.svg.Rectangle=function(){t.Endpoints.Rectangle.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("rect",{width:this.w,height:this.h})},this.updateNode=function(t){o(t,{width:this.w,height:this.h})}},e.extend(t.Endpoints.svg.Rectangle,[t.Endpoints.Rectangle,h]),t.Endpoints.svg.Image=t.Endpoints.Image,t.Endpoints.svg.Blank=t.Endpoints.Blank,t.Overlays.svg.Label=t.Overlays.Label,t.Overlays.svg.Custom=t.Overlays.Custom;var d=function(e,n){e.apply(this,n),t.jsPlumbUIComponent.apply(this,n),this.isAppendedAtTopLevel=!1,this.path=null,this.paint=function(t,e){if(t.component.svg&&e){null==this.path&&(this.path=s("path",{"pointer-events":"all"}),t.component.svg.appendChild(this.path),this.elementCreated&&this.elementCreated(this.path,t.component),this.canvas=t.component.svg);var r=n&&1===n.length&&n[0].cssClass||"",a=[0,0];e.xmin<0&&(a[0]=-e.xmin),e.ymin<0&&(a[1]=-e.ymin),o(this.path,{d:i(t.d),class:r,stroke:t.stroke?t.stroke:null,fill:t.fill?t.fill:null,transform:"translate("+a[0]+","+a[1]+")"})}};var i=function(t){return isNaN(t.cxy.x)||isNaN(t.cxy.y)?"":"M"+t.hxy.x+","+t.hxy.y+" L"+t.tail[0].x+","+t.tail[0].y+" L"+t.cxy.x+","+t.cxy.y+" L"+t.tail[1].x+","+t.tail[1].y+" L"+t.hxy.x+","+t.hxy.y};this.transfer=function(t){t.canvas&&this.path&&this.path.parentNode&&(this.path.parentNode.removeChild(this.path),t.canvas.appendChild(this.path))}},p={cleanup:function(t){null!=this.path&&(t?this._jsPlumb.instance.removeElement(this.path):this.path.parentNode&&this.path.parentNode.removeChild(this.path))},reattach:function(t,e){this.path&&e.canvas&&e.canvas.appendChild(this.path)},setVisible:function(t){null!=this.path&&(this.path.style.display=t?"block":"none")}};e.extend(d,[t.jsPlumbUIComponent,t.Overlays.AbstractOverlay]),t.Overlays.svg.Arrow=function(){d.apply(this,[t.Overlays.Arrow,arguments])},e.extend(t.Overlays.svg.Arrow,[t.Overlays.Arrow,d],p),t.Overlays.svg.PlainArrow=function(){d.apply(this,[t.Overlays.PlainArrow,arguments])},e.extend(t.Overlays.svg.PlainArrow,[t.Overlays.PlainArrow,d],p),t.Overlays.svg.Diamond=function(){d.apply(this,[t.Overlays.Diamond,arguments])},e.extend(t.Overlays.svg.Diamond,[t.Overlays.Diamond,d],p),t.Overlays.svg.GuideLines=function(){var e,n,i=null,r=this;t.Overlays.GuideLines.apply(this,arguments),this.paint=function(t,l){null==i&&(i=s("path"),t.connector.svg.appendChild(i),r.attachListeners(i,t.connector),r.attachListeners(i,r),e=s("path"),t.connector.svg.appendChild(e),r.attachListeners(e,t.connector),r.attachListeners(e,r),n=s("path"),t.connector.svg.appendChild(n),r.attachListeners(n,t.connector),r.attachListeners(n,r));var u=[0,0];l.xmin<0&&(u[0]=-l.xmin),l.ymin<0&&(u[1]=-l.ymin),o(i,{d:a(t.head,t.tail),stroke:"red",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(e,{d:a(t.tailLine[0],t.tailLine[1]),stroke:"blue",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(n,{d:a(t.headLine[0],t.headLine[1]),stroke:"green",fill:null,transform:"translate("+u[0]+","+u[1]+")"})};var a=function(t,e){return"M "+t.x+","+t.y+" L"+e.x+","+e.y}},e.extend(t.Overlays.svg.GuideLines,t.Overlays.GuideLines)}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Katavorio,o=t.Biltong,s=function(t,n){var s="_katavorio_"+(n=n||"main"),r=t[s],a=t.getEventManager();return r||((r=new i({bind:a.on,unbind:a.off,getSize:e.getSize,getConstrainingRectangle:function(t){return[t.parentNode.scrollWidth,t.parentNode.scrollHeight]},getPosition:function(e,n){var i=t.getOffset(e,n,e._katavorioDrag?e.offsetParent:null);return[i.left,i.top]},setPosition:function(t,e){t.style.left=e[0]+"px",t.style.top=e[1]+"px"},addClass:e.addClass,removeClass:e.removeClass,intersects:o.intersects,indexOf:function(t,e){return t.indexOf(e)},scope:t.getDefaultScope(),css:{noSelect:t.dragSelectClass,droppable:"jtk-droppable",draggable:"jtk-draggable",drag:"jtk-drag",selected:"jtk-drag-selected",active:"jtk-drag-active",hover:"jtk-drag-hover",ghostProxy:"jtk-ghost-proxy"}})).setZoom(t.getZoom()),t[s]=r,t.bind("zoom",r.setZoom)),r},r=function(t,e){if(null==e)return[0,0];var n=h(e),i=c(n,0);return[i[t+"X"],i[t+"Y"]]},a=r.bind(this,"page"),l=r.bind(this,"screen"),u=r.bind(this,"client"),c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d=function(t){var e={},n=[],i={},o={},s={};this.register=function(r){var a,l=t.getId(r);e[l]||(e[l]=r,n.push(r),i[l]={});var u=function(e){if(e)for(var n=0;n<e.childNodes.length;n++)if(3!==e.childNodes[n].nodeType&&8!==e.childNodes[n].nodeType){var c=jsPlumb.getElement(e.childNodes[n]),h=t.getId(e.childNodes[n],null,!0);if(h&&o[h]&&o[h]>0){a||(a=t.getOffset(r));var d=t.getOffset(c);i[l][h]={id:h,offset:{left:d.left-a.left,top:d.top-a.top}},s[h]=l}u(e.childNodes[n])}};u(r)},this.updateOffsets=function(e,n){if(null!=e){n=n||{};var o,r=jsPlumb.getElement(e),a=t.getId(r),l=i[a];if(l)for(var u in l)if(l.hasOwnProperty(u)){var c=jsPlumb.getElement(u),h=n[u]||t.getOffset(c);if(null==c.offsetParent&&null!=i[a][u])continue;o||(o=t.getOffset(r)),i[a][u]={id:u,offset:{left:h.left-o.left,top:h.top-o.top}},s[u]=a}}},this.endpointAdded=function(n,r){r=r||t.getId(n);var a=document.body,l=n.parentNode;for(o[r]=o[r]?o[r]+1:1;null!=l&&l!==a;){var u=t.getId(l,null,!0);if(u&&e[u]){var c=t.getOffset(l);if(null==i[u][r]){var h=t.getOffset(n);i[u][r]={id:r,offset:{left:h.left-c.left,top:h.top-c.top}},s[r]=u}break}l=l.parentNode}},this.endpointDeleted=function(t){if(o[t.elementId]&&(o[t.elementId]--,o[t.elementId]<=0))for(var e in i)i.hasOwnProperty(e)&&i[e]&&(delete i[e][t.elementId],delete s[t.elementId])},this.changeId=function(t,e){i[e]=i[t],i[t]={},s[e]=s[t],s[t]=null},this.getElementsForDraggable=function(t){return i[t]},this.elementRemoved=function(t){var e=s[t];e&&(i[e]&&delete i[e][t],delete s[t])},this.reset=function(){e={},n=[],i={},o={}},this.dragEnded=function(e){if(null!=e.offsetParent){var n=t.getId(e),i=s[n];i&&this.updateOffsets(i)}},this.setParent=function(e,n,o,r,a){var l=s[n];i[r]||(i[r]={});var u=t.getOffset(o),c=a||t.getOffset(e);l&&i[l]&&delete i[l][n],i[r][n]={id:n,offset:{left:c.left-u.left,top:c.top-u.top}},s[n]=r},this.clearParent=function(t,e){var n=s[e];n&&(delete i[n][e],delete s[e])},this.revalidateParent=function(e,n,i){var o=s[n];if(o){var r={};r[n]=i,this.updateOffsets(o,r),t.revalidate(o)}},this.getDragAncestor=function(e){var n=jsPlumb.getElement(e),i=t.getId(n),o=s[i];return o?jsPlumb.getElement(o):null}},p=function(t,e,i){e=n.fastTrim(e),void 0!==t.className.baseVal?t.className.baseVal=e:t.className=e;try{var o=t.classList;if(null!=o){for(;o.length>0;)o.remove(o.item(0));for(var s=0;s<i.length;s++)i[s]&&o.add(i[s])}}catch(t){n.log("JSPLUMB: cannot set class list",t)}},f=function(t){return void 0===t.className.baseVal?t.className:t.className.baseVal},g=function(t,e,i){e=null==e?[]:n.isArray(e)?e:e.split(/\s+/),i=null==i?[]:n.isArray(i)?i:i.split(/\s+/);var o=f(t).split(/\s+/),s=function(t,e){for(var n=0;n<e.length;n++)if(t)-1===o.indexOf(e[n])&&o.push(e[n]);else{var i=o.indexOf(e[n]);-1!==i&&o.splice(i,1)}};s(!0,e),s(!1,i),p(t,o.join(" "),o)};t.jsPlumb.extend(t.jsPlumbInstance.prototype,{headless:!1,pageLocation:a,screenLocation:l,clientLocation:u,getDragManager:function(){return null==this.dragManager&&(this.dragManager=new d(this)),this.dragManager},recalculateOffsets:function(t){this.getDragManager().updateOffsets(t)},createElement:function(t,e,n,i){return this.createElementNS(null,t,e,n,i)},createElementNS:function(t,e,n,i,o){var s,r=null==t?document.createElement(e):document.createElementNS(t,e);for(s in n=n||{})r.style[s]=n[s];for(s in i&&(r.className=i),o=o||{})r.setAttribute(s,""+o[s]);return r},getAttribute:function(t,e){return null!=t.getAttribute?t.getAttribute(e):null},setAttribute:function(t,e,n){null!=t.setAttribute&&t.setAttribute(e,n)},setAttributes:function(t,e){for(var n in e)e.hasOwnProperty(n)&&t.setAttribute(n,e[n])},appendToRoot:function(t){document.body.appendChild(t)},getRenderModes:function(){return["svg"]},getClass:f,addClass:function(t,e){jsPlumb.each(t,function(t){g(t,e)})},hasClass:function(t,e){return(t=jsPlumb.getElement(t)).classList?t.classList.contains(e):-1!==f(t).indexOf(e)},removeClass:function(t,e){jsPlumb.each(t,function(t){g(t,null,e)})},toggleClass:function(t,e){jsPlumb.hasClass(t,e)?jsPlumb.removeClass(t,e):jsPlumb.addClass(t,e)},updateClasses:function(t,e,n){jsPlumb.each(t,function(t){g(t,e,n)})},setClass:function(t,e){null!=e&&jsPlumb.each(t,function(t){p(t,e,e.split(/\s+/))})},setPosition:function(t,e){t.style.left=e.left+"px",t.style.top=e.top+"px"},getPosition:function(t){var e=function(e){var n=t.style[e];return n?n.substring(0,n.length-2):0};return{left:e("left"),top:e("top")}},getStyle:function(t,e){return void 0!==window.getComputedStyle?getComputedStyle(t,null).getPropertyValue(e):t.currentStyle[e]},getSelector:function(t,e){return 1===arguments.length?null!=t.nodeType?t:document.querySelectorAll(t):t.querySelectorAll(e)},getOffset:function(t,e,n){t=jsPlumb.getElement(t),n=n||this.getContainer();for(var i={left:t.offsetLeft,top:t.offsetTop},o=e||null!=n&&t!==n&&t.offsetParent!==n?t.offsetParent:null,s=function(t){null!=t&&t!==document.body&&(t.scrollTop>0||t.scrollLeft>0)&&(i.left-=t.scrollLeft,i.top-=t.scrollTop)}.bind(this);null!=o;)i.left+=o.offsetLeft,i.top+=o.offsetTop,s(o),o=e?o.offsetParent:o.offsetParent===n?null:o.offsetParent;if(null!=n&&!e&&(n.scrollTop>0||n.scrollLeft>0)){var r=null!=t.offsetParent?this.getStyle(t.offsetParent,"position"):"static",a=this.getStyle(t,"position");"absolute"!==a&&"fixed"!==a&&"absolute"!==r&&"fixed"!==r&&(i.left-=n.scrollLeft,i.top-=n.scrollTop)}return i},getPositionOnElement:function(t,e,n){var i=void 0!==e.getBoundingClientRect?e.getBoundingClientRect():{left:0,top:0,width:0,height:0},o=document.body,s=document.documentElement,r=window.pageYOffset||s.scrollTop||o.scrollTop,a=window.pageXOffset||s.scrollLeft||o.scrollLeft,l=s.clientTop||o.clientTop||0,u=s.clientLeft||o.clientLeft||0,c=i.top+r-l+0*n,h=i.left+a-u+0*n,d=jsPlumb.pageLocation(t),p=i.width||e.offsetWidth*n,f=i.height||e.offsetHeight*n;return[(d[0]-h)/p,(d[1]-c)/f]},getAbsolutePosition:function(t){var e=function(e){var n=t.style[e];if(n)return parseFloat(n.substring(0,n.length-2))};return[e("left"),e("top")]},setAbsolutePosition:function(t,e,n,i){n?this.animate(t,{left:"+="+(e[0]-n[0]),top:"+="+(e[1]-n[1])},i):(t.style.left=e[0]+"px",t.style.top=e[1]+"px")},getSize:function(t){return[t.offsetWidth,t.offsetHeight]},getWidth:function(t){return t.offsetWidth},getHeight:function(t){return t.offsetHeight},getRenderMode:function(){return"svg"},draggable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this._initDraggableIfNecessary(i.el,!0,e,i.id,!0)}.bind(this)),this},snapToGrid:function(t,e,n){var i=[],o=function(t){var o=this.info(t);if(null!=o.el&&o.el._katavorioDrag){var s=o.el._katavorioDrag.snap(e,n);this.revalidate(o.el),i.push([o.el,s])}}.bind(this);if(1===arguments.length||3===arguments.length)o(t,e,n);else{var s=this.getManagedElements();for(var r in s)o(r,arguments[0],arguments[1])}return i},initDraggable:function(t,e,n){s(this,n).draggable(t,e),t._jsPlumbDragOptions=e},destroyDraggable:function(t,e){s(this,e).destroyDraggable(t),t._jsPlumbDragOptions=null,t._jsPlumbRelatedElement=null},unbindDraggable:function(t,e,n,i){s(this,i).destroyDraggable(t,e,n)},setDraggable:function(t,e){return jsPlumb.each(t,function(t){this.isDragSupported(t)&&(this._draggableStates[this.getAttribute(t,"id")]=e,this.setElementDraggable(t,e))}.bind(this))},_draggableStates:{},toggleDraggable:function(t){var e;return jsPlumb.each(t,function(t){var n=this.getAttribute(t,"id");return e=!(e=null!=this._draggableStates[n]&&this._draggableStates[n]),this._draggableStates[n]=e,this.setDraggable(t,e),e}.bind(this)),e},_initDraggableIfNecessary:function(t,e,i,o,s){if(!jsPlumb.headless&&(null!=e&&e&&jsPlumb.isDragSupported(t,this))){var r=i||this.Defaults.DragOptions;if(r=jsPlumb.extend({},r),jsPlumb.isAlreadyDraggable(t,this))i.force&&this.initDraggable(t,r);else{var a=jsPlumb.dragEvents.drag,l=jsPlumb.dragEvents.stop,u=jsPlumb.dragEvents.start;this.manage(o,t),r[u]=n.wrap(r[u],function(t){var e=t.el._jsPlumbDragOptions,n=!0;return e.canDrag&&(n=e.canDrag()),n&&(this.setHoverSuspended(!0),this.select({source:t.el}).addClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:t.el}).addClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),this.setConnectionBeingDragged(!0)),n}.bind(this)),r[a]=n.wrap(r[a],function(t){var e=this.getUIPosition(arguments,this.getZoom());if(null!=e){var n=t.el._jsPlumbDragOptions;this.draw(t.el,e,null,!0),n._dragging&&this.addClass(t.el,"jtk-dragged"),n._dragging=!0}}.bind(this)),r[l]=n.wrap(r[l],function(t){for(var e,n=t.selection,i=function(n){var i;null!=n[1]&&(e=this.getUIPosition([{el:n[2].el,pos:[n[1].left,n[1].top]}]),i=this.draw(n[2].el,e)),null!=n[0]._jsPlumbDragOptions&&delete n[0]._jsPlumbDragOptions._dragging,this.removeClass(n[0],"jtk-dragged"),this.select({source:n[2].el}).removeClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:n[2].el}).removeClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),t.e._drawResult=t.e._drawResult||{c:[],e:[],a:[]},Array.prototype.push.apply(t.e._drawResult.c,i.c),Array.prototype.push.apply(t.e._drawResult.e,i.e),Array.prototype.push.apply(t.e._drawResult.a,i.a),this.getDragManager().dragEnded(n[2].el)}.bind(this),o=0;o<n.length;o++)i(n[o]);this.setHoverSuspended(!1),this.setConnectionBeingDragged(!1)}.bind(this));var c=this.getId(t);this._draggableStates[c]=!0;var h=this._draggableStates[c];r.disabled=null!=h&&!h,this.initDraggable(t,r),this.getDragManager().register(t),s&&this.fire("elementDraggable",{el:t,options:r})}}},animationSupported:!0,getElement:function(t){return null==t?null:"string"==typeof(t="string"==typeof t?t:null==t.tagName&&null!=t.length&&null==t.enctype?t[0]:t)?document.getElementById(t):t},removeElement:function(t){s(this).elementRemoved(t),this.getEventManager().remove(t)},doAnimate:function(t,i,o){o=o||{};var s=this.getOffset(t),r=function(t,e){var i=function(i){if(null!=e[i]){if(n.isString(e[i])){var o=e[i].match(/-=/)?-1:1,s=e[i].substring(2);return t[i]+o*s}return e[i]}return t[i]};return[i("left"),i("top")]}(s,i),a=r[0]-s.left,l=r[1]-s.top,u=o.duration||250,c=u/15,h=15/u*a,d=15/u*l,p=0,f=setInterval(function(){e.setPosition(t,{left:s.left+h*(p+1),top:s.top+d*(p+1)}),null!=o.step&&o.step(p,Math.ceil(c)),++p>=c&&(window.clearInterval(f),null!=o.complete&&o.complete())},15)},destroyDroppable:function(t,e){s(this,e).destroyDroppable(t)},unbindDroppable:function(t,e,n,i){s(this,i).destroyDroppable(t,e,n)},droppable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],(e=e||{}).allowLoopback=!1,Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this.initDroppable(i.el,e)}.bind(this)),this},initDroppable:function(t,e,n){s(this,n).droppable(t,e)},isAlreadyDraggable:function(t){return null!=t._katavorioDrag},isDragSupported:function(t,e){return!0},isDropSupported:function(t,e){return!0},isElementDraggable:function(t){return(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.isEnabled()},getDragObject:function(t){return t[0].drag.getDragElement()},getDragScope:function(t){return t._katavorioDrag&&t._katavorioDrag.scopes.join(" ")||""},getDropEvent:function(t){return t[0].e},getUIPosition:function(t,e){var n=t[0].el;if(null==n.offsetParent)return null;var i=t[0].finalPos||t[0].pos,o={left:i[0],top:i[1]};if(n._katavorioDrag&&n.offsetParent!==this.getContainer()){var s=this.getOffset(n.offsetParent);o.left+=s.left,o.top+=s.top}return o},setDragFilter:function(t,e,n){t._katavorioDrag&&t._katavorioDrag.setFilter(e,n)},setElementDraggable:function(t,n){(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.setEnabled(n)},setDragScope:function(t,e){t._katavorioDrag&&t._katavorioDrag.k.setDragScope(t,e)},setDropScope:function(t,e){t._katavorioDrop&&t._katavorioDrop.length>0&&t._katavorioDrop[0].k.setDropScope(t,e)},addToPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.addToPosse.apply(o,t)})},setPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.setPosse.apply(o,t)})},removeFromPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.removeFromPosse.apply(o,t)})},removeFromAllPosses:function(t){var n=s(this);e.each(t,function(t){n.removeFromAllPosses(e.getElement(t))})},setPosseState:function(t,n,i){var o=s(this);e.each(t,function(t){o.setPosseState(e.getElement(t),n,i)})},dragEvents:{start:"start",stop:"stop",drag:"drag",step:"step",over:"over",out:"out",drop:"drop",complete:"complete",beforeStart:"beforeStart"},animEvents:{step:"step",complete:"complete"},stopDrag:function(t){t._katavorioDrag&&t._katavorioDrag.abort()},addToDragSelection:function(t){var e=this.getElement(t);null==e||!e._isJsPlumbGroup&&null!=e._jsPlumbGroup||s(this).select(t)},removeFromDragSelection:function(t){s(this).deselect(t)},getDragSelection:function(){return s(this).getSelection()},clearDragSelection:function(){s(this).deselectAll()},trigger:function(t,e,n,i){this.getEventManager().trigger(t,e,n,i)},doReset:function(){for(var t in this)0===t.indexOf("_katavorio_")&&this[t].reset()},getEventManager:function(){return(n=(e=this)._mottle)||(n=e._mottle=new t.Mottle),n;var e,n},on:function(t,e,n){return this.getEventManager().on.apply(this,arguments),this},off:function(t,e,n){return this.getEventManager().off.apply(this,arguments),this}});var m,v;m=e.init,(v=function(){/complete|loaded|interactive/.test(document.readyState)&&void 0!==document.body&&null!=document.body?m():setTimeout(v,9)})()}.call("undefined"!=typeof window?window:s)}(r={exports:{}},r.exports),r.exports),l=(a.jsBezier,a.Biltong,a.Mottle,a.Katavorio,a.jsPlumbUtil,a.jsPlumb);var u=function(t,e,n,i,o,s,r,a,l,u){"boolean"!=typeof r&&(l=a,a=r,r=!1);var c,h="function"==typeof n?n.options:n;if(t&&t.render&&(h.render=t.render,h.staticRenderFns=t.staticRenderFns,h._compiled=!0,o&&(h.functional=!0)),i&&(h._scopeId=i),s?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),e&&e.call(this,l(t)),t&&t._registeredComponents&&t._registeredComponents.add(s)},h._ssrRegister=c):e&&(c=r?function(){e.call(this,u(this.$root.$options.shadowRoot))}:function(t){e.call(this,a(t))}),c)if(h.functional){var d=h.render;h.render=function(t,e){return c.call(e),d(t,e)}}else{var p=h.beforeCreate;h.beforeCreate=p?[].concat(p,c):[c]}return n},c="undefined"!=typeof navigator&&/msie [6-9]\\b/.test(navigator.userAgent.toLowerCase());var h=document.head||document.getElementsByTagName("head")[0],d={};var p=function(t){return function(t,e){return function(t,e){var n=c?e.media||"default":t,i=d[n]||(d[n]={ids:new Set,styles:[]});if(!i.ids.has(t)){i.ids.add(t);var o=e.source;if(e.map&&(o+="\n/*# sourceURL="+e.map.sources[0]+" */",o+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(e.map))))+" */"),i.element||(i.element=document.createElement("style"),i.element.type="text/css",e.media&&i.element.setAttribute("media",e.media),h.appendChild(i.element)),"styleSheet"in i.element)i.styles.push(o),i.element.styleSheet.cssText=i.styles.filter(Boolean).join("\n");else{var s=i.ids.size-1,r=document.createTextNode(o),a=i.element.childNodes;a[s]&&i.element.removeChild(a[s]),a.length?i.element.insertBefore(r,a[s]):i.element.appendChild(r)}}}(t,e)}},f=u({render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("div",{staticClass:"palette-panel"},[t._t("palette",function(){return[t._m(0)]})],2)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("ul",{staticClass:"palette-group"},[e("li",[e("div",{staticClass:"palette-default-item startpoint",attrs:{"data-type":"startpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item endpoint",attrs:{"data-type":"endpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item tasknode",attrs:{"data-type":"tasknode"}})]),e("li",[e("div",{staticClass:"palette-default-item gateway",attrs:{"data-type":"gateway"}})])])}]},function(t){t&&t("data-v-c4aa9bae_0",{source:".palette-group{margin:0;padding:0;background:#fcfcfc;text-align:center;list-style:none}.palette-group>li{padding:14px 0}.palette-default-item{display:inline-block;width:40px;height:40px;font-size:12px;color:#888;border:1px solid #999;border-radius:2px;cursor:pointer;user-select:none}.palette-default-item:hover{box-shadow:0 0 8px rgba(50,50,50,.3)}.startpoint{border-radius:50%;border:4px solid #6a6c8a}.endpoint{border-radius:50%;background:#6a6c8a}.tasknode{height:30px;border:2px solid #33d0c6}.gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}",map:void 0,media:void 0})},{name:"PalettePanel",props:["selector"],data:function(){return{}}},void 0,!1,void 0,p,void 0),g=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"tool-panel"},t._l(t.tools,function(e,i){return n("div",{key:i,class:["tool-item",e.cls,{actived:"frameSelect"===e.type&&t.isFrameSelecting}],on:{click:function(n){return t.onToolClick(e)}}},[t._v("\n        "+t._s(e.name)+"\n    ")])}),0)},staticRenderFns:[]},function(t){t&&t("data-v-286a6fd7_0",{source:".tool-item{display:inline-block;margin-right:10px;user-select:none;cursor:pointer}.tool-item:last-child{margin-right:0}.tool-item.actived{color:#3a84ff}",map:void 0,media:void 0})},{name:"ToolPanel",props:["tools","isFrameSelecting"],data:function(){return{}},methods:{onToolClick:function(t){this.$emit("onToolClick",t)}}},void 0,!1,void 0,p,void 0),m=u({render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"bk-flow-location",on:{mousedown:this.onMouseDown,mouseup:this.onMouseUp}},["startpoint"===this.node.type?e("div",{staticClass:"circle-node startpoint"}):"endpoint"===this.node.type?e("div",{staticClass:"circle-node endpoint"}):"tasknode"===this.node.type?e("div",{staticClass:"tasknode"}):"gateway"===this.node.type?e("div",{staticClass:"gateway"}):e("div",{staticClass:"node-default"})])},staticRenderFns:[]},function(t){t&&t("data-v-6db820eb_0",{source:".bk-flow-location .circle-node{width:30px;height:30px;border-radius:50%;text-align:center}.bk-flow-location .startpoint{border:4px solid #6a6c8a}.bk-flow-location .endpoint{background:#6a6c8a}.bk-flow-location .tasknode{width:80px;height:50px;border:2px solid #33d0c6}.bk-flow-location .gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}.bk-flow-location .node-default{width:120px;height:80px;line-height:80px;border:1px solid #ccc;border-radius:2px;text-align:center}.bk-flow-location .node-default.selected{border:1px solid #3a84ff}",map:void 0,media:void 0})},{name:"NodeTemplate",props:{node:{type:Object,default:function(){return{}}}},data:function(){return{moveFlag:{x:0,y:0,moved:!1}}},methods:{onMouseDown:function(t){this.moveFlag={x:t.pageX,y:t.pageY,moved:!1},this.$el.addEventListener("mousemove",this.mouseMoveHandler)},onMouseUp:function(t){var e=t.pageX,n=t.pageY;this.moveFlag.x=e,this.moveFlag.y=n,this.moveFlag.moved?(console.log("drag event"),this.moveFlag.moved=!1):console.log("click event"),this.$el.removeEventListener("mousemove",this.mouseMoveHandler)},mouseMoveHandler:function(t){var e=t.pageX,n=t.pageY;(Math.abs(e-this.moveFlag.x)>2||Math.abs(n-this.moveFlag.y)>2)&&(this.moveFlag.moved=!0)}}},void 0,!1,void 0,p,void 0);function v(t){return"touches"in t?t.touches[0]:t}var y={grid:[5,5]},b={connector:["Bezier",{curviness:30}],paintStyle:{strokeWidth:2,stroke:"#567567",outlineStroke:"tranparent",outlineWidth:6},hoverPaintStyle:{fill:"transparent",stroke:"#3a84ff"}},P={endpoint:"Dot",connector:["Flowchart",{stub:[1,6],alwaysRespectStub:!0,gap:8,cornerRadius:2}],connectorOverlays:[["PlainArrow",{width:8,length:6,location:1,id:"arrow"}]],paintStyle:{fill:"#3a84ff",radius:5},anchor:["Left","Right","Top","Bottom"],isSource:!0,isTarget:!0};function x(){for(var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e="",n=0;n<7;n++)e+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return t+e}var C={showPalette:{type:Boolean,default:!0},showTool:{type:Boolean,default:!0},tools:{type:Array,default:function(){return[{type:"zoomIn",name:"放大",cls:"tool-item"},{type:"zoomOut",name:"缩小",cls:"tool-item"},{type:"resetPosition",name:"重置",cls:"tool-item"}]}},editable:{type:Boolean,default:!0},selector:{type:String,default:"palette-default-item"},data:{type:Object,default:function(){return{nodes:[],lines:[]}}},nodeOptions:{type:Object,default:function(){return e({},y)}},connectorOptions:{type:Object,default:function(){return e({},b)}},endpointOptions:{type:Object,default:function(){return e({},P)}}},_={mousedown:"ontouchstart"in document.documentElement?"touchstart":"mousedown",mousemove:"ontouchmove"in document.documentElement?"touchmove":"mousemove",mouseup:"ontouchend"in document.documentElement?"touchend":"mouseup"},j=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{class:["jsflow",{editable:t.editable}]},[n("div",{staticClass:"canvas-area"},[t.showTool?n("div",{staticClass:"tool-panel-wrap"},[t._t("toolPanel",function(){return[n("tool-panel",{attrs:{tools:t.tools,"is-frame-selecting":t.isFrameSelecting},on:{onToolClick:t.onToolClick}})]})],2):t._e(),t.showPalette?n("div",{ref:"palettePanel",staticClass:"palette-panel-wrap"},[t._t("palettePanel",function(){return[n("palette-panel",{attrs:{selector:t.selector}})]})],2):t._e(),n("div",{ref:"canvasFlowWrap",staticClass:"canvas-flow-wrap",style:t.canvasWrapStyle,on:t._d({},[t.mousedown,t.onCanvasMouseDown,t.mouseup,t.onCanvasMouseUp])},[n("div",{ref:"canvasFlow",staticClass:"canvas-flow",attrs:{id:"canvas-flow"}},[t._l(t.nodes,function(e){return n("div",{key:e.id},[n("div",{staticClass:"jsflow-node canvas-node",attrs:{id:e.id},on:{mouseenter:function(n){return t.toggleHighLight(e,!0)},mouseleave:function(n){return t.toggleHighLight(e,!1)}}},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:e}})]},{node:e})],2)])}),n("div",{staticClass:"reference-line-vertical"}),n("div",{staticClass:"reference-line-horizontal"})],2),t.isFrameSelecting?n("div",{staticClass:"canvas-frame-selector",style:t.frameSelectorStyle}):t._e()]),t.showAddingNode?n("div",{staticClass:"jsflow-node adding-node",style:t.setNodeInitialPos(t.addingNodeConfig)},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:t.addingNodeConfig}})]},{node:t.addingNodeConfig})],2):t._e()])])},staticRenderFns:[]},function(t){t&&t("data-v-9d24605c_0",{source:".jsflow{height:100%;border:1px solid #ccc}.jsflow .canvas-area{position:relative;height:100%}.jsflow .tool-panel-wrap{position:absolute;top:20px;left:70px;padding:10px 20px;background:#c4c6cc;opacity:.65;border-radius:4px;z-index:4}.jsflow .palette-panel-wrap{float:left;width:60px;height:100%;border-right:1px solid #ccc}.jsflow .canvas-flow-wrap{position:relative;height:100%;overflow:hidden}.jsflow .canvas-flow{position:relative;min-width:100%;min-height:100%}.jsflow .canvas-frame-selector{position:absolute;border:1px solid #3a84ff;background:rgba(58,132,255,.15)}.jsflow .jsflow-node{position:absolute;user-select:none}.jsflow .jtk-endpoint{z-index:1;cursor:pointer}.jsflow .adding-node{opacity:.8}.jsflow .jtk-endpoint.jtk-dragging{z-index:0}.jsflow .jtk-connector{cursor:pointer}.jsflow .reference-line-vertical{display:none;position:absolute;top:-100000px;bottom:-100000px;left:0;width:2px;background:rgba(30,144,255,.8);z-index:1}.jsflow .reference-line-horizontal{display:none;position:absolute;left:-100000px;right:-100000px;top:0;height:2px;background:rgba(30,144,255,.8);z-index:1}",map:void 0,media:void 0})},{name:"JsFlow",components:{PalettePanel:f,ToolPanel:g,NodeTemplate:m},model:{prop:"data",event:"change"},props:C,data:function(){var t=this.data;return e({nodes:t.nodes,lines:t.lines,canvasGrabbing:!1,isFrameSelecting:!1,frameMoving:null,mouseDownPos:{},canvasPos:{x:0,y:0},canvasOffset:{x:0,y:0},frameSelectorPos:{x:0,y:0},frameSelectorRect:{width:0,height:0},selectedNodes:[],showAddingNode:!1,addingNodeConfig:{},addingNodeRect:{},canvasRect:{},paletteRect:{},zoom:1,moveTimer:null},_)},computed:{canvasWrapStyle:function(){return{cursor:this.isFrameSelecting?"crosshair":this.canvasGrabbing?"-webkit-grabbing":"-webkit-grab"}},frameSelectorStyle:function(){return{left:"".concat(this.frameSelectorPos.x,"px"),top:"".concat(this.frameSelectorPos.y,"px"),width:"".concat(this.frameSelectorRect.width,"px"),height:"".concat(this.frameSelectorRect.height,"px")}}},watch:{"data.nodes":{handler:function(t){this.nodes=t},deep:!0},editable:function(t){var e=this.$el.querySelectorAll(".canvas-node");this.toggleNodeDraggable(e,t)}},mounted:function(){this.initCanvas(),this.registerEvent(),this.renderData(),this.$refs.palettePanel&&(this.paletteRect=this.$refs.palettePanel.getBoundingClientRect(),this.registerPaletteEvent())},beforeDestroy:function(){this.$refs.palettePanel&&this.$refs.palettePanel.removeEventListener(this.mousedown,this.nodeCreateHandler),this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler)},methods:{initCanvas:function(){var t={},n=e(e({},this.endpointOptions),this.connectorOptions);for(var i in n){var o=i[0].toUpperCase();t["".concat(o).concat(i.slice(1))]=n[i]}console.log(this.$refs.canvasFlow.$el),this.instance=l.getInstance(e({Container:this.$refs.canvasFlow},t))},registerEvent:function(){var t=this;this.instance.bind("beforeDrag",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrag||t.$listeners.onBeforeDrag(e))}),this.instance.bind("connectionDrag",function(e){"function"==typeof t.$listeners.onConnectionDrag&&t.$emit("onConnectionDrag",e)}),this.instance.bind("beforeDrop",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrop||t.$listeners.onBeforeDrop(e))}),this.instance.bind("connection",function(e){"function"==typeof t.$listeners.onConnection&&t.$emit("onConnection",e)}),this.instance.bind("connectionDragStop",function(e,n){if(!e.target||!e.target.classList.contains("jsflow-node")){var i=t.getNodeByEvent(n.target);if(i){var o=t.nodes.find(function(t){return i.id===t.id});if("function"==typeof t.$listeners.onConnectionDragStop){var s={id:e.source.id,arrow:e.endpoints[0].anchor.type||e.endpoints[0].anchor.cssClass};t.$emit("onConnectionDragOnNode",s,o.id,n)}}"function"==typeof t.$listeners.onConnectionDragStop&&t.$emit("onConnectionDragStop",e)}}),this.instance.bind("beforeDetach",function(e){return"function"!=typeof t.$listeners.onBeforeDetach||t.$listeners.onBeforeDetach(e)}),this.instance.bind("connectionDetached",function(e,n){var i=t.lines.filter(function(t){return t.source.id!==e.sourceId&&t.target.id!==e.targetId});t.lines=i,"function"==typeof t.$listeners.onConnectionDetached&&t.$emit("onConnectionDetached",e)}),this.instance.bind("connectionMoved",function(e,n){"function"==typeof t.$listeners.onConnectionMoved&&t.$emit("onConnectionMoved",lines)}),this.instance.bind("click",function(e,n){"function"==typeof t.$listeners.onConnectionClick&&t.$emit("onConnectionClick",e,n)}),this.instance.bind("dblclick",function(e,n){"function"==typeof t.$listeners.onConnectionDbClick&&t.$emit("onConnectionDbClick",e,n)}),this.instance.bind("endpointClick",function(e,n){"function"==typeof t.$listeners.onEndpointClick&&t.$emit("onEndpointClick",e,n)}),this.instance.bind("endpointDblClick",function(e,n){"function"==typeof t.$listeners.onEndpointDbClick&&t.$emit("onEndpointDbClick",e,n)})},renderData:function(){var t=this;this.instance.batch(function(){t.nodes.forEach(function(e){t.initNode(e)}),t.lines.forEach(function(e){t.createConnector(e,t.connectorOptions)})})},updateCanvas:function(t){this.removeAllConnector(),this.lines=t.lines,this.nodes=t.nodes,this.renderData()},createNode:function(t){var e=this;("function"!=typeof this.$listeners.onCreateNodeBefore||this.$listeners.onCreateNodeBefore(t))&&(this.nodes.push(t),this.$nextTick(function(){e.initNode(t)}))},initNode:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.setNodeDraggable(t,this.nodeOptions),this.setNodeEndPoint(t,this.endpointOptions),"function"==typeof this.$listeners.onCreateNodeAfter&&this.$emit("onCreateNodeAfter",t)},removeNode:function(t){var e=this.nodes.findIndex(function(e){return e.id===t.id});this.nodes.splice(e,1),this.instance.remove(t.id)},setNodeEndPoint:function(t,n){var i=this,o=n.anchors||{Top:[.5,0,0,-1,"Top"],Right:[1,.5,1,0,"Right"],Bottom:[.5,1,0,1,"Bottom"],Left:[0,.5,-1,0,"Left"]};Object.keys(o).forEach(function(s){var r=o[s],a=i.instance.addEndpoint(i.$el.querySelector("#".concat(t.id)),e({anchor:r,uuid:s+t.id},n));a&&a.endpoint.canvas&&(a.endpoint.canvas.dataset.pos=s)})},setNodeDraggable:function(t,n){if(this.editable){var o=this;this.instance.draggable(t.id,e({grid:[20,20],drag:function(e){var n=o.instance.getDragSelection().map(function(t){return t.el.id}),i=o.nodes.find(function(e){return t.id===e.id}),s=Object.assign({},i);if(o.toggleHighLight(t,!1),0===n.length)o.setReferenceLine(t.id,e),o.setBoundaryOffset(e);else if(n.some(function(e){return e===t.id})){var r;if(!o.frameMoving){var a,l,u=Math.min.apply(null,o.selectedNodes.map(function(t){return t.x})),c=Math.min.apply(null,o.selectedNodes.map(function(t){return t.y}));o.selectedNodes.some(function(t){if(t.x===u)return a=t,!0}),o.selectedNodes.some(function(t){if(t.y===c)return l=t,!0}),o.frameMoving={left:a,top:l}}(null===(r=o.frameMoving.left)||void 0===r?void 0:r.id)===t.id&&o.setFrameReferLine()}else o.cancelFrameSelectorHandler();o.$emit("onNodeMoving",s,e)},stop:function(e){var n=-1,s=i(e.pos,2),r=s[0],a=s[1],l=o.nodes.find(function(e,i){if(e.id===t.id)return n=i,!0}),u=Object.assign({},l,{x:r,y:a});o.nodes.splice(n,1,u),o.frameMoving=null,o.$emit("onNodeMoveStop",u,e);var c=o.$refs.canvasFlow.querySelector(".reference-line-vertical"),h=o.$refs.canvasFlow.querySelector(".reference-line-horizontal");c.setAttribute("style","display: none; left: 0"),h.setAttribute("style","display: none; top: 0"),clearTimeout(this.moveTimer)}},n))}},setReferenceLine:function(t,e){var n=this,o=e.el,s=o.clientWidth,r=o.clientHeight,a=i(e.pos,2),l=[a[0]+s/2,a[1]+r/2],u=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),c=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");u.setAttribute("style","display: none; left: 0"),c.setAttribute("style","display: none; top: 0");var h=!1,d=!1;this.data.nodes.some(function(e){if(e.id!==t){var i=n.$refs.canvasFlow.querySelector("#".concat(e.id)),o=window.getComputedStyle(i),s=o.width,r=o.height,a=[e.x+Number(s.replace("px",""))/2,e.y+Number(r.replace("px",""))/2];return h||a[0]!==l[0]||(u.setAttribute("style","display: inline-block; left: ".concat(a[0]-1,"px;")),h=!0),d||a[1]!==l[1]||(c.setAttribute("style","display: inline-block; top: ".concat(a[1]-1,"px;")),d=!0),!(!h||!d)||void 0}})},setFrameReferLine:function(){var t=this,e=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.left.id)),n=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.top.id)),i=Number(window.getComputedStyle(e).left.replace("px","")),o=Number(window.getComputedStyle(n).top.replace("px","")),s=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),r=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");s.setAttribute("style","display: none; left: 0"),r.setAttribute("style","display: none; top: 0");var a=!1,l=!1;this.data.nodes.some(function(e){if(!t.selectedNodes.find(function(t){return t.id===e.id})){var n=[e.x,e.y];return a||n[0]!==i||(s.setAttribute("style","display: inline-block; left: ".concat(i,"px;")),a=!0),l||n[1]!==o||(r.setAttribute("style","display: inline-block; top: ".concat(o,"px;")),l=!0),!(!a||!l)||void 0}})},setBoundaryOffset:function(t){var e=this.$refs.canvasFlowWrap.getBoundingClientRect(),n=e.left,i=e.top,o=e.width,s=e.height;t.e.pageX<n&&this.intervalMoveCanvas("horizontal",20),t.e.pageX>n+o&&this.intervalMoveCanvas("horizontal",-20),t.e.pageY<i&&this.intervalMoveCanvas("vertical",20),t.e.pageY>i+s&&this.intervalMoveCanvas("vertical",-20)},intervalMoveCanvas:function(t,e){var n=this;this.moveTimer&&clearTimeout(this.moveTimer),this.moveTimer=setTimeout(function(){var i=n.canvasOffset,o=i.x,s=i.y;"horizontal"===t?o+=e:s+=e,n.setCanvasPosition(o,s),n.moveTimer||n.intervalMoveCanvas(t,e)},16)},setNodePosition:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.instance.revalidate(e)},toggleNodeDraggable:function(t,e){this.instance.setDraggable(t,e)},setNodeInitialPos:function(t){var e={left:"".concat(t.x,"px"),top:"".concat(t.y,"px"),visibility:t.visible?"initial":"hidden"};return 1!==this.zoom&&(e.transform="matrix(".concat(this.zoom,", 0, 0, ").concat(this.zoom,", 0, 0)")),console.log(this.zoom,t.x,t.y),e},createConnector:function(t,n){var i=t.options||{};return this.instance.connect({source:this.$el.querySelector("#".concat(t.source.id)),target:this.$el.querySelector("#".concat(t.target.id)),uuids:[t.source.arrow+t.source.id,t.target.arrow+t.target.id]},e(e({},n),i))},setConnector:function(t,e,n){var i=this;this.instance.getAllConnections().filter(function(n){return n.sourceId===t&&n.targetId===e}).forEach(function(t){t.setConnector(n),i.endpointOptions&&i.endpointOptions.connectorOverlays&&i.endpointOptions.connectorOverlays.forEach(function(e){t.addOverlay(e)})})},removeConnector:function(t){var e=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){e.instance.deleteConnection(t)})},removeAllConnector:function(){this.instance.deleteEveryConnection(),this.lines=[]},getConnectorsByNodeId:function(t){return this.instance.getAllConnections().filter(function(e){return e.sourceId===t||e.targetId===t})},getNodeByEvent:function(t){var e=t.parentNode;return!(!e||"HTML"===e.nodeName)&&(e.classList.contains("jsflow-node")?e:this.getNodeByEvent(e))},addLineOverlay:function(t,e){var n=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.addOverlay([e.type,{label:e.name,location:e.location,cssClass:e.cls,id:e.id,events:{click:function(t,e){n.$emit("onOverlayClick",t,e)}}}])})},removeLineOverlay:function(t,e){this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.removeOverlay(e)})},onCanvasMouseDown:function(t){"touchstart"!==t.type&&0!==t.button||(t=v(t),this.isFrameSelecting?this.frameSelectHandler(t):(this.canvasGrabbing=!0,this.mouseDownPos={x:t.pageX,y:t.pageY},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.canvasFlowMoveHandler,!1)))},canvasFlowMoveHandler:function(t){t=v(t),this.canvasOffset={x:this.canvasPos.x+t.pageX-this.mouseDownPos.x,y:this.canvasPos.y+t.pageY-this.mouseDownPos.y},this.$refs.canvasFlow.style.left="".concat(this.canvasOffset.x,"px"),this.$refs.canvasFlow.style.top="".concat(this.canvasOffset.y,"px"),this.$emit("onCanvasMove",{left:this.canvasOffset.x,top:this.canvasOffset.y})},onCanvasMouseUp:function(t){this.isFrameSelecting?this.frameSelectEndHandler(t):(this.canvasGrabbing=!1,this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.canvasFlowMoveHandler),this.canvasPos={x:this.canvasOffset.x,y:this.canvasOffset.y})},registerPaletteEvent:function(){this.$refs.palettePanel.addEventListener(this.mousedown,this.nodeCreateHandler,!1)},nodeCreateHandler:function(t){var n=this,i=function t(e,n){return 1===e.nodeType&&e.classList.contains(n)?e:"HTML"!==e.parentNode.nodeName?t(e.parentNode,n):null}(t.target,this.selector);if(i){var o=i.dataset.type?i.dataset.type:"",s={};for(var r in i.dataset){var a=r.match(/(config)(\w*)/);if(a&&""!==a[2]){var l=a[2],u=l[0].toLowerCase()+l.slice(1);s[u]=i.dataset[r]}}this.showAddingNode=!0,this.addingNodeConfig.id=x("node"),this.addingNodeConfig.type=o,this.$nextTick(function(){var i=n.$el.querySelector(".adding-node");n.addingNodeRect=i.getBoundingClientRect();var r=n.getAddingNodePos(t);n.addingNodeConfig=e({id:x("node"),type:o,x:r.x,y:r.y,adding:!0,visible:!1},s),n.$el.addEventListener(n.mousemove,n.nodeMovingHandler,!1),document.addEventListener(n.mouseup,n.nodeMoveEndHandler,!1)})}},nodeMovingHandler:function(t){var e=this.getAddingNodePos(t);console.log("e.pageX, e.pageY: ",t.pageX,t.pageY),this.$set(this.addingNodeConfig,"x",e.x),this.$set(this.addingNodeConfig,"y",e.y),this.$set(this.addingNodeConfig,"visible",!0),"function"==typeof this.$listeners.onAddNodeMoving&&this.$emit("onAddNodeMoving",{type:this.addingNodeConfig.type,x:e.x,y:e.y})},nodeMoveEndHandler:function(t){if(this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler),this.showAddingNode=!1,t.pageX>this.paletteRect.left+this.paletteRect.width){var e=(this.addingNodeConfig.x-this.paletteRect.width-this.canvasOffset.x+this.addingNodeRect.width*(1-this.zoom)/2)/this.zoom,n=(this.addingNodeConfig.y-this.canvasOffset.y+this.addingNodeRect.height*(1-this.zoom)/2)/this.zoom;console.log("zoom: ",this.zoom),console.log("nodeX nodeY: ",e,n),this.$set(this.addingNodeConfig,"x",e),this.$set(this.addingNodeConfig,"y",n),delete this.addingNodeConfig.adding,delete this.addingNodeConfig.visible,this.createNode(this.addingNodeConfig)}this.addingNodeConfig={},this.addingNodeRect={}},getAddingNodePos:function(t){return console.log(t.pageX,this.paletteRect.left,this.addingNodeRect.width),console.log(t.pageY,this.paletteRect.top,this.addingNodeRect.height),{x:t.pageX-this.paletteRect.left-this.addingNodeRect.width/this.zoom/2,y:t.pageY-this.paletteRect.top-this.addingNodeRect.height/this.zoom/2}},toggleHighLight:function(t){var e=this,n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(this.editable){var i=this.$el.querySelector("#".concat(t.id));this.instance.selectEndpoints({source:i}).each(function(t){var i;n?(i=e.endpointOptions.hoverPaintStyle,t.endpoint.canvas.classList.add("jtk-endpoint-highlight")):(i=e.endpointOptions.paintStyle,t.endpoint.canvas.classList.remove("jtk-endpoint-highlight")),i&&t.setStyle(i)})}},onToolClick:function(t){"function"==typeof this[t.type]&&this[t.type](),this.$emit("onToolClick",t)},setZoom:function(t,e,n){this.instance.setContainer(this.$refs.canvasFlow),this.$refs.canvasFlow.style.transform="matrix("+t+",0,0,"+t+","+e+","+n+")",this.$refs.canvasFlow.style.transformOrigin="0 0",this.$refs.canvasFlow.zoom=t,this.zoom=t,this.instance.setZoom(t)},zoomIn:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1.1,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i>2||this.setZoom(i,o,s)},zoomOut:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:.9,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i<.1||this.setZoom(i,o,s)},resetPosition:function(){this.setZoom(1,0,0),this.setCanvasPosition(0,0)},setCanvasPosition:function(t,e){this.canvasOffset={x:t,y:e},this.canvasPos={x:t,y:e},this.$refs.canvasFlow.style.left=this.canvasOffset.x+"px",this.$refs.canvasFlow.style.top=this.canvasOffset.y+"px"},frameSelect:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.isFrameSelecting=t},onOpenFrameSelect:function(){this.frameSelect()},onCloseFrameSelect:function(){this.frameSelect(!1)},frameSelectHandler:function(t){this.canvasRect=this.$refs.canvasFlowWrap.getBoundingClientRect(),this.mouseDownPos={x:t.clientX-this.canvasRect.left,y:t.clientY-this.canvasRect.top},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.frameSelectMovingHandler,!1)},frameSelectMovingHandler:function(t){var e=t.clientX-this.mouseDownPos.x-this.canvasRect.left,n=t.clientY-this.mouseDownPos.y-this.canvasRect.top;this.frameSelectorRect={width:Math.abs(e),height:Math.abs(n)},this.frameSelectorPos={x:e>0?this.mouseDownPos.x:this.mouseDownPos.x+e,y:n>0?this.mouseDownPos.y:this.mouseDownPos.y+n}},frameSelectEndHandler:function(t){this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.frameSelectMovingHandler),this.$refs.canvasFlowWrap.removeEventListener(this.mouseup,this.frameSelectEndHandler),document.addEventListener(this.mousedown,this.cancelFrameSelectorHandler,{capture:!1,once:!0});var e=this.getSelectedNodes(),n=e.map(function(t){return t.id}),i=this.mouseDownPos,o=i.x,s=i.y;this.isFrameSelecting=!1,this.frameSelectorPos={x:0,y:0},this.frameSelectorRect={width:0,height:0},this.selectedNodes=e,this.clearNodesDragSelection(),this.addNodesToDragSelection(n),this.$emit("onFrameSelectEnd",e.slice(0),o,s)},getSelectedNodes:function(){var t=this,e=this.frameSelectorPos,n=e.x,i=e.y,o=this.frameSelectorRect,s=o.width,r=o.height;return this.nodes.filter(function(e){var o=t.$el.querySelector("#".concat(e.id)).getBoundingClientRect(),a=o.left-t.canvasRect.left,l=o.top-t.canvasRect.top;if(n<a&&n+s>a&&i<l&&i+r>l)return!0})},cancelFrameSelectorHandler:function(t){this.selectedNodes=[],this.clearNodesDragSelection(),this.$emit("onCloseFrameSelect")},addNodesToDragSelection:function(t){var e=this;t.forEach(function(t){var n=e.$el.querySelector("#".concat(t));n&&n.classList.add("selected")}),this.instance.addToDragSelection(t)},clearNodesDragSelection:function(){this.$el.querySelectorAll(".jsflow-node.selected").forEach(function(t){t.classList.remove("selected")}),this.instance.clearDragSelection()}}},void 0,!1,void 0,p,void 0);"undefined"!=typeof window&&"Vue"in window&&window.Vue.component("js-flow",j);export default j;
+function t(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,i)}return n}function e(e){for(var i=1;i<arguments.length;i++){var o=null!=arguments[i]?arguments[i]:{};i%2?t(Object(o),!0).forEach(function(t){n(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):t(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}function n(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function i(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var i,o,s=[],r=!0,a=!1;try{for(n=n.call(t);!(r=(i=n.next()).done)&&(s.push(i.value),!e||s.length!==e);r=!0);}catch(t){a=!0,o=t}finally{try{r||null==n.return||n.return()}finally{if(a)throw o}}return s}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,i=new Array(e);n<e;n++)i[n]=t[n];return i}var s="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};var r,a=(function(t,e){(function(){void 0===Math.sgn&&(Math.sgn=function(t){return 0==t?0:t>0?1:-1});var t=function(t,e){return{x:t.x-e.x,y:t.y-e.y}},n=function(t,e){return t.x*e.x+t.y*e.y},i=function(t){return Math.sqrt(t.x*t.x+t.y*t.y)},o=function(t,e){return{x:t.x*e,y:t.y*e}},s=Math.pow(2,-65),r=function(e,n){for(var o=[],s=a(e,n),r=n.length-1,u=l(s,2*r-1,o,0),c=t(e,n[0]),h=i(c),p=0,f=0;f<u;f++){c=t(e,d(n,r,o[f],null,null));var g=i(c);g<h&&(h=g,p=o[f])}return c=t(e,n[r]),(g=i(c))<h&&(h=g,p=1),{location:p,distance:h}},a=function(e,i){for(var s=i.length-1,r=2*s-1,a=[],l=[],u=[],c=[],h=[[1,.6,.3,.1],[.4,.6,.6,.4],[.1,.3,.6,1]],d=0;d<=s;d++)a[d]=t(i[d],e);for(d=0;d<=s-1;d++)l[d]=t(i[d+1],i[d]),l[d]=o(l[d],3);for(var p=0;p<=s-1;p++)for(var f=0;f<=s;f++)u[p]||(u[p]=[]),u[p][f]=n(l[p],a[f]);for(d=0;d<=r;d++)c[d]||(c[d]=[]),c[d].y=0,c[d].x=parseFloat(d)/r;for(var g=s,m=s-1,v=0;v<=g+m;v++){var y=Math.max(0,v-m),b=Math.min(v,g);for(d=y;d<=b;d++){var P=v-d;c[d+P].y+=u[P][d]*h[P][d]}}return c},l=function(t,e,n,i){var o,s,r=[],a=[],p=[],f=[];switch(u(t,e)){case 0:return 0;case 1:if(i>=64)return n[0]=(t[0].x+t[e].x)/2,1;if(c(t,e))return n[0]=h(t,e),1}d(t,e,.5,r,a),o=l(r,e,p,i+1),s=l(a,e,f,i+1);for(var g=0;g<o;g++)n[g]=p[g];for(g=0;g<s;g++)n[g+o]=f[g];return o+s},u=function(t,e){var n,i,o=0;n=i=Math.sgn(t[0].y);for(var s=1;s<=e;s++)(n=Math.sgn(t[s].y))!=i&&o++,i=n;return o},c=function(t,e){var n,i,o,r,a,l,u,c,h;r=t[0].y-t[e].y,a=t[e].x-t[0].x,l=t[0].x*t[e].y-t[e].x*t[0].y,c=h=0;for(var d=1;d<e;d++){var p=r*t[d].x+a*t[d].y+l;p>c?c=p:p<h&&(h=p)}return 0,1,0,n=(1*(l-c)-0*(u=a))*(1/(0*u-1*r)),i=(1*(l-h)-0*(u=a))*(1/(0*u-1*r)),o=Math.min(n,i),Math.max(n,i)-o<s?1:0},h=function(t,e){var n=t[e].x-t[0].x,i=t[e].y-t[0].y,o=t[0].x-0;return 0+1*((n*(t[0].y-0)-i*o)*(1/(0*n-1*i)))},d=function(t,e,n,i,o){for(var s=[[]],r=0;r<=e;r++)s[0][r]=t[r];for(var a=1;a<=e;a++)for(r=0;r<=e-a;r++)s[a]||(s[a]=[]),s[a][r]||(s[a][r]={}),s[a][r].x=(1-n)*s[a-1][r].x+n*s[a-1][r+1].x,s[a][r].y=(1-n)*s[a-1][r].y+n*s[a-1][r+1].y;if(null!=i)for(r=0;r<=e;r++)i[r]=s[r][0];if(null!=o)for(r=0;r<=e;r++)o[r]=s[e-r][r];return s[e][0]},p={},f=function(t,e){for(var n=function(t){var e=p[t];if(!e){var n=function(t){return function(e){return t}},i=function(){return function(t){return t}},o=function(){return function(t){return 1-t}},s=function(t){return function(e){for(var n=1,i=0;i<t.length;i++)n*=t[i](e);return n}};(e=[]).push(new function(){return function(e){return Math.pow(e,t)}});for(var r=1;r<t;r++){for(var a=[new n(t)],l=0;l<t-r;l++)a.push(new i);for(l=0;l<r;l++)a.push(new o);e.push(new s(a))}e.push(new function(){return function(e){return Math.pow(1-e,t)}}),p[t]=e}return e}(t.length-1),i=0,o=0,s=0;s<t.length;s++)i+=t[s].x*n[s](e),o+=t[s].y*n[s](e);return{x:i,y:o}},g=function(t,e){return Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2))},m=function(t){return t[0].x===t[1].x&&t[0].y===t[1].y},v=function(t,e,n){if(m(t))return{point:t[0],location:e};for(var i=f(t,e),o=0,s=e,r=n>0?1:-1,a=null;o<Math.abs(n);)a=f(t,s+=.005*r),o+=g(a,i),i=a;return{point:a,location:s}},y=function(t,e){var n=f(t,e),i=f(t.slice(0,t.length-1),e),o=i.y-n.y,s=i.x-n.x;return 0===o?1/0:Math.atan(o/s)},b=function(t,e,n,i,o){var s=i-e,r=t-n,a=t*(e-i)+e*(n-t),l=function(t){return[P(t,"x"),P(t,"y")]}(o),u=[s*l[0][0]+r*l[1][0],s*l[0][1]+r*l[1][1],s*l[0][2]+r*l[1][2],s*l[0][3]+r*l[1][3]+a],c=function(t,e,n,i){var o,s,r=e/t,a=n/t,l=i/t,u=(3*a-Math.pow(r,2))/9,c=(9*r*a-27*l-2*Math.pow(r,3))/54,h=Math.pow(u,3)+Math.pow(c,2),d=[];if(h>=0)o=x(c+Math.sqrt(h))*Math.pow(Math.abs(c+Math.sqrt(h)),1/3),s=x(c-Math.sqrt(h))*Math.pow(Math.abs(c-Math.sqrt(h)),1/3),d[0]=-r/3+(o+s),d[1]=-r/3-(o+s)/2,d[2]=-r/3-(o+s)/2,0!==Math.abs(Math.sqrt(3)*(o-s)/2)&&(d[1]=-1,d[2]=-1);else{var p=Math.acos(c/Math.sqrt(-Math.pow(u,3)));d[0]=2*Math.sqrt(-u)*Math.cos(p/3)-r/3,d[1]=2*Math.sqrt(-u)*Math.cos((p+2*Math.PI)/3)-r/3,d[2]=2*Math.sqrt(-u)*Math.cos((p+4*Math.PI)/3)-r/3}for(var f=0;f<3;f++)(d[f]<0||d[f]>1)&&(d[f]=-1);return d}.apply(null,u),h=[];if(null!=c)for(var d=0;d<3;d++){var p,f=c[d],g=Math.pow(f,2),m=Math.pow(f,3),v=[l[0][0]*m+l[0][1]*g+l[0][2]*f+l[0][3],l[1][0]*m+l[1][1]*g+l[1][2]*f+l[1][3]];p=n-t!=0?(v[0]-t)/(n-t):(v[1]-e)/(i-e),f>=0&&f<=1&&p>=0&&p<=1&&h.push(v)}return h};function P(t,e){return[-t[0][e]+3*t[1][e]+-3*t[2][e]+t[3][e],3*t[0][e]-6*t[1][e]+3*t[2][e],-3*t[0][e]+3*t[1][e],t[0][e]]}function x(t){return t<0?-1:t>0?1:0}var C=this.jsBezier={distanceFromCurve:r,gradientAtPoint:y,gradientAtPointAlongCurveFrom:function(t,e,n){var i=v(t,e,n);return i.location>1&&(i.location=1),i.location<0&&(i.location=0),y(t,i.location)},nearestPointOnCurve:function(t,e){var n=r(t,e);return{point:d(e,e.length-1,n.location,null,null),location:n.location}},pointOnCurve:f,pointAlongCurveFrom:function(t,e,n){return v(t,e,n).point},perpendicularToCurveAt:function(t,e,n,i){var o=v(t,e,i=null==i?0:i),s=y(t,o.location),r=Math.atan(-1/s),a=n/2*Math.sin(r),l=n/2*Math.cos(r);return[{x:o.point.x+l,y:o.point.y+a},{x:o.point.x-l,y:o.point.y-a}]},locationAlongCurveFrom:function(t,e,n){return v(t,e,n).location},getLength:function(t){var e=(new Date).getTime();if(m(t))return 0;for(var n=f(t,0),i=0,o=0,s=null;o<1;)s=f(t,o+=.005),i+=g(s,n),n=s;return console.log("length",(new Date).getTime()-e),i},lineIntersection:b,boxIntersection:function(t,e,n,i,o){var s=[];return s.push.apply(s,b(t,e,t+n,e,o)),s.push.apply(s,b(t+n,e,t+n,e+i,o)),s.push.apply(s,b(t+n,e+i,t,e+i,o)),s.push.apply(s,b(t,e+i,t,e,o)),s},boundingBoxIntersection:function(t,e){var n=[];return n.push.apply(n,b(t.x,t.y,t.x+t.w,t.y,e)),n.push.apply(n,b(t.x+t.w,t.y,t.x+t.w,t.y+t.h,e)),n.push.apply(n,b(t.x+t.w,t.y+t.h,t.x,t.y+t.h,e)),n.push.apply(n,b(t.x,t.y+t.h,t.x,t.y,e)),n},version:"0.9.0"};e.jsBezier=C}).call("undefined"!=typeof window?window:s),function(){var t=this.Biltong={version:"0.4.0"};e.Biltong=t;var n=function(t){return"[object Array]"===Object.prototype.toString.call(t)},i=function(t,e,i){return i(t=n(t)?t:[t.x,t.y],e=n(e)?e:[e.x,e.y])},o=t.gradient=function(t,e){return i(t,e,function(t,e){return e[0]==t[0]?e[1]>t[1]?1/0:-1/0:e[1]==t[1]?e[0]>t[0]?0:-0:(e[1]-t[1])/(e[0]-t[0])})},s=(t.normal=function(t,e){return-1/o(t,e)},t.lineLength=function(t,e){return i(t,e,function(t,e){return Math.sqrt(Math.pow(e[1]-t[1],2)+Math.pow(e[0]-t[0],2))})},t.quadrant=function(t,e){return i(t,e,function(t,e){return e[0]>t[0]?e[1]>t[1]?2:1:e[0]==t[0]?e[1]>t[1]?2:1:e[1]>t[1]?3:4})}),r=(t.theta=function(t,e){return i(t,e,function(t,e){var n=o(t,e),i=Math.atan(n),r=s(t,e);return 4!=r&&3!=r||(i+=Math.PI),i<0&&(i+=2*Math.PI),i})},t.intersects=function(t,e){var n=t.x,i=t.x+t.w,o=t.y,s=t.y+t.h,r=e.x,a=e.x+e.w,l=e.y,u=e.y+e.h;return n<=r&&r<=i&&o<=l&&l<=s||n<=a&&a<=i&&o<=l&&l<=s||n<=r&&r<=i&&o<=u&&u<=s||n<=a&&r<=i&&o<=u&&u<=s||r<=n&&n<=a&&l<=o&&o<=u||r<=i&&i<=a&&l<=o&&o<=u||r<=n&&n<=a&&l<=s&&s<=u||r<=i&&n<=a&&l<=s&&s<=u},t.encloses=function(t,e,n){var i=t.x,o=t.x+t.w,s=t.y,r=t.y+t.h,a=e.x,l=e.x+e.w,u=e.y,c=e.y+e.h,h=function(t,e,i,o){return n?t<=e&&i>=o:t<e&&i>o};return h(i,a,o,l)&&h(s,u,r,c)},[null,[1,-1],[1,1],[-1,1],[-1,-1]]),a=[null,[-1,-1],[-1,1],[1,1],[1,-1]];t.pointOnLine=function(t,e,n){var i=o(t,e),l=s(t,e),u=n>0?r[l]:a[l],c=Math.atan(i),h=Math.abs(n*Math.sin(c))*u[1],d=Math.abs(n*Math.cos(c))*u[0];return{x:t.x+d,y:t.y+h}},t.perpendicularLineTo=function(t,e,n){var i=o(t,e),s=Math.atan(-1/i),r=n/2*Math.sin(s),a=n/2*Math.cos(s);return[{x:e.x+a,y:e.y+r},{x:e.x-a,y:e.y-r}]}}.call("undefined"!=typeof window?window:s),function(){function t(t,e,n,i,o,s,r,a){return function(){var t=[];return Array.prototype.push.apply(t,arguments),t.item=function(t){return this[t]},t}(function(t,e,n,i,o,s,r,a){return new Touch({target:e,identifier:A(),pageX:n,pageY:i,screenX:o,screenY:s,clientX:r||o,clientY:a||s})}.apply(null,arguments))}var n=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},i=function(t){return"string"==typeof t||t.constructor===String?document.getElementById(t):t},o=function(t){return t.srcElement||t.target},s=function(t,e,n,i){if(i){if(void 0!==t.path&&t.path.indexOf)return{path:t.path,end:t.path.indexOf(n)};var o={path:[],end:-1},s=function(t){o.path.push(t),t===n?o.end=o.path.length-1:null!=t.parentNode&&s(t.parentNode)};return s(e),o}return{path:[e],end:1}},r=function(t,e){for(var n=0,i=t.length;n<i&&t[n]!=e;n++);n<t.length&&t.splice(n,1)},a=1,l=function(t,e,n){var i=a++;return t.__ta=t.__ta||{},t.__ta[e]=t.__ta[e]||{},t.__ta[e][i]=n,n.__tauid=i,i},u=function(t,e,i,r){if(null==t)return i;var a=t.split(","),l=function(r){l.__tauid=i.__tauid;var u=o(r),c=u,h=s(r,u,e,null!=t);if(-1!=h.end)for(var d=0;d<h.end;d++){c=h.path[d];for(var p=0;p<a.length;p++)n(c,a[p],e)&&i.apply(c,arguments)}};return c(i,r,l),l},c=function(t,e,n){t.__taExtra=t.__taExtra||[],t.__taExtra.push([e,n])},h=function(t,e,n,i){if(m&&y[e]){var o=u(i,t,n,y[e]);S(t,y[e],o,n)}"focus"===e&&null==t.getAttribute("tabindex")&&t.setAttribute("tabindex","1"),S(t,e,u(i,t,n,e),n)},d={tap:{touches:1,taps:1},dbltap:{touches:1,taps:2},contextmenu:{touches:2,taps:1}},p=function(t,e){return function(i,a,l,u){if("contextmenu"==a&&v)h(i,a,l,u);else{if(null==i.__taTapHandler){var c=i.__taTapHandler={tap:[],dbltap:[],contextmenu:[],down:!1,taps:0,downSelectors:[]},p=function(){c.down=!1},f=function(){c.taps=0};h(i,"mousedown",function(r){for(var a=o(r),l=s(r,a,i,null!=u),h=!1,d=0;d<l.end;d++){if(h)return;a=l.path[d];for(var g=0;g<c.downSelectors.length;g++)if(null==c.downSelectors[g]||n(a,c.downSelectors[g],i)){c.down=!0,setTimeout(p,t),setTimeout(f,e),h=!0;break}}}),h(i,"mouseup",function(t){if(c.down){var e,r,a=o(t);c.taps++;var l=E(t);for(var u in d)if(d.hasOwnProperty(u)){var h=d[u];if(h.touches===l&&(1===h.taps||h.taps===c.taps))for(var p=0;p<c[u].length;p++){r=s(t,a,i,null!=c[u][p][1]);for(var f=0;f<r.end;f++)if(e=r.path[f],null==c[u][p][1]||n(e,c[u][p][1],i)){c[u][p][0].apply(e,[t]);break}}}}})}i.__taTapHandler.downSelectors.push(u),i.__taTapHandler[a].push([l,u]),l.__taUnstore=function(){r(i.__taTapHandler[a],l)}}}},f=function(t,e,n,i){for(var o in n.__tamee[t])n.__tamee[t].hasOwnProperty(o)&&n.__tamee[t][o].apply(i,[e])},g=function(){var t=[];return function(e,i,s,r){if(!e.__tamee){e.__tamee={over:!1,mouseenter:[],mouseexit:[]};var a=function(i){var s=o(i);(null==r&&s==e&&!e.__tamee.over||n(s,r,e)&&(null==s.__tamee||!s.__tamee.over))&&(f("mouseenter",i,e,s),s.__tamee=s.__tamee||{},s.__tamee.over=!0,t.push(s))},c=function(i){for(var s=o(i),r=0;r<t.length;r++)s!=t[r]||n(i.relatedTarget||i.toElement,"*",s)||(s.__tamee.over=!1,t.splice(r,1),f("mouseexit",i,e,s))};S(e,"mouseover",u(r,e,a,"mouseover"),a),S(e,"mouseout",u(r,e,c,"mouseout"),c)}s.__taUnstore=function(){delete e.__tamee[i][s.__tauid]},l(e,i,s),e.__tamee[i][s.__tauid]=s}},m="ontouchstart"in document.documentElement||navigator.maxTouchPoints,v="onmousedown"in document.documentElement,y={mousedown:"touchstart",mouseup:"touchend",mousemove:"touchmove"},b=function(){var t=-1;if("Microsoft Internet Explorer"==navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),P=b>-1&&b<9,x=function(t,e){if(null==t)return[0,0];var n=j(t),i=_(n,0);return[i[e+"X"],i[e+"Y"]]},C=function(t){return null==t?[0,0]:P?[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop]:x(t,"page")},_=function(t,e){return t.item?t.item(e):t[e]},j=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},E=function(t){return j(t).length},S=function(t,e,n,i){if(l(t,e,n),i.__tauid=n.__tauid,t.addEventListener)t.addEventListener(e,n,!1);else if(t.attachEvent){var o=e+n.__tauid;t["e"+o]=n,t[o]=function(){t["e"+o]&&t["e"+o](window.event)},t.attachEvent("on"+e,t[o])}},w=function(t,e,n){null!=n&&D(t,function(){var o=i(this);if(function(t,e,n){if(t.__ta&&t.__ta[e]&&delete t.__ta[e][n.__tauid],n.__taExtra){for(var i=0;i<n.__taExtra.length;i++)w(t,n.__taExtra[i][0],n.__taExtra[i][1]);n.__taExtra.length=0}n.__taUnstore&&n.__taUnstore()}(o,e,n),null!=n.__tauid)if(o.removeEventListener)o.removeEventListener(e,n,!1),m&&y[e]&&o.removeEventListener(y[e],n,!1);else if(this.detachEvent){var s=e+n.__tauid;o[s]&&o.detachEvent("on"+e,o[s]),o[s]=null,o["e"+s]=null}n.__taTouchProxy&&w(t,n.__taTouchProxy[1],n.__taTouchProxy[0])})},D=function(t,e){if(null!=t){t="undefined"!=typeof Window&&"unknown"!=typeof t.top&&t==t.top?[t]:"string"!=typeof t&&null==t.tagName&&null!=t.length?t:"string"==typeof t?document.querySelectorAll(t):[t];for(var n=0;n<t.length;n++)e.apply(t[n])}},A=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"==t?e:3&e|8).toString(16)})};this.Mottle=function(e){var n=(e=e||{}).clickThreshold||250,s=e.dblClickThreshold||450,a=new g,l=new p(n,s),u=e.smartClicks,c=function(t,e,n,s){null!=n&&D(t,function(){var t=i(this);u&&"click"===e?function(t,e,n,i){null==t.__taSmartClicks&&(h(t,"mousedown",function(e){t.__tad=C(e)},i),h(t,"mouseup",function(e){t.__tau=C(e)},i),h(t,"click",function(e){if(t.__tad&&t.__tau&&t.__tad[0]===t.__tau[0]&&t.__tad[1]===t.__tau[1])for(var n=0;n<t.__taSmartClicks.length;n++)t.__taSmartClicks[n].apply(o(e),[e])},i),t.__taSmartClicks=[]);t.__taSmartClicks.push(n),n.__taUnstore=function(){r(t.__taSmartClicks,n)}}(t,0,n,s):"tap"===e||"dbltap"===e||"contextmenu"===e?l(t,e,n,s):"mouseenter"===e||"mouseexit"==e?a(t,e,n,s):h(t,e,n,s)})};this.remove=function(t){return D(t,function(){var t=i(this);if(t.__ta)for(var e in t.__ta)if(t.__ta.hasOwnProperty(e))for(var n in t.__ta[e])t.__ta[e].hasOwnProperty(n)&&w(t,e,t.__ta[e][n]);t.parentNode&&t.parentNode.removeChild(t)}),this},this.on=function(t,e,n,i){var o=arguments[0],s=4==arguments.length?arguments[2]:null,r=arguments[1],a=arguments[arguments.length-1];return c(o,r,a,s),this},this.off=function(t,e,n){return w(t,e,n),this},this.trigger=function(e,n,o,s){var r=v&&("undefined"==typeof MouseEvent||null==o||o.constructor===MouseEvent),a=m&&!v&&y[n]?y[n]:n,l=!(m&&!v&&y[n]),u=C(o),c=x(o,"screen"),h=function(t){return x(t,"client")}(o);return D(e,function(){var e,d=i(this);o=o||{screenX:c[0],screenY:c[1],clientX:h[0],clientY:h[1]};var p=function(t){s&&(t.payload=s)},f={TouchEvent:function(e){var n=t(window,d,0,u[0],u[1],c[0],c[1],h[0],h[1]);(e.initTouchEvent||e.initEvent)(a,!0,!0,window,null,c[0],c[1],h[0],h[1],!1,!1,!1,!1,n,n,n,1,0)},MouseEvents:function(t){t.initMouseEvent(a,!0,!0,window,0,c[0],c[1],h[0],h[1],!1,!1,!1,!1,1,d)}};if(document.createEvent){var g=!l&&!r&&m&&y[n]?"TouchEvent":"MouseEvents";e=document.createEvent(g),f[g](e),p(e),d.dispatchEvent(e)}else document.createEventObject&&((e=document.createEventObject()).eventType=e.eventName=a,e.screenX=c[0],e.screenY=c[1],e.clientX=h[0],e.clientY=h[1],p(e),d.fireEvent("on"+a,e))}),this}},this.Mottle.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.Mottle.pageLocation=C,this.Mottle.setForceTouchEvents=function(t){m=t},this.Mottle.setForceMouseEvents=function(t){v=t},this.Mottle.version="0.8.0",e.Mottle=this.Mottle}.call("undefined"==typeof window?s:window),function(){var t=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},n=function(t,e){var n=t.indexOf(e);-1!==n&&t.splice(n,1)},i=function(t){return null!=t&&("string"==typeof t||t.constructor===String)},o=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},s=function(t,e,n){if(o(e,n,t))return e;for(var i=e.parentNode;null!=i&&i!==t;){if(o(i,n,t))return i;i=i.parentNode}},r=function(){var t=-1;if("Microsoft Internet Explorer"===navigator.appName){var e=navigator.userAgent;null!=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(e)&&(t=parseFloat(RegExp.$1))}return t}(),a=r>-1&&r<9,l=9===r,u=function(t){if(a)return[t.clientX+document.documentElement.scrollLeft,t.clientY+document.documentElement.scrollTop];var e=h(t),n=c(e,0);return l?[n.pageX||n.clientX,n.pageY||n.clientY]:[n.pageX,n.pageY]},c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d={delegatedDraggable:"katavorio-delegated-draggable",draggable:"katavorio-draggable",droppable:"katavorio-droppable",drag:"katavorio-drag",selected:"katavorio-drag-selected",active:"katavorio-drag-active",hover:"katavorio-drag-hover",noSelect:"katavorio-drag-no-select",ghostProxy:"katavorio-ghost-proxy",clonedDrag:"katavorio-clone-drag"},p=["stop","start","drag","drop","over","out","beforeStart"],f=function(){},g=function(){return!0},m=function(t,e,n){for(var i=0;i<t.length;i++)t[i]!=n&&e(t[i])},v=function(t,e,n,i){m(t,function(t){t.setActive(e),e&&t.updatePosition(),n&&t.setHover(i,e)})},y=function(t,e){if(null!=t){t=i(t)||null!=t.tagName||null==t.length?[t]:t;for(var n=0;n<t.length;n++)e.apply(t[n],[t[n]])}},b=function(t){t.stopPropagation?(t.stopPropagation(),t.preventDefault()):t.returnValue=!1},P=function(t,e,n,i){this.params=e||{},this.el=t,this.params.addClass(this.el,this._class),this.uuid=E();var o=!0;return this.setEnabled=function(t){o=t},this.isEnabled=function(){return o},this.toggleEnabled=function(){o=!o},this.setScope=function(t){this.scopes=t?t.split(/\s+/):[i]},this.addScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.removeScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){delete e[t]}),this.scopes=[],e)this.scopes.push(n)},this.toggleScope=function(t){var e={};for(var n in y(this.scopes,function(t){e[t]=!0}),y(t?t.split(/\s+/):[],function(t){e[t]?delete e[t]:e[t]=!0}),this.scopes=[],e)this.scopes.push(n)},this.setScope(e.scope),this.k=e.katavorio,e.katavorio},x=function(){return!0},C=function(){return!1},_=function(t,e,n,r){this._class=n.draggable;var a=P.apply(this,arguments);this.rightButtonCanDrag=this.params.rightButtonCanDrag;var l,c,h,p,f,m,y=[0,0],_=null,j=null,w=[0,0],D=!1,A=[0,0],I=!1!==this.params.consumeStartEvent,k=this.el,O=this.params.clone,M=(this.params.scroll,!1!==e.multipleDrop),T=!1,F=null,L=[],N=null,R=e.ghostProxyParent;if(l=!0===e.ghostProxy?x:e.ghostProxy&&"function"==typeof e.ghostProxy?e.ghostProxy:function(t,e){return!(!N||!N.useGhostProxy)&&N.useGhostProxy(t,e)},c=e.makeGhostProxy?e.makeGhostProxy:function(t){return N&&N.makeGhostProxy?N.makeGhostProxy(t):t.cloneNode(!0)},e.selector){var G=t.getAttribute("katavorio-draggable");null==G&&(G=""+(new Date).getTime(),t.setAttribute("katavorio-draggable",G)),L.push(e)}var B,H=e.snapThreshold,U=function(t,e,n,i,o){var s=e*Math.floor(t[0]/e),r=s+e,a=Math.abs(t[0]-s)<=i?s:Math.abs(r-t[0])<=i?r:t[0],l=n*Math.floor(t[1]/n),u=l+n;return[a,Math.abs(t[1]-l)<=o?l:Math.abs(u-t[1])<=o?u:t[1]]};this.posses=[],this.posseRoles={},this.toGrid=function(t){if(null==this.params.grid)return t;var e=this.params.grid?this.params.grid[0]/2:H||5,n=this.params.grid?this.params.grid[1]/2:H||5;return U(t,this.params.grid[0],this.params.grid[1],e,n)},this.snap=function(t,e){if(null!=k){t=t||(this.params.grid?this.params.grid[0]:10),e=e||(this.params.grid?this.params.grid[1]:10);var n=this.params.getPosition(k),i=this.params.grid?this.params.grid[0]/2:H,o=this.params.grid?this.params.grid[1]/2:H,s=U(n,t,e,i,o);return this.params.setPosition(k,s),s}},this.setUseGhostProxy=function(t){l=t?x:C};var X=function(t){return!1===e.allowNegative?[Math.max(0,t[0]),Math.max(0,t[1])]:t},Y=function(t){B="function"==typeof t?t:t?function(t,e,n,i){return X([Math.max(0,Math.min(n.w-i[0],t[0])),Math.max(0,Math.min(n.h-i[1],t[1]))])}.bind(this):function(t){return X(t)}}.bind(this);Y("function"==typeof this.params.constrain?this.params.constrain:this.params.constrain||this.params.containment),this.setConstrain=function(t){Y(t)};var $;this.setRevert=function(t){$=t},this.params.revert&&($=this.params.revert);var z={},W=this.setFilter=function(e,n){if(e){var s="function"==typeof(r=e)?(r._katavorioId=E(),r._katavorioId):r;z[s]=[function(n){var s,r=n.srcElement||n.target;return i(e)?s=o(r,e,t):"function"==typeof e&&(s=e(n,t)),s},!1!==n]}var r};this.addFilter=W,this.removeFilter=function(t){var e="function"==typeof t?t._katavorioId:t;delete z[e]};this.clearAllFilters=function(){z={}},this.canDrag=this.params.canDrag||g;var q,V=[],J=[];this.addSelector=function(t){t.selector&&L.push(t)},this.downListener=function(t){var e,i,r,l,c,h,p,f,g;if(!t.defaultPrevented&&((this.rightButtonCanDrag||3!==t.which&&2!==t.button)&&this.isEnabled()&&this.canDrag()))if(function(t){for(var e in z){var n=z[e],i=n[0](t);if(n[1]&&(i=!i),!i)return!1}return!0}(t)&&function(t,e,n){var i=t.srcElement||t.target;return!o(i,n.getInputFilterSelector(),e)}(t,this.el,this.k)){if(N=null,F=null,L.length>0){var m=function(t,e,n){for(var i=null,r=e.getAttribute("katavorio-draggable"),a=null!=r?"[katavorio-draggable='"+r+"'] ":"",l=0;l<t.length;l++)if(null!=(i=s(e,n,a+t[l].selector))){if(t[l].filter){var u=o(n,t[l].filter,i);if(!0===t[l].filterExclude&&!u||u)return null}return[t[l],i]}return null}(L,this.el,t.target||t.srcElement);if(null!=m&&(N=m[0],F=m[1]),null==F)return}else F=this.el;if(O)if(k=F.cloneNode(!0),this.params.addClass(k,d.clonedDrag),k.setAttribute("id",null),k.style.position="absolute",null!=this.params.parent){var v=this.params.getPosition(this.el);k.style.left=v[0]+"px",k.style.top=v[1]+"px",this.params.parent.appendChild(k)}else{var P=(e=F.getBoundingClientRect(),i=document.body,r=document.documentElement,l=window.pageYOffset||r.scrollTop||i.scrollTop,c=window.pageXOffset||r.scrollLeft||i.scrollLeft,h=r.clientTop||i.clientTop||0,p=r.clientLeft||i.clientLeft||0,f=e.top+l-h,g=e.left+c-p,{top:Math.round(f),left:Math.round(g)});k.style.left=P.left+"px",k.style.top=P.top+"px",document.body.appendChild(k)}else k=F;I&&b(t),y=u(t),k&&k.parentNode&&(A=[k.parentNode.scrollLeft,k.parentNode.scrollTop]),this.params.bind(document,"mousemove",this.moveListener),this.params.bind(document,"mouseup",this.upListener),a.markSelection(this),a.markPosses(this),this.params.addClass(document.body,n.noSelect),Q("beforeStart",{el:this.el,pos:_,e:t,drag:this})}else this.params.consumeFilteredEvents&&b(t)}.bind(this),this.moveListener=function(t){if(y){if(!D)if(!1!==Q("start",{el:this.el,pos:_,e:t,drag:this})){if(!y)return;this.mark(!0),D=!0}else this.abort();if(y){J.length=0;var e=u(t),n=e[0]-y[0],i=e[1]-y[1],o=this.params.ignoreZoom?1:a.getZoom();k&&k.parentNode&&(n+=k.parentNode.scrollLeft-A[0],i+=k.parentNode.scrollTop-A[1]),n/=o,i/=o,this.moveBy(n,i,t),a.updateSelection(n,i,this),a.updatePosses(n,i,this)}}}.bind(this),this.upListener=function(t){y&&(y=null,this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.params.removeClass(document.body,n.noSelect),this.unmark(t),a.unmarkSelection(this,t),a.unmarkPosses(this,t),this.stop(t),a.notifyPosseDragStop(this,t),D=!1,J.length=0,O?(k&&k.parentNode&&k.parentNode.removeChild(k),k=null):$&&!0===$(k,this.params.getPosition(k))&&(this.params.setPosition(k,_),Q("revert",k)))}.bind(this),this.getFilters=function(){return z},this.abort=function(){null!=y&&this.upListener()},this.getDragElement=function(t){return t?F||this.el:k||this.el};var Z={start:[],drag:[],stop:[],over:[],out:[],beforeStart:[],revert:[]};e.events.start&&Z.start.push(e.events.start),e.events.beforeStart&&Z.beforeStart.push(e.events.beforeStart),e.events.stop&&Z.stop.push(e.events.stop),e.events.drag&&Z.drag.push(e.events.drag),e.events.revert&&Z.revert.push(e.events.revert),this.on=function(t,e){Z[t]&&Z[t].push(e)},this.off=function(t,e){if(Z[t]){for(var n=[],i=0;i<Z[t].length;i++)Z[t][i]!==e&&n.push(Z[t][i]);Z[t]=n}};var K,Q=function(t,e){var n=null;if(N&&N[t])n=N[t](e);else if(Z[t])for(var i=0;i<Z[t].length;i++)try{var o=Z[t][i](e);null!=o&&(n=o)}catch(t){}return n};this.notifyStart=function(t){Q("start",{el:this.el,pos:this.params.getPosition(k),e:t,drag:this})},this.stop=function(t,e){if(e||D){var n=[],i=a.getSelection(),o=this.params.getPosition(k);if(i.length>0)for(var s=0;s<i.length;s++){var r=this.params.getPosition(i[s].el);n.push([i[s].el,{left:r[0],top:r[1]},i[s]])}else n.push([k,{left:o[0],top:o[1]},this]);Q("stop",{el:k,pos:K||o,finalPos:o,e:t,drag:this,selection:n})}},this.mark=function(t){var e;_=this.params.getPosition(k),j=this.params.getPosition(k,!0),w=[j[0]-_[0],j[1]-_[1]],this.size=this.params.getSize(k),V=a.getMatchingDroppables(this),v(V,!0,!1,this),this.params.addClass(k,this.params.dragClass||n.drag),e=this.params.getConstrainingRectangle?this.params.getConstrainingRectangle(k):this.params.getSize(k.parentNode),q={w:e[0],h:e[1]},f=0,m=0,t&&a.notifySelectionDragStart(this)},this.unmark=function(t,i){if(v(V,!1,!0,this),T&&l(F,k)?(K=[k.offsetLeft-f,k.offsetTop-m],k.parentNode.removeChild(k),k=F):K=null,this.params.removeClass(k,this.params.dragClass||n.drag),V.length=0,T=!1,!i){J.length>0&&K&&e.setPosition(F,K),J.sort(S);for(var o=0;o<J.length;o++){if(!0===J[o].drop(this,t))break}}},this.moveBy=function(t,n,i){J.length=0;var o=this.toGrid([_[0]+t,_[1]+n]),s=function(t,e,n,i){return null!=N&&N.constrain&&"function"==typeof N.constrain?N.constrain(t,e,n,i):B(t,e,n,i)}(o,k,q,this.size);if(l(this.el,k))if(o[0]!==s[0]||o[1]!==s[1]){if(!T){var r=c(F);e.addClass(r,d.ghostProxy),R?(R.appendChild(r),h=e.getPosition(F.parentNode,!0),p=e.getPosition(e.ghostProxyParent,!0),f=h[0]-p[0],m=h[1]-p[1]):F.parentNode.appendChild(r),k=r,T=!0}s=o}else T&&(k.parentNode.removeChild(k),k=F,T=!1,h=null,p=null,f=0,m=0);var a={x:s[0],y:s[1],w:this.size[0],h:this.size[1]},u={x:a.x+w[0],y:a.y+w[1],w:a.w,h:a.h},g=null;this.params.setPosition(k,[s[0]+f,s[1]+m]);for(var v=0;v<V.length;v++){var y={x:V[v].pagePosition[0],y:V[v].pagePosition[1],w:V[v].size[0],h:V[v].size[1]};this.params.intersects(u,y)&&(M||null==g||g===V[v].el)&&V[v].canDrop(this)?(g||(g=V[v].el),J.push(V[v]),V[v].setHover(this,!0,i)):V[v].isHover()&&V[v].setHover(this,!1,i)}Q("drag",{el:this.el,pos:s,e:i,drag:this})},this.destroy=function(){this.params.unbind(this.el,"mousedown",this.downListener),this.params.unbind(document,"mousemove",this.moveListener),this.params.unbind(document,"mouseup",this.upListener),this.downListener=null,this.upListener=null,this.moveListener=null},this.params.bind(this.el,"mousedown",this.downListener),this.params.handle?W(this.params.handle,!1):W(this.params.filter,this.params.filterExclude)},j=function(t,e,n,i){this._class=n.droppable,this.params=e||{},this.rank=e.rank||0,this._activeClass=this.params.activeClass||n.active,this._hoverClass=this.params.hoverClass||n.hover,P.apply(this,arguments);var o=!1;this.allowLoopback=!1!==this.params.allowLoopback,this.setActive=function(t){this.params[t?"addClass":"removeClass"](this.el,this._activeClass)},this.updatePosition=function(){this.position=this.params.getPosition(this.el),this.pagePosition=this.params.getPosition(this.el,!0),this.size=this.params.getSize(this.el)},this.canDrop=this.params.canDrop||function(t){return!0},this.isHover=function(){return o},this.setHover=function(t,e,n){(e||null==this.el._katavorioDragHover||this.el._katavorioDragHover===t.el._katavorio)&&(this.params[e?"addClass":"removeClass"](this.el,this._hoverClass),this.el._katavorioDragHover=e?t.el._katavorio:null,o!==e&&this.params.events[e?"over":"out"]({el:this.el,e:n,drag:t,drop:this}),o=e)},this.drop=function(t,e){return this.params.events.drop({drag:t,e:e,drop:this})},this.destroy=function(){this._class=null,this._activeClass=null,this._hoverClass=null,o=null}},E=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0;return("x"===t?e:3&e|8).toString(16)})},S=function(t,e){return t.rank<e.rank?1:t.rank>e.rank?-1:0},w=function(t){return null==t?null:null==(t="string"==typeof t||t.constructor===String?document.getElementById(t):t)?null:(t._katavorio=t._katavorio||E(),t)};this.Katavorio=function(e){var o=[],s={};this._dragsByScope={},this._dropsByScope={};var r=1,a=function(t,e){y(t,function(t){for(var n=0;n<t.scopes.length;n++)e[t.scopes[n]]=e[t.scopes[n]]||[],e[t.scopes[n]].push(t)})},l=function(t,n){var i=0;return y(t,function(t){for(var o=0;o<t.scopes.length;o++)if(n[t.scopes[o]]){var s=e.indexOf(n[t.scopes[o]],t);-1!==s&&(n[t.scopes[o]].splice(s,1),i++)}}),i>0},u=(this.getMatchingDroppables=function(t){for(var e=[],n={},i=0;i<t.scopes.length;i++){var o=this._dropsByScope[t.scopes[i]];if(o)for(var s=0;s<o.length;s++)!o[s].canDrop(t)||n[o[s].uuid]||!o[s].allowLoopback&&o[s].el===t.el||(n[o[s].uuid]=!0,e.push(o[s]))}return e.sort(S),e},function(t){t=t||{};var n,i={events:{}};for(n in e)i[n]=e[n];for(n in t)i[n]=t[n];for(n=0;n<p.length;n++)i.events[p[n]]=t[p[n]]||f;return i.katavorio=this,i}.bind(this)),c=function(t,e){for(var n=0;n<p.length;n++)e[p[n]]&&t.on(p[n],e[p[n]])}.bind(this),h={},g=e.css||{},v=e.scope||"katavorio-drag-scope";for(var b in d)h[b]=d[b];for(var b in g)h[b]=g[b];var P=e.inputFilterSelector||"input,textarea,select,button,option";this.getInputFilterSelector=function(){return P},this.setInputFilterSelector=function(t){return P=t,this},this.draggable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t)))if(null==t._katavorioDrag){var o=u(n);t._katavorioDrag=new _(t,o,h,v),a(t._katavorioDrag,this._dragsByScope),i.push(t._katavorioDrag),e.addClass(t,o.selector?h.delegatedDraggable:h.draggable)}else c(t._katavorioDrag,n)}.bind(this)),i},this.droppable=function(t,n){var i=[];return y(t,function(t){if(null!=(t=w(t))){var o=new j(t,u(n),h,v);t._katavorioDrop=t._katavorioDrop||[],t._katavorioDrop.push(o),a(o,this._dropsByScope),i.push(o),e.addClass(t,h.droppable)}}.bind(this)),i},this.select=function(t){return y(t,function(){var t=w(this);t&&t._katavorioDrag&&(s[t._katavorio]||(o.push(t._katavorioDrag),s[t._katavorio]=[t,o.length-1],e.addClass(t,h.selected)))}),this},this.deselect=function(t){return y(t,function(){var t=w(this);if(t&&t._katavorio&&s[t._katavorio]){for(var n=[],i=0;i<o.length;i++)o[i].el!==t&&n.push(o[i]);o=n,delete s[t._katavorio],e.removeClass(t,h.selected)}}),this},this.deselectAll=function(){for(var t in s){var n=s[t];e.removeClass(n[0],h.selected)}o.length=0,s={}},this.markSelection=function(t){m(o,function(t){t.mark()},t)},this.markPosses=function(t){t.posses&&y(t.posses,function(e){t.posseRoles[e]&&A[e]&&m(A[e].members,function(t){t.mark()},t)})},this.unmarkSelection=function(t,e){m(o,function(t){t.unmark(e)},t)},this.unmarkPosses=function(t,e){t.posses&&y(t.posses,function(n){t.posseRoles[n]&&A[n]&&m(A[n].members,function(t){t.unmark(e,!0)},t)})},this.getSelection=function(){return o.slice(0)},this.updateSelection=function(t,e,n){m(o,function(n){n.moveBy(t,e)},n)};var x=function(t,e){e.posses&&y(e.posses,function(n){e.posseRoles[n]&&A[n]&&m(A[n].members,function(e){t(e)},e)})};this.updatePosses=function(t,e,n){x(function(n){n.moveBy(t,e)},n)},this.notifyPosseDragStop=function(t,e){x(function(t){t.stop(e,!0)},t)},this.notifySelectionDragStop=function(t,e){m(o,function(t){t.stop(e,!0)},t)},this.notifySelectionDragStart=function(t,e){m(o,function(t){t.notifyStart(e)},t)},this.setZoom=function(t){r=t},this.getZoom=function(){return r};var C=function(t,e,n,i){y(t,function(t){l(t,n),t[i](e),a(t,n)})};y(["set","add","remove","toggle"],function(t){this[t+"Scope"]=function(e,n){C(e._katavorioDrag,n,this._dragsByScope,t+"Scope"),C(e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this),this[t+"DragScope"]=function(e,n){C(e.constructor===_?e:e._katavorioDrag,n,this._dragsByScope,t+"Scope")}.bind(this),this[t+"DropScope"]=function(e,n){C(e.constructor===j?e:e._katavorioDrop,n,this._dropsByScope,t+"Scope")}.bind(this)}.bind(this)),this.snapToGrid=function(t,e){for(var n in this._dragsByScope)m(this._dragsByScope[n],function(n){n.snap(t,e)})},this.getDragsForScope=function(t){return this._dragsByScope[t]},this.getDropsForScope=function(t){return this._dropsByScope[t]};var E=function(t,e,n){if((t=w(t))[e]){var i=o.indexOf(t[e]);i>=0&&o.splice(i,1),l(t[e],n)&&y(t[e],function(t){t.destroy()}),delete t[e]}},D=function(t,e,n,i){(t=w(t))[e]&&t[e].off(n,i)};this.elementRemoved=function(t){t._katavorioDrag&&this.destroyDraggable(t),t._katavorioDrop&&this.destroyDroppable(t)},this.destroyDraggable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrag",this._dragsByScope):D(t,"_katavorioDrag",e,n)},this.destroyDroppable=function(t,e,n){1===arguments.length?E(t,"_katavorioDrop",this._dropsByScope):D(t,"_katavorioDrop",e,n)},this.reset=function(){this._dragsByScope={},this._dropsByScope={},o=[],s={},A={}};var A={},I=function(e,n,o){var s,r=i(n)?n:n.id,a=!!i(n)||!1!==n.active,l=A[r]||(s={name:r,members:[]},A[r]=s,s);return y(e,function(e){if(e._katavorioDrag){if(o&&null!=e._katavorioDrag.posseRoles[l.name])return;t(l.members,e._katavorioDrag),t(e._katavorioDrag.posses,l.name),e._katavorioDrag.posseRoles[l.name]=a}}),l};this.addToPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i]));return 1===n.length?n[0]:n},this.setPosse=function(t,e){for(var n=[],i=1;i<arguments.length;i++)n.push(I(t,arguments[i],!0).name);return y(t,function(t){if(t._katavorioDrag){var e=function(t,e){for(var n=[],i=0;i<t.length;i++)-1===e.indexOf(t[i])&&n.push(t[i]);return n}(t._katavorioDrag.posses,n);Array.prototype.push.apply([],t._katavorioDrag.posses);for(var i=0;i<e.length;i++)this.removeFromPosse(t,e[i])}}.bind(this)),1===n.length?n[0]:n},this.removeFromPosse=function(t,e){if(arguments.length<2)throw new TypeError("No posse id provided for remove operation");for(var i=1;i<arguments.length;i++)e=arguments[i],y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var i=t._katavorioDrag;y(e,function(t){n(A[t].members,i),n(i.posses,t),delete i.posseRoles[t]})}})},this.removeFromAllPosses=function(t){y(t,function(t){if(t._katavorioDrag&&t._katavorioDrag.posses){var e=t._katavorioDrag;y(e.posses,function(t){n(A[t].members,e)}),e.posses.length=0,e.posseRoles={}}})},this.setPosseState=function(t,e,n){var i=A[e];i&&y(t,function(t){t._katavorioDrag&&t._katavorioDrag.posses&&(t._katavorioDrag.posseRoles[i.name]=n)})}},this.Katavorio.version="1.0.0",e.Katavorio=this.Katavorio}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil=this.jsPlumbUtil||{};var t=this.jsPlumbUtil;function n(t){return"[object Array]"===Object.prototype.toString.call(t)}function i(t){return"string"==typeof t}function o(t){return"boolean"==typeof t}function s(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function r(t){return"[object Date]"===Object.prototype.toString.call(t)}function a(t){return"[object Function]"===Object.prototype.toString.call(t)}function l(t){if(i(t))return""+t;if(o(t))return!!t;if(r(t))return new Date(t.getTime());if(a(t))return t;if(n(t)){for(var e=[],u=0;u<t.length;u++)e.push(l(t[u]));return e}if(s(t)){var c={};for(var h in t)c[h]=l(t[h]);return c}return t}function u(t,e,r,a){var u,c,h={},d={};for(r=r||[],a=a||[],c=0;c<r.length;c++)h[r[c]]=!0;for(c=0;c<a.length;c++)d[a[c]]=!0;var p=l(t);for(c in e)if(null==p[c]||d[c])p[c]=e[c];else if(i(e[c])||o(e[c]))h[c]?((u=[]).push.apply(u,n(p[c])?p[c]:[p[c]]),u.push.apply(u,o(e[c])?e[c]:[e[c]]),p[c]=u):p[c]=e[c];else if(n(e[c]))u=[],n(p[c])&&u.push.apply(u,p[c]),u.push.apply(u,e[c]),p[c]=u;else if(s(e[c]))for(var f in s(p[c])||(p[c]={}),e[c])p[c][f]=e[c][f];return p}function c(t,e){if(t)for(var n=0;n<t.length;n++)if(e(t[n]))return n;return-1}function h(t,e){var n=t.indexOf(e);return n>-1&&t.splice(n,1),-1!==n}function d(t,e,n,i){var o=t[e];return null==o&&(o=[],t[e]=o),o[i?"unshift":"push"](n),o}e.jsPlumbUtil=t,t.isArray=n,t.isNumber=function(t){return"[object Number]"===Object.prototype.toString.call(t)},t.isString=i,t.isBoolean=o,t.isNull=function(t){return null==t},t.isObject=s,t.isDate=r,t.isFunction=a,t.isNamedFunction=function(t){return a(t)&&null!=t.name&&t.name.length>0},t.isEmpty=function(t){for(var e in t)if(t.hasOwnProperty(e))return!1;return!0},t.clone=l,t.merge=u,t.replace=function(t,e,n){if(null!=t){var i=t;return e.replace(/([^\.])+/g,function(t,e,o,s){var r=t.match(/([^\[0-9]+){1}(\[)([0-9+])/),a=function(){return i[r[1]]||(i[r[1]]=[],i[r[1]])};if(o+t.length>=s.length)r?a()[r[3]]=n:i[t]=n;else if(r){var l=a();i=l[r[3]]||(l[r[3]]={},l[r[3]])}else i=i[t]||(i[t]={},i[t]);return""}),t}},t.functionChain=function(t,e,n){for(var i=0;i<n.length;i++){var o=n[i][0][n[i][1]].apply(n[i][0],n[i][2]);if(o===e)return o}return t},t.populate=function(t,e,o,r){var l=function(t){if(null!=t){if(i(t))return function(t){var n=t.match(/(\${.*?})/g);if(null!=n)for(var i=0;i<n.length;i++){var o=e[n[i].substring(2,n[i].length-1)]||"";null!=o&&(t=t.replace(n[i],o))}return t}(t);if(!a(t)||r||null!=o&&0!==(t.name||"").indexOf(o)){if(n(t)){for(var u=[],c=0;c<t.length;c++)u.push(l(t[c]));return u}if(s(t)){var h={};for(var d in t)h[d]=l(t[d]);return h}return t}return t(e)}};return l(t)},t.findWithFunction=c,t.removeWithFunction=function(t,e){var n=c(t,e);return n>-1&&t.splice(n,1),-1!==n},t.remove=h,t.addWithFunction=function(t,e,n){-1===c(t,n)&&t.push(e)},t.addToList=d,t.suggest=function(t,e,n){return-1===t.indexOf(e)&&(n?t.unshift(e):t.push(e),!0)},t.extend=function(t,e,i){var o;e=n(e)?e:[e];var s=function(e){for(var n=e.__proto__;null!=n;)if(null!=n.prototype){for(var i in n.prototype)n.prototype.hasOwnProperty(i)&&!t.prototype.hasOwnProperty(i)&&(t.prototype[i]=n.prototype[i]);n=n.prototype.__proto__}else n=null};for(o=0;o<e.length;o++){for(var r in e[o].prototype)e[o].prototype.hasOwnProperty(r)&&!t.prototype.hasOwnProperty(r)&&(t.prototype[r]=e[o].prototype[r]);s(e[o])}var a=function(t,n){return function(){for(o=0;o<e.length;o++)e[o].prototype[t]&&e[o].prototype[t].apply(this,arguments);return n.apply(this,arguments)}},l=function(e){for(var n in e)t.prototype[n]=a(n,e[n])};if(arguments.length>2)for(o=2;o<arguments.length;o++)l(arguments[o]);return t};for(var p=[],f=0;f<256;f++)p[f]=(f<16?"0":"")+f.toString(16);function g(){var t=4294967295*Math.random()|0,e=4294967295*Math.random()|0,n=4294967295*Math.random()|0,i=4294967295*Math.random()|0;return p[255&t]+p[t>>8&255]+p[t>>16&255]+p[t>>24&255]+"-"+p[255&e]+p[e>>8&255]+"-"+p[e>>16&15|64]+p[e>>24&255]+"-"+p[63&n|128]+p[n>>8&255]+"-"+p[n>>16&255]+p[n>>24&255]+p[255&i]+p[i>>8&255]+p[i>>16&255]+p[i>>24&255]}function m(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];if(t.logEnabled&&"undefined"!=typeof console)try{var i=arguments[arguments.length-1];console.log(i)}catch(t){}}t.uuid=g,t.fastTrim=function(t){if(null==t)return null;for(var e=t.replace(/^\s\s*/,""),n=/\s/,i=e.length;n.test(e.charAt(--i)););return e.slice(0,i+1)},t.each=function(t,e){t=null==t.length||"string"==typeof t?[t]:t;for(var n=0;n<t.length;n++)e(t[n])},t.map=function(t,e){for(var n=[],i=0;i<t.length;i++)n.push(e(t[i]));return n},t.mergeWithParents=function(t,e,n){n=n||"parent";var i=function(t){return t?e[t]:null},o=function(t){return t?i(t[n]):null},s=function(t,e){if(null==t)return e;var n=["anchor","anchors","cssClass","connector","paintStyle","hoverPaintStyle","endpoint","endpoints"];"override"===e.mergeStrategy&&Array.prototype.push.apply(n,["events","overlays"]);var i=u(t,e,[],n);return s(o(t),i)},r=function(t){if(null==t)return{};if("string"==typeof t)return i(t);if(t.length){for(var e=!1,n=0,o=void 0;!e&&n<t.length;)(o=r(t[n]))?e=!0:n++;return o}},a=r(t);return a?s(o(a),a):{}},t.logEnabled=!0,t.log=m,t.wrap=function(t,e,n){return function(){var i=null;try{null!=e&&(i=e.apply(this,arguments))}catch(t){m("jsPlumb function failed : "+t)}if(null!=t&&(null==n||i!==n))try{i=t.apply(this,arguments)}catch(t){m("wrapped function failed : "+t)}return i}};var v=function(){return function(){var t=this;this._listeners={},this.eventsSuspended=!1,this.tick=!1,this.eventsToDieOn={ready:!0},this.queue=[],this.bind=function(e,n,i){var o=function(e){d(t._listeners,e,n,i),n.__jsPlumb=n.__jsPlumb||{},n.__jsPlumb[g()]=e};if("string"==typeof e)o(e);else if(null!=e.length)for(var s=0;s<e.length;s++)o(e[s]);return t},this.fire=function(t,e,n){if(this.tick)this.queue.unshift(arguments);else{if(this.tick=!0,!this.eventsSuspended&&this._listeners[t]){var i=this._listeners[t].length,o=0,s=!1,r=null;if(!this.shouldFireEvent||this.shouldFireEvent(t,e,n))for(;!s&&o<i&&!1!==r;){if(this.eventsToDieOn[t])this._listeners[t][o].apply(this,[e,n]);else try{r=this._listeners[t][o].apply(this,[e,n])}catch(e){m("jsPlumb: fire failed for event "+t+" : "+e)}o++,null!=this._listeners&&null!=this._listeners[t]||(s=!0)}}this.tick=!1,this._drain()}return this},this._drain=function(){var e=t.queue.pop();e&&t.fire.apply(t,e)},this.unbind=function(t,e){if(0===arguments.length)this._listeners={};else if(1===arguments.length){if("string"==typeof t)delete this._listeners[t];else if(t.__jsPlumb){var n=void 0;for(var i in t.__jsPlumb)n=t.__jsPlumb[i],h(this._listeners[n]||[],t)}}else 2===arguments.length&&h(this._listeners[t]||[],e);return this},this.getListener=function(e){return t._listeners[e]},this.setSuspendEvents=function(e){t.eventsSuspended=e},this.isSuspendEvents=function(){return t.eventsSuspended},this.silently=function(e){t.setSuspendEvents(!0);try{e()}catch(t){m("Cannot execute silent function "+t)}t.setSuspendEvents(!1)},this.cleanupListeners=function(){for(var e in t._listeners)t._listeners[e]=null}}}();function y(t,e,n){var i=[t[0]-e[0],t[1]-e[1]],o=Math.cos(n/360*Math.PI*2),s=Math.sin(n/360*Math.PI*2);return[i[0]*o-i[1]*s+e[0],i[1]*o+i[0]*s+e[1],o,s]}t.EventGenerator=v,t.rotatePoint=y,t.rotateAnchorOrientation=function(t,e){var n=y(t,[0,0],e);return[Math.round(n[0]),Math.round(n[1])]}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil.matchesSelector=function(t,e,n){for(var i=(n=n||t.parentNode).querySelectorAll(e),o=0;o<i.length;o++)if(i[o]===t)return!0;return!1},this.jsPlumbUtil.consume=function(t,e){t.stopPropagation?t.stopPropagation():t.returnValue=!1,!e&&t.preventDefault&&t.preventDefault()},this.jsPlumbUtil.sizeElement=function(t,e,n,i,o){t&&(t.style.height=o+"px",t.height=o,t.style.width=i+"px",t.width=i,t.style.left=e+"px",t.style.top=n+"px")}}.call("undefined"!=typeof window?window:s),function(){var t={deriveAnchor:function(t,e,n,i){return{top:["TopRight","TopLeft"],bottom:["BottomRight","BottomLeft"]}[t][e]}},e=function(t,e){this.count=0,this.instance=t,this.lists={},this.options=e||{},this.instance.addList=function(t,e){return this.listManager.addList(t,e)},this.instance.removeList=function(t){this.listManager.removeList(t)},this.instance.bind("manageElement",function(t){for(var e=this.instance.getSelector(t.el,"[jtk-scrollable-list]"),n=0;n<e.length;n++)this.addList(e[n])}.bind(this)),this.instance.bind("unmanageElement",function(t){this.removeList(t.el)}),this.instance.bind("connection",function(t,e){null==e&&(this._maybeUpdateParentList(t.source),this._maybeUpdateParentList(t.target))}.bind(this))};this.jsPlumbListManager=e,e.prototype={addList:function(e,i){var o=this.instance.extend({},t);this.instance.extend(o,this.options),i=this.instance.extend(o,i||{});var s=[this.instance.getInstanceIndex(),this.count++].join("_");this.lists[s]=new n(this.instance,e,i,s)},removeList:function(t){var e=this.lists[t._jsPlumbList];e&&(e.destroy(),delete this.lists[t._jsPlumbList])},_maybeUpdateParentList:function(t){for(var e=t.parentNode,n=this.instance.getContainer();null!=e&&e!==n;){if(null!=e._jsPlumbList&&null!=this.lists[e._jsPlumbList])return void e._jsPlumbScrollHandler();e=e.parentNode}}};var n=function(t,e,n,i){function o(t,e,i,o){return n.anchor?n.anchor:n.deriveAnchor(t,e,i,o)}function s(t,e,i,o){return n.deriveEndpoint?n.deriveEndpoint(t,e,i,o):n.endpoint?n.endpoint:i.type}e._jsPlumbList=i;var r=function(n){for(var i=t.getSelector(e,".jtk-managed"),r=t.getId(e),a=0;a<i.length;a++){if(i[a].offsetTop<e.scrollTop)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("top",0,n.endpoints[0],n)},function(){return o("top",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("top",1,n.endpoints[1],n)},function(){return o("top",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a].offsetTop+i[a].offsetHeight>e.scrollTop+e.offsetHeight)i[a]._jsPlumbProxies||(i[a]._jsPlumbProxies=i[a]._jsPlumbProxies||[],t.select({source:i[a]}).each(function(n){t.proxyConnection(n,0,e,r,function(){return s("bottom",0,n.endpoints[0],n)},function(){return o("bottom",0,n.endpoints[0],n)}),i[a]._jsPlumbProxies.push([n,0])}),t.select({target:i[a]}).each(function(n){t.proxyConnection(n,1,e,r,function(){return s("bottom",1,n.endpoints[1],n)},function(){return o("bottom",1,n.endpoints[1],n)}),i[a]._jsPlumbProxies.push([n,1])}));else if(i[a]._jsPlumbProxies){for(var l=0;l<i[a]._jsPlumbProxies.length;l++)t.unproxyConnection(i[a]._jsPlumbProxies[l][0],i[a]._jsPlumbProxies[l][1],r);delete i[a]._jsPlumbProxies}t.revalidate(i[a])}!function(e){for(var n=e.parentNode,i=t.getContainer();null!=n&&n!==i;){if(t.hasClass(n,"jtk-managed"))return void t.recalculateOffsets(n);n=n.parentNode}}(e)};t.setAttribute(e,"jtk-scrollable-list","true"),e._jsPlumbScrollHandler=r,t.on(e,"scroll",r),r(),this.destroy=function(){t.off(e,"scroll",r),delete e._jsPlumbScrollHandler;for(var n=t.getSelector(e,".jtk-managed"),i=t.getId(e),o=0;o<n.length;o++)if(n[o]._jsPlumbProxies){for(var s=0;s<n[o]._jsPlumbProxies.length;s++)t.unproxyConnection(n[o]._jsPlumbProxies[s][0],n[o]._jsPlumbProxies[s][1],i);delete n[o]._jsPlumbProxies}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,n=t.jsPlumbUtil,i=function(t){if(t._jsPlumb.paintStyle&&t._jsPlumb.hoverPaintStyle){var e={};d.extend(e,t._jsPlumb.paintStyle),d.extend(e,t._jsPlumb.hoverPaintStyle),delete t._jsPlumb.hoverPaintStyle,e.gradient&&t._jsPlumb.paintStyle.fill&&delete e.gradient,t._jsPlumb.hoverPaintStyle=e}},o=["tap","dbltap","click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","contextmenu"],s=function(t){return null==t?null:t.split(" ")},r=function(t,e,n){for(var i in e)t[i]=n},a=function(t,e,i){if(t.getDefaultType){var o=t.getTypeDescriptor(),s={},a=t.getDefaultType(),l=n.merge({},a);r(s,a,"__default");for(var u=0,c=t._jsPlumb.types.length;u<c;u++){var h=t._jsPlumb.types[u];if("__default"!==h){var d=t._jsPlumb.instance.getType(h,o);if(null!=d){var p=["anchor","anchors","connector","paintStyle","hoverPaintStyle","endpoint","endpoints","connectorOverlays","connectorStyle","connectorHoverStyle","endpointStyle","endpointHoverStyle"],f=[];"override"===d.mergeStrategy?Array.prototype.push.apply(p,["events","overlays","cssClass"]):f.push("cssClass"),l=n.merge(l,d,f,p),r(s,d,h)}}}e&&(l=n.populate(l,e,"_")),t.applyType(l,i,s),i||t.repaint()}},l=t.jsPlumbUIComponent=function(t){n.EventGenerator.apply(this,arguments);var e=arguments,i=this.idPrefix+(new Date).getTime();this._jsPlumb={instance:t._jsPlumb,parameters:t.parameters||{},paintStyle:null,hoverPaintStyle:null,paintStyleInUse:null,hover:!1,beforeDetach:t.beforeDetach,beforeDrop:t.beforeDrop,overlayPlacements:[],hoverClass:t.hoverClass||t._jsPlumb.Defaults.HoverClass,types:[],typeCache:{}},this.cacheTypeItem=function(t,e,n){this._jsPlumb.typeCache[n]=this._jsPlumb.typeCache[n]||{},this._jsPlumb.typeCache[n][t]=e},this.getCachedTypeItem=function(t,e){return this._jsPlumb.typeCache[e]?this._jsPlumb.typeCache[e][t]:null},this.getId=function(){return i};var o=t.overlays||[],s={};if(this.defaultOverlayKeys){for(var r=0;r<this.defaultOverlayKeys.length;r++)Array.prototype.push.apply(o,this._jsPlumb.instance.Defaults[this.defaultOverlayKeys[r]]||[]);for(r=0;r<o.length;r++){var a=d.convertToFullOverlaySpec(o[r]);s[a[1].id]=a}}var l={overlays:s,parameters:t.parameters||{},scope:t.scope||this._jsPlumb.instance.getDefaultScope()};if(this.getDefaultType=function(){return l},this.appendToDefaultType=function(t){for(var e in t)l[e]=t[e]},t.events)for(var u in t.events)this.bind(u,t.events[u]);this.clone=function(){var t=Object.create(this.constructor.prototype);return this.constructor.apply(t,e),t}.bind(this),this.isDetachAllowed=function(t){var e=!0;if(this._jsPlumb.beforeDetach)try{e=this._jsPlumb.beforeDetach(t)}catch(t){n.log("jsPlumb: beforeDetach callback failed",t)}return e},this.isDropAllowed=function(t,e,i,o,s,r,a){var l=this._jsPlumb.instance.checkCondition("beforeDrop",{sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a});if(this._jsPlumb.beforeDrop)try{l=this._jsPlumb.beforeDrop({sourceId:t,targetId:e,scope:i,connection:o,dropEndpoint:s,source:r,target:a})}catch(t){n.log("jsPlumb: beforeDrop callback failed",t)}return l};var c=[];this.setListenerComponent=function(t){for(var e=0;e<c.length;e++)c[e][3]=t}},u=function(t,e){var n=t._jsPlumb.types[e],i=t._jsPlumb.instance.getType(n,t.getTypeDescriptor());null!=i&&i.cssClass&&t.canvas&&t._jsPlumb.instance.removeClass(t.canvas,i.cssClass)};n.extend(t.jsPlumbUIComponent,n.EventGenerator,{getParameter:function(t){return this._jsPlumb.parameters[t]},setParameter:function(t,e){this._jsPlumb.parameters[t]=e},getParameters:function(){return this._jsPlumb.parameters},setParameters:function(t){this._jsPlumb.parameters=t},getClass:function(){return d.getClass(this.canvas)},hasClass:function(t){return d.hasClass(this.canvas,t)},addClass:function(t){d.addClass(this.canvas,t)},removeClass:function(t){d.removeClass(this.canvas,t)},updateClasses:function(t,e){d.updateClasses(this.canvas,t,e)},setType:function(t,e,n){this.clearTypes(),this._jsPlumb.types=s(t)||[],a(this,e,n)},getType:function(){return this._jsPlumb.types},reapplyTypes:function(t,e){a(this,t,e)},hasType:function(t){return-1!==this._jsPlumb.types.indexOf(t)},addType:function(t,e,n){var i=s(t),o=!1;if(null!=i){for(var r=0,l=i.length;r<l;r++)this.hasType(i[r])||(this._jsPlumb.types.push(i[r]),o=!0);o&&a(this,e,n)}},removeType:function(t,e,n){var i=s(t),o=!1,r=function(t){var e=this._jsPlumb.types.indexOf(t);return-1!==e&&(u(this,e),this._jsPlumb.types.splice(e,1),!0)}.bind(this);if(null!=i){for(var l=0,c=i.length;l<c;l++)o=r(i[l])||o;o&&a(this,e,n)}},clearTypes:function(t,e){for(var n=this._jsPlumb.types.length,i=0;i<n;i++)u(this,0),this._jsPlumb.types.splice(0,1);a(this,t,e)},toggleType:function(t,e,n){var i=s(t);if(null!=i){for(var o=0,r=i.length;o<r;o++){var l=this._jsPlumb.types.indexOf(i[o]);-1!==l?(u(this,l),this._jsPlumb.types.splice(l,1)):this._jsPlumb.types.push(i[o])}a(this,e,n)}},applyType:function(t,e){if(this.setPaintStyle(t.paintStyle,e),this.setHoverPaintStyle(t.hoverPaintStyle,e),t.parameters)for(var n in t.parameters)this.setParameter(n,t.parameters[n]);this._jsPlumb.paintStyleInUse=this.getPaintStyle()},setPaintStyle:function(t,e){this._jsPlumb.paintStyle=t,this._jsPlumb.paintStyleInUse=this._jsPlumb.paintStyle,i(this),e||this.repaint()},getPaintStyle:function(){return this._jsPlumb.paintStyle},setHoverPaintStyle:function(t,e){this._jsPlumb.hoverPaintStyle=t,i(this),e||this.repaint()},getHoverPaintStyle:function(){return this._jsPlumb.hoverPaintStyle},destroy:function(t){(t||null==this.typeId)&&(this.cleanupListeners(),this.clone=null,this._jsPlumb=null)},isHover:function(){return this._jsPlumb.hover},setHover:function(t,e,n){if(this._jsPlumb&&!this._jsPlumb.instance.currentlyDragging&&!this._jsPlumb.instance.isHoverSuspended()){this._jsPlumb.hover=t;var i=t?"addClass":"removeClass";null!=this.canvas&&(null!=this._jsPlumb.instance.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.instance.hoverClass),null!=this._jsPlumb.hoverClass&&this._jsPlumb.instance[i](this.canvas,this._jsPlumb.hoverClass)),null!=this._jsPlumb.hoverPaintStyle&&(this._jsPlumb.paintStyleInUse=t?this._jsPlumb.hoverPaintStyle:this._jsPlumb.paintStyle,this._jsPlumb.instance.isSuspendDrawing()||(n=n||jsPlumbUtil.uuid(),this.repaint({timestamp:n,recalc:!1}))),this.getAttachedElements&&!e&&function(t,e,n,i){var o=t.getAttachedElements();if(o)for(var s=0,r=o.length;s<r;s++)i&&i===o[s]||o[s].setHover(e,!0,n)}(this,t,jsPlumbUtil.uuid(),this)}}});var c=0,h=t.jsPlumbInstance=function(e){this.version="2.15.6",this.Defaults={Anchor:"Bottom",Anchors:[null,null],ConnectionsDetachable:!0,ConnectionOverlays:[],Connector:"Bezier",Container:null,DoNotThrowErrors:!1,DragOptions:{},DropOptions:{},Endpoint:"Dot",EndpointOverlays:[],Endpoints:[null,null],EndpointStyle:{fill:"#456"},EndpointStyles:[null,null],EndpointHoverStyle:null,EndpointHoverStyles:[null,null],HoverPaintStyle:null,LabelStyle:{color:"black"},ListStyle:{},LogEnabled:!1,Overlays:[],MaxConnections:1,PaintStyle:{"stroke-width":4,stroke:"#456"},ReattachConnections:!1,RenderMode:"svg",Scope:"jsPlumb_DefaultScope"},e&&d.extend(this.Defaults,e),this.logEnabled=this.Defaults.LogEnabled,this._connectionTypes={},this._endpointTypes={},n.EventGenerator.apply(this);var i=this,s=function(){var t=c+1;return c++,t}(),r=i.bind,a={},u=1,h=function(t){if(null==t)return null;if(3===t.nodeType||8===t.nodeType)return{el:t,text:!0};var e=i.getElement(t);return{el:e,id:n.isString(t)&&null==e?t:B(e)}};for(var p in this.getInstanceIndex=function(){return s},this.setZoom=function(t,e){return u=t,i.fire("zoom",u),e&&i.repaintEverything(),!0},this.getZoom=function(){return u},this.Defaults)a[p]=this.Defaults[p];var f,g=[];this.unbindContainer=function(){if(null!=f&&g.length>0)for(var t=0;t<g.length;t++)i.off(f,g[t][0],g[t][1])},this.setContainer=function(t){this.unbindContainer(),t=this.getElement(t),this.select().each(function(e){e.moveParent(t)}),this.selectEndpoints().each(function(e){e.moveParent(t)});var e=f;f=t,g.length=0;for(var n={endpointclick:"endpointClick",endpointdblclick:"endpointDblClick"},s=function(t,e,o){var s=e.srcElement||e.target,r=(s&&s.parentNode?s.parentNode._jsPlumb:null)||(s?s._jsPlumb:null)||(s&&s.parentNode&&s.parentNode.parentNode?s.parentNode.parentNode._jsPlumb:null);if(r){r.fire(t,r,e);var a=o&&n[o+t]||t;i.fire(a,r.component||r,e)}},r=function(t,e,n){g.push([t,n]),i.on(f,t,e,n)},a=function(t){r(t,".jtk-connector",function(e){s(t,e)}),r(t,".jtk-endpoint",function(e){s(t,e,"endpoint")}),r(t,".jtk-overlay",function(e){s(t,e)})},l=0;l<o.length;l++)a(o[l]);for(var u in x){var c=x[u].el;c.parentNode===e&&(e.removeChild(c),f.appendChild(c))}},this.getContainer=function(){return f},this.bind=function(t,e){"ready"===t&&v?e():r.apply(i,[t,e])},i.importDefaults=function(t){for(var e in t)i.Defaults[e]=t[e];return t.Container&&i.setContainer(t.Container),i},i.restoreDefaults=function(){return i.Defaults=d.extend({},a),i};var m=null,v=!1,y=[],b={},P={},x={},C={},_={},j=!1,E=[],S=!1,w=null,D=this.Defaults.Scope,A=1,I=function(){return""+A++},k=function(t,e){f?f.appendChild(t):e?this.getElement(e).appendChild(t):this.appendToRoot(t)}.bind(this),O=function(t,e,n,o){var s={c:[],e:[]};if(!S&&null!=(t=i.getElement(t))){var r=B(t),a=t.querySelectorAll(".jtk-managed");null==n&&(n=jsPlumbUtil.uuid());it({elId:r,offset:e,recalc:!1,timestamp:n});for(var l=0;l<a.length;l++)it({elId:a[l].getAttribute("id"),recalc:!0,timestamp:n});var u=i.router.redraw(r,e,n,null,o);if(Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e),a)for(var c=0;c<a.length;c++)u=i.router.redraw(a[c].getAttribute("id"),null,n,null,o,!0),Array.prototype.push.apply(s.c,u.c),Array.prototype.push.apply(s.e,u.e)}return s},M=function(t){return P[t]},T=function(t,e){var o=d.extend({},t);if(e&&d.extend(o,e),o.source&&(o.source.endpoint?o.sourceEndpoint=o.source:o.source=i.getElement(o.source)),o.target&&(o.target.endpoint?o.targetEndpoint=o.target:o.target=i.getElement(o.target)),t.uuids&&(o.sourceEndpoint=M(t.uuids[0]),o.targetEndpoint=M(t.uuids[1])),o.sourceEndpoint&&o.sourceEndpoint.isFull())n.log(i,"could not add connection; source endpoint is full");else if(o.targetEndpoint&&o.targetEndpoint.isFull())n.log(i,"could not add connection; target endpoint is full");else{if(!o.type&&o.sourceEndpoint&&(o.type=o.sourceEndpoint.connectionType),o.sourceEndpoint&&o.sourceEndpoint.connectorOverlays){o.overlays=o.overlays||[];for(var s=0,r=o.sourceEndpoint.connectorOverlays.length;s<r;s++)o.overlays.push(o.sourceEndpoint.connectorOverlays[s])}o.sourceEndpoint&&o.sourceEndpoint.scope&&(o.scope=o.sourceEndpoint.scope),!o["pointer-events"]&&o.sourceEndpoint&&o.sourceEndpoint.connectorPointerEvents&&(o["pointer-events"]=o.sourceEndpoint.connectorPointerEvents);var a=function(t,e,n){var s=function(t,e){var n=d.extend({},t);for(var i in e)e[i]&&(n[i]=e[i]);return n}(e,{anchor:o.anchors?o.anchors[n]:o.anchor,endpoint:o.endpoints?o.endpoints[n]:o.endpoint,paintStyle:o.endpointStyles?o.endpointStyles[n]:o.endpointStyle,hoverPaintStyle:o.endpointHoverStyles?o.endpointHoverStyles[n]:o.endpointHoverStyle});return i.addEndpoint(t,s)},l=function(t,e,n,i){if(o[t]&&!o[t].endpoint&&!o[t+"Endpoint"]&&!o.newConnection){var s=n[B(o[t])];if(s=s?s[i]:null){if(!s.enabled)return!1;var r=d.extend({},s.def);delete r.label;var l=null!=s.endpoint&&s.endpoint._jsPlumb?s.endpoint:a(o[t],r,e);if(l.isFull())return!1;o[t+"Endpoint"]=l,!o.scope&&r.scope&&(o.scope=r.scope),s.uniqueEndpoint?s.endpoint?l.finalEndpoint=s.endpoint:(s.endpoint=l,l.setDeleteOnEmpty(!1)):l.setDeleteOnEmpty(!0),0===e&&s.def.connectorOverlays&&(o.overlays=o.overlays||[],Array.prototype.push.apply(o.overlays,s.def.connectorOverlays))}}};if(!1!==l("source",0,this.sourceEndpointDefinitions,o.type||"default")&&!1!==l("target",1,this.targetEndpointDefinitions,o.type||"default"))return o.sourceEndpoint&&o.targetEndpoint&&(function(t,e){for(var n=t.scope.split(/\s/),i=e.scope.split(/\s/),o=0;o<n.length;o++)for(var s=0;s<i.length;s++)if(i[s]===n[o])return!0;return!1}(o.sourceEndpoint,o.targetEndpoint)||(o=null)),o}}.bind(i),F=function(t){var e=i.Defaults.ConnectionType||i.getDefaultConnectionType();t._jsPlumb=i,t.newConnection=F,t.newEndpoint=N,t.endpointsByUUID=P,t.endpointsByElement=b,t.finaliseConnection=L,t.id="con_"+I();var n=new e(t);return n.isDetachable()&&(n.endpoints[0].initDraggable("_jsPlumbSource"),n.endpoints[1].initDraggable("_jsPlumbTarget")),n},L=i.finaliseConnection=function(t,e,n,o){if(e=e||{},t.suspendedEndpoint||y.push(t),t.pending=null,t.endpoints[0].isTemporarySource=!1,!1!==o&&i.router.newConnection(t),O(t.source),!e.doNotFireConnectionEvent&&!1!==e.fireEvent){var s={connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]};i.fire("connection",s,n)}},N=function(t,e){var n=i.Defaults.EndpointType||d.Endpoint,o=d.extend({},t);o._jsPlumb=i,o.newConnection=F,o.newEndpoint=N,o.endpointsByUUID=P,o.endpointsByElement=b,o.fireDetachEvent=X,o.elementId=e||B(o.source);var s=new n(o);return s.id="ep_"+I(),nt(o.elementId,o.source),d.headless||i.getDragManager().endpointAdded(o.source,e),s},R=function(t,e,n){var i=b[t];if(i&&i.length)for(var o=0,s=i.length;o<s;o++){for(var r=0,a=i[o].connections.length;r<a;r++){if(e(i[o].connections[r]))return}n&&n(i[o])}},G=function(t,e,n){e="block"===e;var i=null;n&&(i=function(t){t.setVisible(e,!0,!0)});var o=h(t);R(o.id,function(t){if(e&&n){var i=t.sourceId===o.id?1:0;t.endpoints[i].isVisible()&&t.setVisible(!0)}else t.setVisible(e)},i)},B=function(t,e,o){if(n.isString(t))return t;if(null==t)return null;var r=i.getAttribute(t,"id");return r&&"undefined"!==r||(2===arguments.length&&void 0!==arguments[1]?r=e:(1===arguments.length||3===arguments.length&&!arguments[2])&&(r="jsPlumb_"+s+"_"+I()),o||i.setAttribute(t,"id",r)),r};this.setConnectionBeingDragged=function(t){j=t},this.isConnectionBeingDragged=function(){return j},this.getManagedElements=function(){return x},this.connectorClass="jtk-connector",this.connectorOutlineClass="jtk-connector-outline",this.connectedClass="jtk-connected",this.hoverClass="jtk-hover",this.endpointClass="jtk-endpoint",this.endpointConnectedClass="jtk-endpoint-connected",this.endpointFullClass="jtk-endpoint-full",this.endpointDropAllowedClass="jtk-endpoint-drop-allowed",this.endpointDropForbiddenClass="jtk-endpoint-drop-forbidden",this.overlayClass="jtk-overlay",this.draggingClass="jtk-dragging",this.elementDraggingClass="jtk-element-dragging",this.sourceElementDraggingClass="jtk-source-element-dragging",this.targetElementDraggingClass="jtk-target-element-dragging",this.endpointAnchorClassPrefix="jtk-endpoint-anchor",this.hoverSourceClass="jtk-source-hover",this.hoverTargetClass="jtk-target-hover",this.dragSelectClass="jtk-drag-select",this.Anchors={},this.Connectors={svg:{}},this.Endpoints={svg:{}},this.Overlays={svg:{}},this.ConnectorRenderers={},this.SVG="svg",this.addEndpoint=function(t,e,o){o=o||{};var s=d.extend({},o);d.extend(s,e),s.endpoint=s.endpoint||i.Defaults.Endpoint,s.paintStyle=s.paintStyle||i.Defaults.EndpointStyle;for(var r=[],a=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],l=0,u=a.length;l<u;l++){s.source=i.getElement(a[l]),et(s.source);var c=B(s.source),h=N(s,c),p=nt(c,s.source,null,!S).info.o;n.addToList(b,c,h),S||h.paint({anchorLoc:h.anchor.compute({xy:[p.left,p.top],wh:E[c],element:h,timestamp:w,rotation:this.getRotation(c)}),timestamp:w}),r.push(h)}return 1===r.length?r[0]:r},this.addEndpoints=function(t,e,o){for(var s=[],r=0,a=e.length;r<a;r++){var l=i.addEndpoint(t,e[r],o);n.isArray(l)?Array.prototype.push.apply(s,l):s.push(l)}return s},this.animate=function(t,e,o){if(!this.animationSupported)return!1;o=o||{};var s=i.getElement(t),r=B(s),a=d.animEvents.step,l=d.animEvents.complete;o[a]=n.wrap(o[a],function(){i.revalidate(r)}),o[l]=n.wrap(o[l],function(){i.revalidate(r)}),i.doAnimate(s,e,o)},this.checkCondition=function(t,e){var o=i.getListener(t),s=!0;if(o&&o.length>0){var r=Array.prototype.slice.call(arguments,1);try{for(var a=0,l=o.length;a<l;a++)s=s&&o[a].apply(o[a],r)}catch(e){n.log(i,"cannot check condition ["+t+"]"+e)}}return s},this.connect=function(t,e){var i,o=T(t,e);if(o){if(null==o.source&&null==o.sourceEndpoint)return void n.log("Cannot establish connection - source does not exist");if(null==o.target&&null==o.targetEndpoint)return void n.log("Cannot establish connection - target does not exist");et(o.source),i=F(o),L(i,o)}return i};var H=[{el:"source",elId:"sourceId",epDefs:"sourceEndpointDefinitions"},{el:"target",elId:"targetId",epDefs:"targetEndpointDefinitions"}],U=function(t,e,n,i){var o,s,r,a=H[n],l=t[a.elId],u=(t[a.el],t.endpoints[n]),c={index:n,originalSourceId:0===n?l:t.sourceId,newSourceId:t.sourceId,originalTargetId:1===n?l:t.targetId,newTargetId:t.targetId,connection:t};if(e.constructor===d.Endpoint)(o=e).addConnection(t),e=o.element;else if(s=B(e),r=this[a.epDefs][s],s===t[a.elId])o=null;else if(r)for(var h in r){if(!r[h].enabled)return;o=null!=r[h].endpoint&&r[h].endpoint._jsPlumb?r[h].endpoint:this.addEndpoint(e,r[h].def),r[h].uniqueEndpoint&&(r[h].endpoint=o),o.addConnection(t)}else o=t.makeEndpoint(0===n,e,s);return null!=o&&(u.detachFromConnection(t),t.endpoints[n]=o,t[a.el]=o.element,t[a.elId]=o.elementId,c[0===n?"newSourceId":"newTargetId"]=o.elementId,Y(c),i||t.repaint()),c.element=e,c}.bind(this);this.setSource=function(t,e,n){var i=U(t,e,0,n);this.router.sourceOrTargetChanged(i.originalSourceId,i.newSourceId,t,i.el,0)},this.setTarget=function(t,e,n){var i=U(t,e,1,n);this.router.sourceOrTargetChanged(i.originalTargetId,i.newTargetId,t,i.el,1)},this.deleteEndpoint=function(t,e,n){var o="string"==typeof t?P[t]:t;return o&&i.deleteObject({endpoint:o,dontUpdateHover:e,deleteAttachedObjects:n}),i},this.deleteEveryEndpoint=function(){var t=i.setSuspendDrawing(!0);for(var e in b){var n=b[e];if(n&&n.length)for(var o=0,s=n.length;o<s;o++)i.deleteEndpoint(n[o],!0)}b={},x={},P={},C={},_={},i.router.reset();var r=i.getDragManager();return r&&r.reset(),t||i.setSuspendDrawing(!1),i};var X=function(t,e,n){var o=i.Defaults.ConnectionType||i.getDefaultConnectionType(),s=t.constructor===o?{connection:t,source:t.source,target:t.target,sourceId:t.sourceId,targetId:t.targetId,sourceEndpoint:t.endpoints[0],targetEndpoint:t.endpoints[1]}:t;e&&i.fire("connectionDetached",s,n),i.fire("internal.connectionDetached",s,n),i.router.connectionDetached(s)},Y=i.fireMoveEvent=function(t,e){i.fire("connectionMoved",t,e)};this.unregisterEndpoint=function(t){for(var e in t._jsPlumb.uuid&&(P[t._jsPlumb.uuid]=null),i.router.deleteEndpoint(t),b){var n=b[e];if(n){for(var o=[],s=0,r=n.length;s<r;s++)n[s]!==t&&o.push(n[s]);b[e]=o}b[e].length<1&&delete b[e]}};this.deleteConnection=function(t,e){return!(null==t||!(e=e||{}).force&&!n.functionChain(!0,!1,[[t.endpoints[0],"isDetachAllowed",[t]],[t.endpoints[1],"isDetachAllowed",[t]],[t,"isDetachAllowed",[t]],[i,"checkCondition",["beforeDetach",t]]]))&&(t.setHover(!1),X(t,!t.pending&&!1!==e.fireEvent,e.originalEvent),t.endpoints[0].detachFromConnection(t),t.endpoints[1].detachFromConnection(t),n.removeWithFunction(y,function(e){return t.id===e.id}),t.cleanup(),t.destroy(),!0)},this.deleteEveryConnection=function(t){t=t||{};var e=y.length,n=0;return i.batch(function(){for(var o=0;o<e;o++)n+=i.deleteConnection(y[0],t)?1:0}),n},this.deleteConnectionsForElement=function(t,e){e=e||{},t=i.getElement(t);var n=B(t),o=b[n];if(o&&o.length)for(var s=0,r=o.length;s<r;s++)o[s].deleteEveryConnection(e);return i},this.deleteObject=function(t){var e={endpoints:{},connections:{},endpointCount:0,connectionCount:0},o=!1!==t.deleteAttachedObjects,s=function(n){null!=n&&null==e.connections[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.connections[n.id]=n,e.connectionCount++)};for(var r in t.connection?s(t.connection):function(n){if(null!=n&&null==e.endpoints[n.id]&&(t.dontUpdateHover||null==n._jsPlumb||n.setHover(!1),e.endpoints[n.id]=n,e.endpointCount++,o))for(var i=0;i<n.connections.length;i++){var r=n.connections[i];s(r)}}(t.endpoint),e.connections){var a=e.connections[r];if(a._jsPlumb){n.removeWithFunction(y,function(t){return a.id===t.id}),X(a,!1!==t.fireEvent&&!a.pending,t.originalEvent);var l=null==t.deleteAttachedObjects?null:!t.deleteAttachedObjects;a.endpoints[0].detachFromConnection(a,null,l),a.endpoints[1].detachFromConnection(a,null,l),a.cleanup(!0),a.destroy(!0)}}for(var u in e.endpoints){var c=e.endpoints[u];c._jsPlumb&&(i.unregisterEndpoint(c),c.cleanup(!0),c.destroy(!0))}return e};var $=function(t,e,n){return function(){return function(t,e,n,i){for(var o=0,s=t.length;o<s;o++)t[o][e].apply(t[o],n);return i(t)}(t,e,arguments,n)}},z=function(t,e){return function(){return function(t,e,n){for(var i=[],o=0,s=t.length;o<s;o++)i.push([t[o][e].apply(t[o],n),t[o]]);return i}(t,e,arguments)}},W=function(t,e){var n=[];if(t)if("string"==typeof t){if("*"===t)return t;n.push(t)}else if(e)n=t;else if(t.length)for(var i=0,o=t.length;i<o;i++)n.push(h(t[i]).id);else n.push(h(t).id);return n},q=function(t,e,n){return"*"===t||(t.length>0?-1!==t.indexOf(e):!n)};this.getConnections=function(t,e){t?t.constructor===String&&(t={scope:t}):t={};for(var n=t.scope||i.getDefaultScope(),o=W(n,!0),s=W(t.source),r=W(t.target),a=!e&&o.length>1?{}:[],l=function(t,n){if(!e&&o.length>1){var i=a[t];null==i&&(i=a[t]=[]),i.push(n)}else a.push(n)},u=0,c=y.length;u<c;u++){var h=y[u],d=h.proxies&&h.proxies[0]?h.proxies[0].originalEp.elementId:h.sourceId,p=h.proxies&&h.proxies[1]?h.proxies[1].originalEp.elementId:h.targetId;q(o,h.scope)&&q(s,d)&&q(r,p)&&l(h.scope,h)}return a};var V=function(t,e){return function(n){for(var i=0,o=t.length;i<o;i++)n(t[i]);return e(t)}},J=function(t){return function(e){return t[e]}},Z=function(t,e){var n,i,o={length:t.length,each:V(t,e),get:J(t)},s=["setHover","removeAllOverlays","setLabel","addClass","addOverlay","removeOverlay","removeOverlays","showOverlay","hideOverlay","showOverlays","hideOverlays","setPaintStyle","setHoverPaintStyle","setSuspendEvents","setParameter","setParameters","setVisible","repaint","addType","toggleType","removeType","removeClass","setType","bind","unbind"],r=["getLabel","getOverlay","isHover","getParameter","getParameters","getPaintStyle","getHoverPaintStyle","isVisible","hasType","getType","isSuspendEvents"];for(n=0,i=s.length;n<i;n++)o[s[n]]=$(t,s[n],e);for(n=0,i=r.length;n<i;n++)o[r[n]]=z(t,r[n]);return o},K=function(t){var e=Z(t,K);return d.extend(e,{setDetachable:$(t,"setDetachable",K),setReattach:$(t,"setReattach",K),setConnector:$(t,"setConnector",K),delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteConnection(t[e])},isDetachable:z(t,"isDetachable"),isReattach:z(t,"isReattach")})},Q=function(t){var e=Z(t,Q);return d.extend(e,{setEnabled:$(t,"setEnabled",Q),setAnchor:$(t,"setAnchor",Q),isEnabled:z(t,"isEnabled"),deleteEveryConnection:function(){for(var e=0,n=t.length;e<n;e++)t[e].deleteEveryConnection()},delete:function(){for(var e=0,n=t.length;e<n;e++)i.deleteEndpoint(t[e])}})};this.select=function(t){return(t=t||{}).scope=t.scope||"*",K(t.connections||i.getConnections(t,!0))},this.selectEndpoints=function(t){(t=t||{}).scope=t.scope||"*";var e=!t.element&&!t.source&&!t.target,n=e?"*":W(t.element),i=e?"*":W(t.source),o=e?"*":W(t.target),s=W(t.scope,!0),r=[];for(var a in b){var l=q(n,a,!0),u=q(i,a,!0),c="*"!==i,h=q(o,a,!0),d="*"!==o;if(l||u||h)t:for(var p=0,f=b[a].length;p<f;p++){var g=b[a][p];if(q(s,g.scope,!0)){var m=c&&i.length>0&&!g.isSource,v=d&&o.length>0&&!g.isTarget;if(m||v)continue t;r.push(g)}}}return Q(r)},this.getAllConnections=function(){return y},this.getDefaultScope=function(){return D},this.getEndpoint=M,this.getEndpoints=function(t){return b[h(t).id]||[]},this.getDefaultEndpointType=function(){return d.Endpoint},this.getDefaultConnectionType=function(){return d.Connection},this.getId=B,this.draw=O,this.info=h,this.appendElement=k;var tt=!1;this.isHoverSuspended=function(){return tt},this.setHoverSuspended=function(t){tt=t},this.hide=function(t,e){return G(t,"none",e),i},this.idstamp=I;var et=function(t){if(!f&&t){var e=i.getElement(t);e.offsetParent&&i.setContainer(e.offsetParent)}},nt=i.manage=function(t,e,n,o){return x[t]?o&&(x[t].info=it({elId:t,timestamp:w,recalc:!0})):(x[t]={el:e,endpoints:[],connections:[],rotation:0},x[t].info=it({elId:t,timestamp:w}),i.addClass(e,"jtk-managed"),n||i.fire("manageElement",{id:t,info:x[t].info,el:e})),x[t]};this.unmanage=function(t){if(x[t]){var e=x[t].el;i.removeClass(e,"jtk-managed"),delete x[t],i.fire("unmanageElement",{id:t,el:e})}},this.rotate=function(t,e,n){return x[t]&&(x[t].rotation=e,x[t].el.style.transform="rotate("+e+"deg)",x[t].el.style.transformOrigin="center center",!0!==n)?this.revalidate(t):{c:[],e:[]}},this.getRotation=function(t){return x[t]&&x[t].rotation||0};var it=function(t){var e,n=t.timestamp,o=t.recalc,s=t.offset,r=t.elId;return S&&!n&&(n=w),!o&&n&&n===_[r]?{o:t.offset||C[r],s:E[r]}:(o||!s&&null==C[r]?null!=(e=x[r]?x[r].el:null)&&(E[r]=i.getSize(e),C[r]=i.getOffset(e),_[r]=n):(C[r]=s||C[r],null==E[r]&&null!=(e=x[r].el)&&(E[r]=i.getSize(e)),_[r]=n),C[r]&&!C[r].right&&(C[r].right=C[r].left+E[r][0],C[r].bottom=C[r].top+E[r][1],C[r].width=E[r][0],C[r].height=E[r][1],C[r].centerx=C[r].left+C[r].width/2,C[r].centery=C[r].top+C[r].height/2),{o:C[r],s:E[r]})};this.updateOffset=it,this.init=function(){v||(i.Defaults.Container&&i.setContainer(i.Defaults.Container),i.router=new t.jsPlumb.DefaultRouter(i),i.anchorManager=i.router.anchorManager,v=!0,i.fire("ready",i))}.bind(this),this.log=m,this.jsPlumbUIComponent=l,this.makeAnchor=function(){var e,o=function(e,n){if(t.jsPlumb.Anchors[e])return new t.jsPlumb.Anchors[e](n);if(!i.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown anchor type '"+e+"'"}};if(0===arguments.length)return null;var s=arguments[0],r=arguments[1],a=null;if(s.compute&&s.getOrientation)return s;if("string"==typeof s)a=o(arguments[0],{elementId:r,jsPlumbInstance:i});else if(n.isArray(s))if(n.isArray(s[0])||n.isString(s[0]))2===s.length&&n.isObject(s[1])?n.isString(s[0])?(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i},s[1]),a=o(s[0],e)):(e=t.jsPlumb.extend({elementId:r,jsPlumbInstance:i,anchors:s[0]},s[1]),a=new t.jsPlumb.DynamicAnchor(e)):a=new d.DynamicAnchor({anchors:s,selector:null,elementId:r,jsPlumbInstance:i});else{var l={x:s[0],y:s[1],orientation:s.length>=4?[s[2],s[3]]:[0,0],offsets:s.length>=6?[s[4],s[5]]:[0,0],elementId:r,jsPlumbInstance:i,cssClass:7===s.length?s[6]:null};(a=new t.jsPlumb.Anchor(l)).clone=function(){return new t.jsPlumb.Anchor(l)}}return a.id||(a.id="anchor_"+I()),a},this.makeAnchors=function(e,o,s){for(var r=[],a=0,l=e.length;a<l;a++)"string"==typeof e[a]?r.push(t.jsPlumb.Anchors[e[a]]({elementId:o,jsPlumbInstance:s})):n.isArray(e[a])&&r.push(i.makeAnchor(e[a],o,s));return r},this.makeDynamicAnchor=function(e,n){return new t.jsPlumb.DynamicAnchor({anchors:e,selector:n,elementId:null,jsPlumbInstance:i})},this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={};var ot=function(e,o,s,r,a){var u=new l(o),c=o._jsPlumb.EndpointDropHandler({jsPlumb:i,enabled:function(){return e.def.enabled},isFull:function(){var t=i.select({target:e.id}).length;return e.def.maxConnections>0&&t>=e.def.maxConnections},element:e.el,elementId:e.id,isSource:r,isTarget:a,addClass:function(t){i.addClass(e.el,t)},removeClass:function(t){i.removeClass(e.el,t)},onDrop:function(t){t.endpoints[0].anchor.locked=!1},isDropAllowed:function(){return u.isDropAllowed.apply(u,arguments)},isRedrop:function(t){return null!=t.suspendedElement&&null!=t.suspendedEndpoint&&t.suspendedEndpoint.element===e.el},getEndpoint:function(n){var s=e.def.endpoint;if(null==s||null==s._jsPlumb){var r=i.deriveEndpointAndAnchorSpec(n.getType().join(" "),!0),a=r.endpoints?t.jsPlumb.extend(o,{endpoint:e.def.def.endpoint||r.endpoints[1]}):o;r.anchors&&(a=t.jsPlumb.extend(a,{anchor:e.def.def.anchor||r.anchors[1]})),(s=i.addEndpoint(e.el,a))._mtNew=!0}if(o.uniqueEndpoint&&(e.def.endpoint=s),s.setDeleteOnEmpty(!0),n.isDetachable()&&s.initDraggable(),null!=s.anchor.positionFinder){var l=i.getUIPosition(arguments,i.getZoom()),u=i.getOffset(e.el),c=i.getSize(e.el),h=null==l?[0,0]:s.anchor.positionFinder(l,u,c,s.anchor.constructorParams);s.anchor.x=h[0],s.anchor.y=h[1]}return s},maybeCleanup:function(t){t._mtNew&&0===t.connections.length?i.deleteObject({endpoint:t}):delete t._mtNew}}),h=t.jsPlumb.dragEvents.drop;return s.scope=s.scope||o.scope||i.Defaults.Scope,s[h]=n.wrap(s[h],c,!0),s.rank=o.rank||0,a&&(s[t.jsPlumb.dragEvents.over]=function(){return!0}),!1===o.allowLoopback&&(s.canDrop=function(t){return t.getDragElement()._jsPlumbRelatedElement!==e.el}),i.initDroppable(e.el,s,"internal"),c};this.makeTarget=function(e,n,o){var s=t.jsPlumb.extend({_jsPlumb:this},o);t.jsPlumb.extend(s,n);for(var r=s.maxConnections||-1,a=function(e){var n=h(e),o=n.id,a=t.jsPlumb.extend({},s.dropOptions||{}),l=s.connectionType||"default";this.targetEndpointDefinitions[o]=this.targetEndpointDefinitions[o]||{},et(o),n.el._isJsPlumbGroup&&null==a.rank&&(a.rank=-1);var u={def:t.jsPlumb.extend({},s),uniqueEndpoint:s.uniqueEndpoint,maxConnections:r,enabled:!0};s.createEndpoint&&(u.uniqueEndpoint=!0,u.endpoint=i.addEndpoint(e,u.def),u.endpoint.setDeleteOnEmpty(!1)),n.def=u,this.targetEndpointDefinitions[o][l]=u,ot(n,s,a,!0===s.isSource,!0),n.el._katavorioDrop[n.el._katavorioDrop.length-1].targetDef=u}.bind(this),l=e.length&&e.constructor!==String?e:[e],u=0,c=l.length;u<c;u++)a(l[u]);return this},this.unmakeTarget=function(t,e){var n=h(t);return i.destroyDroppable(n.el,"internal"),e||delete this.targetEndpointDefinitions[n.id],this},this.makeSource=function(e,o,s){var r=t.jsPlumb.extend({_jsPlumb:this},s);t.jsPlumb.extend(r,o);var a=r.connectionType||"default",l=i.deriveEndpointAndAnchorSpec(a);r.endpoint=r.endpoint||l.endpoints[0],r.anchor=r.anchor||l.anchors[0];for(var c=r.maxConnections||-1,d=r.onMaxConnections,p=function(o){var s=o.id,l=this.getElement(o.el);this.sourceEndpointDefinitions[s]=this.sourceEndpointDefinitions[s]||{},et(s);var h={def:t.jsPlumb.extend({},r),uniqueEndpoint:r.uniqueEndpoint,maxConnections:c,enabled:!0};r.createEndpoint&&(h.uniqueEndpoint=!0,h.endpoint=i.addEndpoint(e,h.def),h.endpoint.setDeleteOnEmpty(!1)),this.sourceEndpointDefinitions[s][a]=h,o.def=h;var p=t.jsPlumb.dragEvents.stop,f=t.jsPlumb.dragEvents.drag,g=t.jsPlumb.extend({},r.dragOptions||{}),m=g.drag,v=g.stop,y=null,b=!1;g.scope=g.scope||r.scope,g[f]=n.wrap(g[f],function(){m&&m.apply(this,arguments),b=!1}),g[p]=n.wrap(g[p],function(){if(v&&v.apply(this,arguments),this.currentlyDragging=!1,null!=y._jsPlumb){var t=r.anchor||this.Defaults.Anchor,e=y.anchor,n=y.connections[0],o=this.makeAnchor(t,s,this),a=y.element;if(null!=o.positionFinder){var l=i.getOffset(a),u=this.getSize(a),c={left:l.left+e.x*u[0],top:l.top+e.y*u[1]},h=o.positionFinder(c,l,u,o.constructorParams);o.x=h[0],o.y=h[1]}y.setAnchor(o,!0),y.repaint(),this.repaint(y.elementId),null!=n&&this.repaint(n.targetId)}}.bind(this));var P=function(e){if(3!==e.which&&2!==e.button){s=this.getId(this.getElement(o.el));var h=this.sourceEndpointDefinitions[s][a];if(h.enabled){if(r.filter)if(!1===(n.isString(r.filter)?function(t,e,n,i,o){for(var s=t.target||t.srcElement,r=!1,a=i.getSelector(e,n),l=0;l<a.length;l++)if(a[l]===s){r=!0;break}return o?!r:r}(e,o.el,r.filter,this,r.filterExclude):r.filter(e,o.el)))return;var p=this.select({source:s}).length;if(h.maxConnections>=0&&p>=h.maxConnections)return d&&d({element:o.el,maxConnections:c},e),!1;var f=t.jsPlumb.getPositionOnElement(e,l,u),m={};t.jsPlumb.extend(m,h.def),m.isTemporarySource=!0,m.anchor=[f[0],f[1],0,0],m.dragOptions=g,h.def.scope&&(m.scope=h.def.scope),y=this.addEndpoint(s,m),b=!0,y.setDeleteOnEmpty(!0),h.uniqueEndpoint&&(h.endpoint?y.finalEndpoint=h.endpoint:(h.endpoint=y,y.setDeleteOnEmpty(!1)));var v=function(){i.off(y.canvas,"mouseup",v),i.off(o.el,"mouseup",v),b&&(b=!1,i.deleteEndpoint(y))};i.on(y.canvas,"mouseup",v),i.on(o.el,"mouseup",v);var P={};if(h.def.extract)for(var x in h.def.extract){var C=(e.srcElement||e.target).getAttribute(x);C&&(P[h.def.extract[x]]=C)}i.trigger(y.canvas,"mousedown",e,P),n.consume(e)}}}.bind(this);this.on(o.el,"mousedown",P),h.trigger=P,r.filter&&(n.isString(r.filter)||n.isFunction(r.filter))&&i.setDragFilter(o.el,r.filter);var x=t.jsPlumb.extend({},r.dropOptions||{});ot(o,r,x,!0,!0===r.isTarget)}.bind(this),f=e.length&&e.constructor!==String?e:[e],g=0,m=f.length;g<m;g++)p(h(f[g]));return this},this.unmakeSource=function(t,e,n){var o=h(t);i.destroyDroppable(o.el,"internal");var s=this.sourceEndpointDefinitions[o.id];if(s)for(var r in s)if(null==e||e===r){var a=s[r].trigger;a&&i.off(o.el,"mousedown",a),n||delete this.sourceEndpointDefinitions[o.id][r]}return this},this.unmakeEverySource=function(){for(var t in this.sourceEndpointDefinitions)i.unmakeSource(t,null,!0);return this.sourceEndpointDefinitions={},this};var st=function(t,e,i){e=n.isArray(e)?e:[e];var o=B(t);i=i||"default";for(var s=0;s<e.length;s++){var r=this[e[s]][o];if(r&&r[i])return r[i].def.scope||this.Defaults.Scope}}.bind(this),rt=function(t,e,i,o){i=n.isArray(i)?i:[i];var s=B(t);o=o||"default";for(var r=0;r<i.length;r++){var a=this[i[r]][s];a&&a[o]&&(a[o].def.scope=e)}}.bind(this);this.getScope=function(t,e){return st(t,["sourceEndpointDefinitions","targetEndpointDefinitions"])},this.getSourceScope=function(t){return st(t,"sourceEndpointDefinitions")},this.getTargetScope=function(t){return st(t,"targetEndpointDefinitions")},this.setScope=function(t,e,n){this.setSourceScope(t,e,n),this.setTargetScope(t,e,n)},this.setSourceScope=function(t,e,n){rt(t,e,"sourceEndpointDefinitions",n),this.setDragScope(t,e)},this.setTargetScope=function(t,e,n){rt(t,e,"targetEndpointDefinitions",n),this.setDropScope(t,e)},this.unmakeEveryTarget=function(){for(var t in this.targetEndpointDefinitions)i.unmakeTarget(t,!0);return this.targetEndpointDefinitions={},this};var at=function(t,e,o,s,r){var a,l,u,c="source"===t?this.sourceEndpointDefinitions:this.targetEndpointDefinitions;if(r=r||"default",e.length&&!n.isString(e)){a=[];for(var d=0,p=e.length;d<p;d++)c[(l=h(e[d])).id]&&c[l.id][r]&&(a[d]=c[l.id][r].enabled,u=s?!a[d]:o,c[l.id][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}else{var f=(l=h(e)).id;c[f]&&c[f][r]&&(a=c[f][r].enabled,u=s?!a:o,c[f][r].enabled=u,i[u?"removeClass":"addClass"](l.el,"jtk-"+t+"-disabled"))}return a}.bind(this),lt=function(t,e){if(null!=t){if(n.isString(t)||!t.length)return e.apply(this,[t]);if(t.length)return e.apply(this,[t[0]])}}.bind(this);this.toggleSourceEnabled=function(t,e){return at("source",t,null,!0,e),this.isSourceEnabled(t,e)},this.setSourceEnabled=function(t,e,n){return at("source",t,e,null,n)},this.isSource=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isSourceEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.sourceEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.toggleTargetEnabled=function(t,e){return at("target",t,null,!0,e),this.isTargetEnabled(t,e)},this.isTarget=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return null!=n&&null!=n[e]}.bind(this))},this.isTargetEnabled=function(t,e){return e=e||"default",lt(t,function(t){var n=this.targetEndpointDefinitions[h(t).id];return n&&n[e]&&!0===n[e].enabled}.bind(this))},this.setTargetEnabled=function(t,e,n){return at("target",t,e,null,n)},this.ready=function(t){i.bind("ready",t)};this.repaint=function(t,e,n){return function(t,e){if("object"==typeof t&&t.length)for(var n=0,o=t.length;n<o;n++)e(t[n]);else e(t);return i}(t,function(t){O(t,e,n)})},this.revalidate=function(t,e,n){var o=n?t:i.getId(t);i.updateOffset({elId:o,recalc:!0,timestamp:e});var s=i.getDragManager();return s&&s.updateOffsets(o),O(t,null,e)},this.repaintEverything=function(){var t,e=jsPlumbUtil.uuid();for(t in b)i.updateOffset({elId:t,recalc:!0,timestamp:e});for(t in b)O(t,null,e);return this},this.removeAllEndpoints=function(t,e,n){n=n||[];var o=function(t){var s,r,a=h(t),l=b[a.id];if(l)for(n.push(a),s=0,r=l.length;s<r;s++)i.deleteEndpoint(l[s],!1);if(delete b[a.id],e&&a.el&&3!==a.el.nodeType&&8!==a.el.nodeType)for(s=0,r=a.el.childNodes.length;s<r;s++)o(a.el.childNodes[s])};return o(t),this};var ut=function(t,e){i.removeAllEndpoints(t.id,!0,e);for(var n=i.getDragManager(),o=function(t){n&&n.elementRemoved(t.id),i.router.elementRemoved(t.id),i.isSource(t.el)&&i.unmakeSource(t.el),i.isTarget(t.el)&&i.unmakeTarget(t.el),i.destroyDraggable(t.el),i.destroyDroppable(t.el),delete i.floatingConnections[t.id],delete x[t.id],delete C[t.id],t.el&&(i.removeElement(t.el),t.el._jsPlumb=null)},s=1;s<e.length;s++)o(e[s]);o(t)};this.remove=function(t,e){var n=h(t),o=[];return n.text&&n.el.parentNode?n.el.parentNode.removeChild(n.el):n.id&&i.batch(function(){ut(n,o)},!0===e),i},this.empty=function(t,e){var n=[],o=function(t,e){var i=h(t);if(i.text)i.el.parentNode.removeChild(i.el);else if(i.el){for(;i.el.childNodes.length>0;)o(i.el.childNodes[0]);e||ut(i,n)}};return i.batch(function(){o(t,!0)},!1===e),i},this.reset=function(t){i.silently(function(){tt=!1,i.removeAllGroups(),i.removeGroupManager(),i.deleteEveryEndpoint(),t||i.unbind(),this.targetEndpointDefinitions={},this.sourceEndpointDefinitions={},y.length=0,this.doReset&&this.doReset()}.bind(this))},this.destroy=function(){this.reset(),f=null,g=null};var ct=function(t){t.canvas&&t.canvas.parentNode&&t.canvas.parentNode.removeChild(t.canvas),t.cleanup(),t.destroy()};this.clear=function(){i.select().each(ct),i.selectEndpoints().each(ct),b={},P={}},this.setDefaultScope=function(t){return D=t,i},this.deriveEndpointAndAnchorSpec=function(t,e){for(var n=((e?"":"default ")+t).split(/[\s]/),o=null,s=null,r=null,a=null,l=0;l<n.length;l++){var u=i.getType(n[l],"connection");u&&(u.endpoints&&(o=u.endpoints),u.endpoint&&(s=u.endpoint),u.anchors&&(a=u.anchors),u.anchor&&(r=u.anchor))}return{endpoints:o||[s,s],anchors:a||[r,r]}},this.setId=function(t,e,i){var o;n.isString(t)?o=t:(t=this.getElement(t),o=this.getId(t));var s=this.getConnections({source:o,scope:"*"},!0),r=this.getConnections({target:o,scope:"*"},!0);e=""+e,i?t=this.getElement(e):(t=this.getElement(o),this.setAttribute(t,"id",e)),b[e]=b[o]||[];for(var a=0,l=b[e].length;a<l;a++)b[e][a].setElementId(e),b[e][a].setReferenceElement(t);delete b[o],this.sourceEndpointDefinitions[e]=this.sourceEndpointDefinitions[o],delete this.sourceEndpointDefinitions[o],this.targetEndpointDefinitions[e]=this.targetEndpointDefinitions[o],delete this.targetEndpointDefinitions[o],this.router.changeId(o,e);var u=this.getDragManager();u&&u.changeId(o,e),x[e]=x[o],delete x[o];var c=function(n,i,o){for(var s=0,r=n.length;s<r;s++)n[s].endpoints[i].setElementId(e),n[s].endpoints[i].setReferenceElement(t),n[s][o+"Id"]=e,n[s][o]=t};c(s,0,"source"),c(r,1,"target"),this.repaint(e)},this.setDebugLog=function(t){m=t},this.setSuspendDrawing=function(t,e){var n=S;return S=t,w=t?(new Date).getTime():null,e&&this.repaintEverything(),n},this.isSuspendDrawing=function(){return S},this.getSuspendedAt=function(){return w},this.batch=function(t,e){var i=this.isSuspendDrawing();i||this.setSuspendDrawing(!0);try{t()}catch(t){n.log("Function run while suspended failed",t)}i||this.setSuspendDrawing(!1,!e)},this.doWhileSuspended=this.batch,this.getCachedData=function(t){var e=C[t];return e?{o:e,s:E[t]}:it({elId:t})},this.show=function(t,e){return G(t,"block",e),i},this.toggleVisible=function(t,e){var n=null;e&&(n=function(t){var e=t.isVisible();t.setVisible(!e)}),R(t,function(t){var e=t.isVisible();t.setVisible(!e)},n)},this.addListener=this.bind;var ht=[];this.registerFloatingConnection=function(t,e,i){ht[t.id]=e,n.addToList(b,t.id,i)},this.getFloatingConnectionFor=function(t){return ht[t]},this.listManager=new t.jsPlumbListManager(this,this.Defaults.ListStyle)};n.extend(t.jsPlumbInstance,n.EventGenerator,{setAttribute:function(t,e,n){this.setAttribute(t,e,n)},getAttribute:function(e,n){return this.getAttribute(t.jsPlumb.getElement(e),n)},convertToFullOverlaySpec:function(t){return n.isString(t)&&(t=[t,{}]),t[1].id=t[1].id||n.uuid(),t},registerConnectionType:function(e,n){if(this._connectionTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._connectionTypes[e].overlays=i}},registerConnectionTypes:function(t){for(var e in t)this.registerConnectionType(e,t[e])},registerEndpointType:function(e,n){if(this._endpointTypes[e]=t.jsPlumb.extend({},n),n.overlays){for(var i={},o=0;o<n.overlays.length;o++){var s=this.convertToFullOverlaySpec(n.overlays[o]);i[s[1].id]=s}this._endpointTypes[e].overlays=i}},registerEndpointTypes:function(t){for(var e in t)this.registerEndpointType(e,t[e])},getType:function(t,e){return"connection"===e?this._connectionTypes[t]:this._endpointTypes[t]},setIdChanged:function(t,e){this.setId(t,e,!0)},setParent:function(t,e){var n=this.getElement(t),i=this.getId(n),o=this.getElement(e),s=this.getId(o),r=this.getDragManager();n.parentNode.removeChild(n),o.appendChild(n),r&&r.setParent(n,i,o,s)},extend:function(t,e,n){var i;if(n)for(i=0;i<n.length;i++)t[n[i]]=e[n[i]];else for(i in e)t[i]=e[i];return t},floatingConnections:{},getFloatingAnchorIndex:function(t){return t.endpoints[0].isFloating()?0:t.endpoints[1].isFloating()?1:-1},proxyConnection:function(t,e,n,i,o,s){var r,a=t.endpoints[e].elementId,l=t.endpoints[e];t.proxies=t.proxies||[],(r=t.proxies[e]?t.proxies[e].ep:this.addEndpoint(n,{endpoint:o(t,e),anchor:s(t,e),parameters:{isProxyEndpoint:!0}})).setDeleteOnEmpty(!0),t.proxies[e]={ep:r,originalEp:l},0===e?this.router.sourceOrTargetChanged(a,i,t,n,0):this.router.sourceOrTargetChanged(a,i,t,n,1),l.detachFromConnection(t,null,!0),r.connections=[t],t.endpoints[e]=r,l.setVisible(!1),t.setVisible(!0),this.revalidate(n)},unproxyConnection:function(t,e,n){if(null!=t._jsPlumb&&null!=t.proxies&&null!=t.proxies[e]){var i=t.proxies[e].originalEp.element,o=t.proxies[e].originalEp.elementId;t.endpoints[e]=t.proxies[e].originalEp,0===e?this.router.sourceOrTargetChanged(n,o,t,i,0):this.router.sourceOrTargetChanged(n,o,t,i,1),t.proxies[e].ep.detachFromConnection(t,null),t.proxies[e].originalEp.addConnection(t),t.isVisible()&&t.proxies[e].originalEp.setVisible(!0),delete t.proxies[e]}}});var d=new h;t.jsPlumb=d,d.getInstance=function(t,e){var n=new h(t);if(e)for(var i in e)n[i]=e[i];return n.init(),n},d.each=function(t,e){if(null!=t)if("string"==typeof t)e(d.getElement(t));else if(null!=t.length)for(var n=0;n<t.length;n++)e(d.getElement(t[n]));else e(t)},e.jsPlumb=d}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil;e.OverlayCapableJsPlumbUIComponent=function(e){t.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.overlays={},this._jsPlumb.overlayPositions={},e.label&&(this.getDefaultType().overlays.__label=["Label",{label:e.label,location:e.labelLocation||this.defaultLabelLocation||.5,labelStyle:e.labelStyle||this._jsPlumb.instance.Defaults.LabelStyle,id:"__label"}]),this.setListenerComponent=function(t){if(this._jsPlumb)for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].setListenerComponent(t)}},e.OverlayCapableJsPlumbUIComponent.applyType=function(t,e){if(e.overlays){var n,i={};for(n in e.overlays){var o=t._jsPlumb.overlays[e.overlays[n][1].id];if(o)o.updateFrom(e.overlays[n][1]),i[e.overlays[n][1].id]=!0,o.reattach(t._jsPlumb.instance,t);else{var s=t.getCachedTypeItem("overlay",e.overlays[n][1].id);null!=s?(s.reattach(t._jsPlumb.instance,t),s.setVisible(!0),s.updateFrom(e.overlays[n][1]),t._jsPlumb.overlays[s.id]=s):s=t.addOverlay(e.overlays[n],!0),i[s.id]=!0}}for(n in t._jsPlumb.overlays)null==i[t._jsPlumb.overlays[n].id]&&t.removeOverlay(t._jsPlumb.overlays[n].id,!0)}},n.extend(e.OverlayCapableJsPlumbUIComponent,t.jsPlumbUIComponent,{setHover:function(t,e){if(this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged())for(var n in this._jsPlumb.overlays)this._jsPlumb.overlays[n][t?"addClass":"removeClass"](this._jsPlumb.instance.hoverClass)},addOverlay:function(t,i){var o=function(t,i){var o=null;if(n.isArray(i)){var s=i[0],r=e.extend({component:t,_jsPlumb:t._jsPlumb.instance},i[1]);3===i.length&&e.extend(r,i[2]),o=new(e.Overlays[t._jsPlumb.instance.getRenderMode()][s])(r)}else o=i.constructor===String?new(e.Overlays[t._jsPlumb.instance.getRenderMode()][i])({component:t,_jsPlumb:t._jsPlumb.instance}):i;return o.id=o.id||n.uuid(),t.cacheTypeItem("overlay",o,o.id),t._jsPlumb.overlays[o.id]=o,o}(this,t);if(this.getData&&"Label"===o.type&&n.isArray(t)){var s=this.getData(),r=t[1];if(s){var a=r.labelLocationAttribute||"labelLocation",l=s?s[a]:null;l&&(o.loc=l)}}return i||this.repaint(),o},getOverlay:function(t){return this._jsPlumb.overlays[t]},getOverlays:function(){return this._jsPlumb.overlays},hideOverlay:function(t){var e=this.getOverlay(t);e&&e.hide()},hideOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].hide()},showOverlay:function(t){var e=this.getOverlay(t);e&&e.show()},showOverlays:function(){for(var t in this._jsPlumb.overlays)this._jsPlumb.overlays[t].show()},removeAllOverlays:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup&&this._jsPlumb.overlays[e].cleanup();this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null,this._jsPlumb.overlayPlacements={},t||this.repaint()},removeOverlay:function(t,e){var n=this._jsPlumb.overlays[t];n&&(n.setVisible(!1),!e&&n.cleanup&&n.cleanup(),delete this._jsPlumb.overlays[t],this._jsPlumb.overlayPositions&&delete this._jsPlumb.overlayPositions[t],this._jsPlumb.overlayPlacements&&delete this._jsPlumb.overlayPlacements[t])},removeOverlays:function(){for(var t=0,e=arguments.length;t<e;t++)this.removeOverlay(arguments[t])},moveParent:function(t){if(this.bgCanvas&&(this.bgCanvas.parentNode.removeChild(this.bgCanvas),t.appendChild(this.bgCanvas)),this.canvas&&this.canvas.parentNode)for(var e in this.canvas.parentNode.removeChild(this.canvas),t.appendChild(this.canvas),this._jsPlumb.overlays)if(this._jsPlumb.overlays[e].isAppendedAtTopLevel){var n=this._jsPlumb.overlays[e].getElement();n.parentNode.removeChild(n),t.appendChild(n)}},getLabel:function(){var t=this.getOverlay("__label");return null!=t?t.getLabel():null},getLabelOverlay:function(){return this.getOverlay("__label")},setLabel:function(t){var n=this.getOverlay("__label");n?t.constructor===String||t.constructor===Function?n.setLabel(t):(t.label&&n.setLabel(t.label),t.location&&n.setLocation(t.location)):(n=function(t,n){var i={cssClass:n.cssClass,labelStyle:t.labelStyle,id:"__label",component:t,_jsPlumb:t._jsPlumb.instance},o=e.extend(i,n);return new(e.Overlays[t._jsPlumb.instance.getRenderMode()].Label)(o)}(this,t.constructor===String||t.constructor===Function?{label:t}:t),this._jsPlumb.overlays.__label=n);this._jsPlumb.instance.isSuspendDrawing()||this.repaint()},cleanup:function(t){for(var e in this._jsPlumb.overlays)this._jsPlumb.overlays[e].cleanup(t),this._jsPlumb.overlays[e].destroy(t);t&&(this._jsPlumb.overlays={},this._jsPlumb.overlayPositions=null)},setVisible:function(t){this[t?"showOverlays":"hideOverlays"]()},setAbsoluteOverlayPosition:function(t,e){this._jsPlumb.overlayPositions[t.id]=e},getAbsoluteOverlayPosition:function(t){return this._jsPlumb.overlayPositions?this._jsPlumb.overlayPositions[t.id]:null},_clazzManip:function(t,e,n){if(!n)for(var i in this._jsPlumb.overlays)this._jsPlumb.overlays[i][t+"Class"](e)},addClass:function(t,e){this._clazzManip("add",t,e)},removeClass:function(t,e){this._clazzManip("remove",t,e)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=["connectorStyle","connectorHoverStyle","connectorOverlays","connector","connectionType","connectorClass","connectorHoverClass"];t.Endpoint=function(i){var o=i._jsPlumb,s=i.newConnection,r=i.newEndpoint;this.idPrefix="_jsplumb_e_",this.defaultLabelLocation=[.5,.5],this.defaultOverlayKeys=["Overlays","EndpointOverlays"],t.OverlayCapableJsPlumbUIComponent.apply(this,arguments),this.appendToDefaultType({connectionType:i.connectionType,maxConnections:null==i.maxConnections?this._jsPlumb.instance.Defaults.MaxConnections:i.maxConnections,paintStyle:i.endpointStyle||i.paintStyle||i.style||this._jsPlumb.instance.Defaults.EndpointStyle||t.Defaults.EndpointStyle,hoverPaintStyle:i.endpointHoverStyle||i.hoverPaintStyle||this._jsPlumb.instance.Defaults.EndpointHoverStyle||t.Defaults.EndpointHoverStyle,connectorStyle:i.connectorStyle,connectorHoverStyle:i.connectorHoverStyle,connectorClass:i.connectorClass,connectorHoverClass:i.connectorHoverClass,connectorOverlays:i.connectorOverlays,connector:i.connector,connectorTooltip:i.connectorTooltip}),this._jsPlumb.enabled=!(!1===i.enabled),this._jsPlumb.visible=!0,this.element=t.getElement(i.source),this._jsPlumb.uuid=i.uuid,this._jsPlumb.floatingEndpoint=null,this._jsPlumb.uuid&&(i.endpointsByUUID[this._jsPlumb.uuid]=this),this.elementId=i.elementId,this.dragProxy=i.dragProxy,this._jsPlumb.connectionCost=i.connectionCost,this._jsPlumb.connectionsDirected=i.connectionsDirected,this._jsPlumb.currentAnchorClass="",this._jsPlumb.events={};var a=!0===i.deleteOnEmpty;this.setDeleteOnEmpty=function(t){a=t};var l=function(){var e=o.endpointAnchorClassPrefix+"-"+this._jsPlumb.currentAnchorClass;this._jsPlumb.currentAnchorClass=this.anchor.getCssClass();var n=o.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");this.removeClass(e),this.addClass(n),t.updateClasses(this.element,n,e)}.bind(this);this.prepareAnchor=function(t){var e=this._jsPlumb.instance.makeAnchor(t,this.elementId,o);return e.bind("anchorChanged",function(t){this.fire("anchorChanged",{endpoint:this,anchor:t}),l()}.bind(this)),e},this.setPreparedAnchor=function(t,e){return this._jsPlumb.instance.continuousAnchorFactory.clear(this.elementId),this.anchor=t,l(),e||this._jsPlumb.instance.repaint(this.elementId),this},this.setAnchor=function(t,e){var n=this.prepareAnchor(t);return this.setPreparedAnchor(n,e),this};var u=function(t){if(this.connections.length>0)for(var e=0;e<this.connections.length;e++)this.connections[e].setHover(t,!1);else this.setHover(t)}.bind(this);this.bind("mouseover",function(){u(!0)}),this.bind("mouseout",function(){u(!1)}),i._transient||this._jsPlumb.instance.router.addEndpoint(this,this.elementId),this.prepareEndpoint=function(n,s){var r,a=function(e,n){var i=o.getRenderMode();if(t.Endpoints[i][e])return new t.Endpoints[i][e](n);if(!o.Defaults.DoNotThrowErrors)throw{msg:"jsPlumb: unknown endpoint type '"+e+"'"}},l={_jsPlumb:this._jsPlumb.instance,cssClass:i.cssClass,container:i.container,tooltip:i.tooltip,connectorTooltip:i.connectorTooltip,endpoint:this};return e.isString(n)?r=a(n,l):e.isArray(n)?(l=e.merge(n[1],l),r=a(n[0],l)):r=n.clone(),r.clone=function(){return e.isString(n)?a(n,l):e.isArray(n)?(l=e.merge(n[1],l),a(n[0],l)):void 0}.bind(this),r.typeId=s,r},this.setEndpoint=function(t,e){var n=this.prepareEndpoint(t);this.setPreparedEndpoint(n,!0)},this.setPreparedEndpoint=function(t,e){null!=this.endpoint&&(this.endpoint.cleanup(),this.endpoint.destroy()),this.endpoint=t,this.type=this.endpoint.type,this.canvas=this.endpoint.canvas},t.extend(this,i,n),this.isSource=i.isSource||!1,this.isTemporarySource=i.isTemporarySource||!1,this.isTarget=i.isTarget||!1,this.connections=i.connections||[],this.connectorPointerEvents=i["connector-pointer-events"],this.scope=i.scope||o.getDefaultScope(),this.timestamp=null,this.reattachConnections=i.reattach||o.Defaults.ReattachConnections,this.connectionsDetachable=o.Defaults.ConnectionsDetachable,!1!==i.connectionsDetachable&&!1!==i.detachable||(this.connectionsDetachable=!1),this.dragAllowedWhenFull=!1!==i.dragAllowedWhenFull,i.onMaxConnections&&this.bind("maxConnections",i.onMaxConnections),this.addConnection=function(t){this.connections.push(t),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)},this.detachFromConnection=function(t,e,n){(e=null==e?this.connections.indexOf(t):e)>=0&&(this.connections.splice(e,1),this[(this.connections.length>0?"add":"remove")+"Class"](o.endpointConnectedClass),this[(this.isFull()?"add":"remove")+"Class"](o.endpointFullClass)),!n&&a&&0===this.connections.length&&o.deleteObject({endpoint:this,fireEvent:!1,deleteAttachedObjects:!0!==n})},this.deleteEveryConnection=function(t){for(var e=this.connections.length,n=0;n<e;n++)o.deleteConnection(this.connections[0],t)},this.detachFrom=function(t,e,n){for(var i=[],s=0;s<this.connections.length;s++)this.connections[s].endpoints[1]!==t&&this.connections[s].endpoints[0]!==t||i.push(this.connections[s]);for(var r=0,a=i.length;r<a;r++)o.deleteConnection(i[0]);return this},this.getElement=function(){return this.element},this.setElement=function(n){var s=this._jsPlumb.instance.getId(n),r=this.elementId;return e.removeWithFunction(i.endpointsByElement[this.elementId],function(t){return t.id===this.id}.bind(this)),this.element=t.getElement(n),this.elementId=o.getId(this.element),o.router.rehomeEndpoint(this,r,this.element),o.dragManager.endpointAdded(this.element),e.addToList(i.endpointsByElement,s,this),this},this.makeInPlaceCopy=function(){var t=this.anchor.getCurrentLocation({element:this}),e=this.anchor.getOrientation(this),n=this.anchor.getCssClass(),o={bind:function(){},compute:function(){return[t[0],t[1]]},getCurrentLocation:function(){return[t[0],t[1]]},getOrientation:function(){return e},getCssClass:function(){return n}};return r({dropOptions:i.dropOptions,anchor:o,source:this.element,paintStyle:this.getPaintStyle(),endpoint:i.hideOnDrag?"Blank":this.endpoint,_transient:!0,scope:this.scope,reference:this})},this.connectorSelector=function(){return this.connections[0]},this.setStyle=this.setPaintStyle,this.paint=function(t){var e=(t=t||{}).timestamp,n=!(!1===t.recalc);if(!e||this.timestamp!==e){var i=o.updateOffset({elId:this.elementId,timestamp:e}),s=t.offset?t.offset.o:i.o;if(null!=s){var r=t.anchorPoint,a=t.connectorPaintStyle;if(null==r){var l=t.dimensions||i.s,u={xy:[s.left,s.top],wh:l,element:this,timestamp:e};if(n&&this.anchor.isDynamic&&this.connections.length>0){var c=function(t,e){var n=0;if(null!=e)for(var i=0;i<t.connections.length;i++)if(t.connections[i].sourceId===e||t.connections[i].targetId===e){n=i;break}return t.connections[n]}(this,t.elementWithPrecedence),h=c.endpoints[0]===this?1:0,d=0===h?c.sourceId:c.targetId,p=o.getCachedData(d),f=p.o,g=p.s;u.index=0===h?1:0,u.connection=c,u.txy=[f.left,f.top],u.twh=g,u.tElement=c.endpoints[h],u.tRotation=o.getRotation(d)}else this.connections.length>0&&(u.connection=this.connections[0]);u.rotation=o.getRotation(this.elementId),r=this.anchor.compute(u)}for(var m in this.endpoint.compute(r,this.anchor.getOrientation(this),this._jsPlumb.paintStyleInUse,a||this.paintStyleInUse),this.endpoint.paint(this._jsPlumb.paintStyleInUse,this.anchor),this.timestamp=e,this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&(this._jsPlumb.overlayPlacements[m]=v.draw(this.endpoint,this._jsPlumb.paintStyleInUse),v.paint(this._jsPlumb.overlayPlacements[m]))}}}},this.getTypeDescriptor=function(){return"endpoint"},this.isVisible=function(){return this._jsPlumb.visible},this.repaint=this.paint;var c=!1;this.initDraggable=function(){if(!c&&t.isDragSupported(this.element)){var n,a={id:null,element:null},l=null,u=!1,h=null,d=function(t,e,n){var i=!1;return{drag:function(){if(i)return i=!1,!0;if(e.element){var o=n.getUIPosition(arguments,n.getZoom());null!=o&&n.setPosition(e.element,o),n.repaint(e.element,o),t.paint({anchorPoint:t.anchor.getCurrentLocation({element:t})})}},stopDrag:function(){i=!0}}}(this,a,o),p=i.dragOptions||{},f=t.dragEvents.start,g=t.dragEvents.stop,m=t.dragEvents.drag,v=t.dragEvents.beforeStart,y=function(e){l=this.connectorSelector();var c=!0;this.isEnabled()||(c=!1),null!=l||this.isSource||this.isTemporarySource||(c=!1),!this.isSource||!this.isFull()||null!=l&&this.dragAllowedWhenFull||(c=!1),null==l||l.isDetachable(this)||(this.isFull()?c=!1:l=null);var p=o.checkCondition(null==l?"beforeDrag":"beforeStartDetach",{endpoint:this,source:this.element,sourceId:this.elementId,connection:l});if(!1===p?c=!1:"object"==typeof p?t.extend(p,n||{}):p=n||{},!1===c)return o.stopDrag&&o.stopDrag(this.canvas),d.stopDrag(),!1;for(var f=0;f<this.connections.length;f++)this.connections[f].setHover(!1);this.addClass("endpointDrag"),o.setConnectionBeingDragged(!0),l&&!this.isFull()&&this.isSource&&(l=null),o.updateOffset({elId:this.elementId});var g=this._jsPlumb.instance.getOffset(this.canvas),m=this.canvas,v=this._jsPlumb.instance.getSize(this.canvas);!function(t,e,n,i){var o=e.createElement("div",{position:"absolute"});e.appendElement(o);var s=e.getId(o);e.setPosition(o,n),o.style.width=i[0]+"px",o.style.height=i[1]+"px",e.manage(s,o,!0),t.id=s,t.element=o}(a,o,g,v),o.setAttributes(this.canvas,{dragId:a.id,elId:this.elementId});var y=this.dragProxy||this.endpoint;if(null==this.dragProxy&&null!=this.connectionType){var b=this._jsPlumb.instance.deriveEndpointAndAnchorSpec(this.connectionType);b.endpoints[1]&&(y=b.endpoints[1])}var P=this._jsPlumb.instance.makeAnchor("Center");P.isFloating=!0,this._jsPlumb.floatingEndpoint=function(e,n,i,o,s,r,a,l){return a({paintStyle:e,endpoint:i,anchor:new t.FloatingAnchor({reference:n,referenceCanvas:o,jsPlumbInstance:r}),source:s,scope:l})}(this.getPaintStyle(),P,y,this.canvas,a.element,o,r,this.scope);var x=this._jsPlumb.floatingEndpoint.anchor;if(null==l)this.setHover(!1,!1),(l=s({sourceEndpoint:this,targetEndpoint:this._jsPlumb.floatingEndpoint,source:this.element,target:a.element,anchors:[this.anchor,this._jsPlumb.floatingEndpoint.anchor],paintStyle:i.connectorStyle,hoverPaintStyle:i.connectorHoverStyle,connector:i.connector,overlays:i.connectorOverlays,type:this.connectionType,cssClass:this.connectorClass,hoverClass:this.connectorHoverClass,scope:i.scope,data:p})).pending=!0,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.anchor=x,o.fire("connectionDrag",l),o.router.newConnection(l);else{u=!0,l.setHover(!1);var C=l.endpoints[0].id===this.id?0:1;this.detachFromConnection(l,null,!0);var _=o.getDragScope(m);o.setAttribute(this.canvas,"originalScope",_),o.fire("connectionDrag",l),0===C?(h=[l.source,l.sourceId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,0)):(h=[l.target,l.targetId,m,_],o.router.sourceOrTargetChanged(l.endpoints[C].elementId,a.id,l,a.element,1)),l.suspendedEndpoint=l.endpoints[C],l.suspendedElement=l.endpoints[C].getElement(),l.suspendedElementId=l.endpoints[C].elementId,l.suspendedElementType=0===C?"source":"target",l.suspendedEndpoint.setHover(!1),this._jsPlumb.floatingEndpoint.referenceEndpoint=l.suspendedEndpoint,l.endpoints[C]=this._jsPlumb.floatingEndpoint,l.addClass(o.draggingClass),this._jsPlumb.floatingEndpoint.addClass(o.draggingClass)}o.registerFloatingConnection(a,l,this._jsPlumb.floatingEndpoint),o.currentlyDragging=!0}.bind(this),b=function(){if(o.setConnectionBeingDragged(!1),l&&null!=l.endpoints){var t=o.getDropEvent(arguments),e=o.getFloatingAnchorIndex(l);if(l.endpoints[0===e?1:0].anchor.locked=!1,l.removeClass(o.draggingClass),this._jsPlumb&&(l.deleteConnectionNow||l.endpoints[e]===this._jsPlumb.floatingEndpoint)&&u&&l.suspendedEndpoint){0===e?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=h[0],l.sourceId=h[1]):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=h[0],l.targetId=h[1]);var n=this._jsPlumb.floatingEndpoint;o.setDragScope(h[2],h[3]),l.endpoints[e]=l.suspendedEndpoint,l.isReattach()||l._forceReattach||l._forceDetach||!o.deleteConnection(l,{originalEvent:t})?(l.setHover(!1),l._forceDetach=null,l._forceReattach=null,this._jsPlumb.floatingEndpoint.detachFromConnection(l),l.suspendedEndpoint.addConnection(l),1===e?o.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,e):o.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,e),o.repaint(h[1])):o.deleteObject({endpoint:n})}this.deleteAfterDragStop?o.deleteObject({endpoint:this}):this._jsPlumb&&this.paint({recalc:!1}),o.fire("connectionDragStop",l,t),l.pending&&o.fire("connectionAborted",l,t),o.currentlyDragging=!1,l.suspendedElement=null,l.suspendedEndpoint=null,l=null}a&&a.element&&o.remove(a.element,!1,!1),this._jsPlumb&&(this.canvas.style.visibility="visible",this.anchor.locked=!1,this._jsPlumb.floatingEndpoint=null)}.bind(this);(p=t.extend({},p)).scope=this.scope||p.scope,p[v]=e.wrap(p[v],function(t){n=t.e.payload||{}},!1),p[f]=e.wrap(p[f],y,!1),p[m]=e.wrap(p[m],d.drag),p[g]=e.wrap(p[g],b),p.multipleDrop=!1,p.canDrag=function(){return this.isSource||this.isTemporarySource||this.connections.length>0&&!1!==this.connectionsDetachable}.bind(this),o.initDraggable(this.canvas,p,"internal"),this.canvas._jsPlumbRelatedElement=this.element,c=!0}};var h=i.endpoint||this._jsPlumb.instance.Defaults.Endpoint||t.Defaults.Endpoint;this.setEndpoint(h,!0);var d=i.anchor?i.anchor:i.anchors?i.anchors:o.Defaults.Anchor||"Top";this.setAnchor(d,!0);var p=["default",i.type||""].join(" ");this.addType(p,i.data,!0),this.canvas=this.endpoint.canvas,this.canvas._jsPlumb=this,this.initDraggable();var f=function(n,s,r,a){if(t.isDropSupported(this.element)){var l=i.dropOptions||o.Defaults.DropOptions||t.Defaults.DropOptions;(l=t.extend({},l)).scope=l.scope||this.scope;var u=t.dragEvents.drop,c=t.dragEvents.over,h=t.dragEvents.out,d=this,p=o.EndpointDropHandler({getEndpoint:function(){return d},jsPlumb:o,enabled:function(){return null==r||r.isEnabled()},isFull:function(){return r.isFull()},element:this.element,elementId:this.elementId,isSource:this.isSource,isTarget:this.isTarget,addClass:function(t){d.addClass(t)},removeClass:function(t){d.removeClass(t)},isDropAllowed:function(){return d.isDropAllowed.apply(d,arguments)},reference:a,isRedrop:function(t,e){return t.suspendedEndpoint&&e.reference&&t.suspendedEndpoint.id===e.reference.id}});l[u]=e.wrap(l[u],p,!0),l[c]=e.wrap(l[c],function(){var e=t.getDragObject(arguments),n=o.getAttribute(t.getElement(e),"dragId"),i=o.getFloatingConnectionFor(n);if(null!=i){var s=o.getFloatingAnchorIndex(i);if(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id){var r=o.checkCondition("checkDropAllowed",{sourceEndpoint:i.endpoints[s],targetEndpoint:this,connection:i});this[(r?"add":"remove")+"Class"](o.endpointDropAllowedClass),this[(r?"remove":"add")+"Class"](o.endpointDropForbiddenClass),i.endpoints[s].anchor.over(this.anchor,this)}}}.bind(this)),l[h]=e.wrap(l[h],function(){var e=t.getDragObject(arguments),n=null==e?null:o.getAttribute(t.getElement(e),"dragId"),i=n?o.getFloatingConnectionFor(n):null;if(null!=i){var s=o.getFloatingAnchorIndex(i);(this.isTarget&&0!==s||i.suspendedEndpoint&&this.referenceEndpoint&&this.referenceEndpoint.id===i.suspendedEndpoint.id)&&(this.removeClass(o.endpointDropAllowedClass),this.removeClass(o.endpointDropForbiddenClass),i.endpoints[s].anchor.out())}}.bind(this)),o.initDroppable(n,l,"internal",s)}}.bind(this);return this.anchor.isFloating||f(this.canvas,!(i._transient||this.anchor.isFloating),this,i.reference),this},e.extend(t.Endpoint,t.OverlayCapableJsPlumbUIComponent,{setVisible:function(t,e,n){if(this._jsPlumb.visible=t,this.canvas&&(this.canvas.style.display=t?"block":"none"),this[t?"showOverlays":"hideOverlays"](),!e)for(var i=0;i<this.connections.length;i++)if(this.connections[i].setVisible(t),!n){var o=this===this.connections[i].endpoints[0]?1:0;1===this.connections[i].endpoints[o].connections.length&&this.connections[i].endpoints[o].setVisible(t,!0,!0)}},getAttachedElements:function(){return this.connections},applyType:function(e,i){this.setPaintStyle(e.endpointStyle||e.paintStyle,i),this.setHoverPaintStyle(e.endpointHoverStyle||e.hoverPaintStyle,i),null!=e.maxConnections&&(this._jsPlumb.maxConnections=e.maxConnections),e.scope&&(this.scope=e.scope),t.extend(this,e,n),null!=e.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,e.cssClass),t.OverlayCapableJsPlumbUIComponent.applyType(this,e)},isEnabled:function(){return this._jsPlumb.enabled},setEnabled:function(t){this._jsPlumb.enabled=t},cleanup:function(){var e=this._jsPlumb.instance.endpointAnchorClassPrefix+(this._jsPlumb.currentAnchorClass?"-"+this._jsPlumb.currentAnchorClass:"");t.removeClass(this.element,e),this.anchor=null,this.endpoint.cleanup(!0),this.endpoint.destroy(),this.endpoint=null,this._jsPlumb.instance.destroyDraggable(this.canvas,"internal"),this._jsPlumb.instance.destroyDroppable(this.canvas,"internal")},setHover:function(t){this.endpoint&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&this.endpoint.setHover(t)},isFull:function(){return 0===this._jsPlumb.maxConnections||!(this.isFloating()||this._jsPlumb.maxConnections<0||this.connections.length<this._jsPlumb.maxConnections)},isFloating:function(){return null!=this.anchor&&this.anchor.isFloating},isConnectedTo:function(t){var e=!1;if(t)for(var n=0;n<this.connections.length;n++)if(this.connections[n].endpoints[1]===t||this.connections[n].endpoints[0]===t){e=!0;break}return e},getConnectionCost:function(){return this._jsPlumb.connectionCost},setConnectionCost:function(t){this._jsPlumb.connectionCost=t},areConnectionsDirected:function(){return this._jsPlumb.connectionsDirected},setConnectionsDirected:function(t){this._jsPlumb.connectionsDirected=t},setElementId:function(t){this.elementId=t,this.anchor.elementId=t},setReferenceElement:function(e){this.element=t.getElement(e)},setDragAllowedWhenFull:function(t){this.dragAllowedWhenFull=t},equals:function(t){return this.anchor.equals(t.anchor)},getUuid:function(){return this._jsPlumb.uuid},computeAnchor:function(t){return this.anchor.compute(t)}}),this.jsPlumbInstance.prototype.EndpointDropHandler=function(t){return function(n){var i=t.jsPlumb;t.removeClass(i.endpointDropAllowedClass),t.removeClass(i.endpointDropForbiddenClass);var o=i.getDropEvent(arguments),s=i.getDragObject(arguments),r=i.getAttribute(s,"dragId"),a=(i.getAttribute(s,"elId"),i.getAttribute(s,"originalScope")),l=i.getFloatingConnectionFor(r);if(null!=l){var u=null!=l.suspendedEndpoint;if(!u||null!=l.suspendedEndpoint._jsPlumb){var c=t.getEndpoint(l);if(null!=c){if(t.isRedrop(l,t))return l._forceReattach=!0,l.setHover(!1),void(t.maybeCleanup&&t.maybeCleanup(c));var h=i.getFloatingAnchorIndex(l);if(0===h&&!t.isSource||1===h&&!t.isTarget)t.maybeCleanup&&t.maybeCleanup(c);else{t.onDrop&&t.onDrop(l),a&&i.setDragScope(s,a);var d=t.isFull(n);if(d&&c.fire("maxConnections",{endpoint:this,connection:l,maxConnections:c._jsPlumb.maxConnections},o),!d&&t.enabled()){var p=!0;0===h?(l.floatingElement=l.source,l.floatingId=l.sourceId,l.floatingEndpoint=l.endpoints[0],l.floatingIndex=0,l.source=t.element,l.sourceId=i.getId(t.element)):(l.floatingElement=l.target,l.floatingId=l.targetId,l.floatingEndpoint=l.endpoints[1],l.floatingIndex=1,l.target=t.element,l.targetId=i.getId(t.element)),u&&l.suspendedEndpoint.id!==c.id&&(l.isDetachAllowed(l)&&l.endpoints[h].isDetachAllowed(l)&&l.suspendedEndpoint.isDetachAllowed(l)&&i.checkCondition("beforeDetach",l)||(p=!1));var f=function(n){l.endpoints[h].detachFromConnection(l),l.suspendedEndpoint&&l.suspendedEndpoint.detachFromConnection(l),l.endpoints[h]=c,c.addConnection(l);var s=c.getParameters();for(var r in s)l.setParameter(r,s[r]);if(u){var a=l.suspendedEndpoint.elementId;i.fireMoveEvent({index:h,originalSourceId:0===h?a:l.sourceId,newSourceId:0===h?c.elementId:l.sourceId,originalTargetId:1===h?a:l.targetId,newTargetId:1===h?c.elementId:l.targetId,originalSourceEndpoint:0===h?l.suspendedEndpoint:l.endpoints[0],newSourceEndpoint:0===h?c:l.endpoints[0],originalTargetEndpoint:1===h?l.suspendedEndpoint:l.endpoints[1],newTargetEndpoint:1===h?c:l.endpoints[1],connection:l},o)}else s.draggable&&i.initDraggable(this.element,t.dragOptions,"internal",i);(1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),l.endpoints[0].finalEndpoint)&&(l.endpoints[0].detachFromConnection(l),l.endpoints[0]=l.endpoints[0].finalEndpoint,l.endpoints[0].addConnection(l));e.isObject(n)&&l.mergeData(n),i.finaliseConnection(l,null,o,!1),l.setHover(!1),i.revalidate(l.endpoints[0].element)}.bind(this);if(p=p&&t.isDropAllowed(l.sourceId,l.targetId,l.scope,l,c))return f(p),!0;l.suspendedEndpoint&&(l.endpoints[h]=l.suspendedEndpoint,l.setHover(!1),l._forceDetach=!0,0===h?(l.source=l.suspendedEndpoint.element,l.sourceId=l.suspendedEndpoint.elementId):(l.target=l.suspendedEndpoint.element,l.targetId=l.suspendedEndpoint.elementId),l.suspendedEndpoint.addConnection(l),1===h?i.router.sourceOrTargetChanged(l.floatingId,l.targetId,l,l.target,1):i.router.sourceOrTargetChanged(l.floatingId,l.sourceId,l,l.source,0),i.repaint(l.sourceId),l._forceDetach=!1)}t.maybeCleanup&&t.maybeCleanup(c),i.currentlyDragging=!1}}}}}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=function(t,i,o,s,r){if(e.Connectors[i]=e.Connectors[i]||{},null==e.Connectors[i][o]){if(null==e.Connectors[o]){if(t.Defaults.DoNotThrowErrors)return null;throw new TypeError("jsPlumb: unknown connector type '"+o+"'")}e.Connectors[i][o]=function(){e.Connectors[o].apply(this,arguments),e.ConnectorRenderers[i].apply(this,arguments)},n.extend(e.Connectors[i][o],[e.Connectors[o],e.ConnectorRenderers[i]])}return new e.Connectors[i][o](s,r)},o=function(t,e,n){return t?n.makeAnchor(t,e,n):null},s=function(t,e,i,o){null!=e&&(e._jsPlumbConnections=e._jsPlumbConnections||{},o?delete e._jsPlumbConnections[t.id]:e._jsPlumbConnections[t.id]=!0,n.isEmpty(e._jsPlumbConnections)?i.removeClass(e,i.connectedClass):i.addClass(e,i.connectedClass))};e.Connection=function(t){var i=t.newEndpoint;this.id=t.id,this.connector=null,this.idPrefix="_jsplumb_c_",this.defaultLabelLocation=.5,this.defaultOverlayKeys=["Overlays","ConnectionOverlays"],this.previousConnection=t.previousConnection,this.source=e.getElement(t.source),this.target=e.getElement(t.target),e.OverlayCapableJsPlumbUIComponent.apply(this,arguments),t.sourceEndpoint?(this.source=t.sourceEndpoint.getElement(),this.sourceId=t.sourceEndpoint.elementId):this.sourceId=this._jsPlumb.instance.getId(this.source),t.targetEndpoint?(this.target=t.targetEndpoint.getElement(),this.targetId=t.targetEndpoint.elementId):this.targetId=this._jsPlumb.instance.getId(this.target),this.scope=t.scope,this.endpoints=[],this.endpointStyles=[];var o=this._jsPlumb.instance;o.manage(this.sourceId,this.source),o.manage(this.targetId,this.target),this._jsPlumb.visible=!0,this._jsPlumb.params={cssClass:t.cssClass,container:t.container,"pointer-events":t["pointer-events"],editorParams:t.editorParams,overlays:t.overlays},this._jsPlumb.lastPaintedAt=null,this.bind("mouseover",function(){this.setHover(!0)}.bind(this)),this.bind("mouseout",function(){this.setHover(!1)}.bind(this)),this.makeEndpoint=function(e,n,s,r,a){return s=s||this._jsPlumb.instance.getId(n),this.prepareEndpoint(o,i,this,r,e?0:1,t,n,s,a)},t.type&&(t.endpoints=t.endpoints||this._jsPlumb.instance.deriveEndpointAndAnchorSpec(t.type).endpoints);var s=this.makeEndpoint(!0,this.source,this.sourceId,t.sourceEndpoint),r=this.makeEndpoint(!1,this.target,this.targetId,t.targetEndpoint);s&&n.addToList(t.endpointsByElement,this.sourceId,s),r&&n.addToList(t.endpointsByElement,this.targetId,r),this.scope||(this.scope=this.endpoints[0].scope),null!=t.deleteEndpointsOnEmpty&&(this.endpoints[0].setDeleteOnEmpty(t.deleteEndpointsOnEmpty),this.endpoints[1].setDeleteOnEmpty(t.deleteEndpointsOnEmpty));var a=o.Defaults.ConnectionsDetachable;!1===t.detachable&&(a=!1),!1===this.endpoints[0].connectionsDetachable&&(a=!1),!1===this.endpoints[1].connectionsDetachable&&(a=!1);var l=t.reattach||this.endpoints[0].reattachConnections||this.endpoints[1].reattachConnections||o.Defaults.ReattachConnections;this.appendToDefaultType({detachable:a,reattach:l,paintStyle:this.endpoints[0].connectorStyle||this.endpoints[1].connectorStyle||t.paintStyle||o.Defaults.PaintStyle||e.Defaults.PaintStyle,hoverPaintStyle:this.endpoints[0].connectorHoverStyle||this.endpoints[1].connectorHoverStyle||t.hoverPaintStyle||o.Defaults.HoverPaintStyle||e.Defaults.HoverPaintStyle});var u=o.getSuspendedAt();if(!o.isSuspendDrawing()){var c=o.getCachedData(this.sourceId),h=c.o,d=c.s,p=o.getCachedData(this.targetId),f=p.o,g=p.s,m=u||jsPlumbUtil.uuid(),v=this.endpoints[0].anchor.compute({xy:[h.left,h.top],wh:d,element:this.endpoints[0],elementId:this.endpoints[0].elementId,txy:[f.left,f.top],twh:g,tElement:this.endpoints[1],timestamp:m,rotation:o.getRotation(this.endpoints[0].elementId)});this.endpoints[0].paint({anchorLoc:v,timestamp:m}),v=this.endpoints[1].anchor.compute({xy:[f.left,f.top],wh:g,element:this.endpoints[1],elementId:this.endpoints[1].elementId,txy:[h.left,h.top],twh:d,tElement:this.endpoints[0],timestamp:m,rotation:o.getRotation(this.endpoints[1].elementId)}),this.endpoints[1].paint({anchorLoc:v,timestamp:m})}this.getTypeDescriptor=function(){return"connection"},this.getAttachedElements=function(){return this.endpoints},this.isDetachable=function(t){return!1!==this._jsPlumb.detachable&&(null!=t?!0===t.connectionsDetachable:!0===this._jsPlumb.detachable)},this.setDetachable=function(t){this._jsPlumb.detachable=!0===t},this.isReattach=function(){return!0===this._jsPlumb.reattach||!0===this.endpoints[0].reattachConnections||!0===this.endpoints[1].reattachConnections},this.setReattach=function(t){this._jsPlumb.reattach=!0===t},this._jsPlumb.cost=t.cost||this.endpoints[0].getConnectionCost(),this._jsPlumb.directed=t.directed,null==t.directed&&(this._jsPlumb.directed=this.endpoints[0].areConnectionsDirected());var y=e.extend({},this.endpoints[1].getParameters());e.extend(y,this.endpoints[0].getParameters()),e.extend(y,this.getParameters()),this.setParameters(y),this.setConnector(this.endpoints[0].connector||this.endpoints[1].connector||t.connector||o.Defaults.Connector||e.Defaults.Connector,!0);var b=null!=t.data&&n.isObject(t.data)?t.data:{};this.getData=function(){return b},this.setData=function(t){b=t||{}},this.mergeData=function(t){b=e.extend(b,t)};var P=["default",this.endpoints[0].connectionType,this.endpoints[1].connectionType,t.type].join(" ");/[^\s]/.test(P)&&this.addType(P,t.data,!0),this.updateConnectedClass()},n.extend(e.Connection,e.OverlayCapableJsPlumbUIComponent,{applyType:function(t,n,i){var o=null;null!=t.connector&&(null==(o=this.getCachedTypeItem("connector",i.connector))&&(o=this.prepareConnector(t.connector,i.connector),this.cacheTypeItem("connector",o,i.connector)),this.setPreparedConnector(o)),null!=t.detachable&&this.setDetachable(t.detachable),null!=t.reattach&&this.setReattach(t.reattach),t.scope&&(this.scope=t.scope),null!=t.cssClass&&this.canvas&&this._jsPlumb.instance.addClass(this.canvas,t.cssClass);var s=null;t.anchor?null==(s=this.getCachedTypeItem("anchors",i.anchor))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchor),this._jsPlumb.instance.makeAnchor(t.anchor)],this.cacheTypeItem("anchors",s,i.anchor)):t.anchors&&null==(s=this.getCachedTypeItem("anchors",i.anchors))&&(s=[this._jsPlumb.instance.makeAnchor(t.anchors[0]),this._jsPlumb.instance.makeAnchor(t.anchors[1])],this.cacheTypeItem("anchors",s,i.anchors)),null!=s&&(this.endpoints[0].anchor=s[0],this.endpoints[1].anchor=s[1],this.endpoints[1].anchor.isDynamic&&this._jsPlumb.instance.repaint(this.endpoints[1].elementId)),e.OverlayCapableJsPlumbUIComponent.applyType(this,t)},addClass:function(t,e){e&&(this.endpoints[0].addClass(t),this.endpoints[1].addClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.addClass(t)),this.connector&&this.connector.addClass(t)},removeClass:function(t,e){e&&(this.endpoints[0].removeClass(t),this.endpoints[1].removeClass(t),this.suspendedEndpoint&&this.suspendedEndpoint.removeClass(t)),this.connector&&this.connector.removeClass(t)},isVisible:function(){return this._jsPlumb.visible},setVisible:function(t){this._jsPlumb.visible=t,this.connector&&this.connector.setVisible(t),this.repaint()},cleanup:function(){this.updateConnectedClass(!0),this.endpoints=null,this.source=null,this.target=null,null!=this.connector&&(this.connector.cleanup(!0),this.connector.destroy(!0)),this.connector=null},updateConnectedClass:function(t){this._jsPlumb&&(s(this,this.source,this._jsPlumb.instance,t),s(this,this.target,this._jsPlumb.instance,t))},setHover:function(e){this.connector&&this._jsPlumb&&!this._jsPlumb.instance.isConnectionBeingDragged()&&(this.connector.setHover(e),t.jsPlumb[e?"addClass":"removeClass"](this.source,this._jsPlumb.instance.hoverSourceClass),t.jsPlumb[e?"addClass":"removeClass"](this.target,this._jsPlumb.instance.hoverTargetClass))},getUuids:function(){return[this.endpoints[0].getUuid(),this.endpoints[1].getUuid()]},getCost:function(){return this._jsPlumb?this._jsPlumb.cost:-1/0},setCost:function(t){this._jsPlumb.cost=t},isDirected:function(){return this._jsPlumb.directed},getConnector:function(){return this.connector},prepareConnector:function(t,e){var o,s={_jsPlumb:this._jsPlumb.instance,cssClass:this._jsPlumb.params.cssClass,container:this._jsPlumb.params.container,"pointer-events":this._jsPlumb.params["pointer-events"]},r=this._jsPlumb.instance.getRenderMode();return n.isString(t)?o=i(this._jsPlumb.instance,r,t,s,this):n.isArray(t)&&(o=1===t.length?i(this._jsPlumb.instance,r,t[0],s,this):i(this._jsPlumb.instance,r,t[0],n.merge(t[1],s),this)),null!=e&&(o.typeId=e),o},setPreparedConnector:function(t,e,n,i){if(this.connector!==t){var o,s="";if(null!=this.connector&&(s=(o=this.connector).getClass(),this.connector.cleanup(),this.connector.destroy()),this.connector=t,i&&this.cacheTypeItem("connector",t,i),this.canvas=this.connector.canvas,this.bgCanvas=this.connector.bgCanvas,this.connector.reattach(this._jsPlumb.instance),this.addClass(s),this.canvas&&(this.canvas._jsPlumb=this),this.bgCanvas&&(this.bgCanvas._jsPlumb=this),null!=o)for(var r=this.getOverlays(),a=0;a<r.length;a++)r[a].transfer&&r[a].transfer(this.connector);n||this.setListenerComponent(this.connector),e||this.repaint()}},setConnector:function(t,e,n,i){var o=this.prepareConnector(t,i);this.setPreparedConnector(o,e,n,i)},paint:function(t){if(!this._jsPlumb.instance.isSuspendDrawing()&&this._jsPlumb.visible){var e=(t=t||{}).timestamp,n=this.targetId,i=this.sourceId;if(null==e||e!==this._jsPlumb.lastPaintedAt){var o=this._jsPlumb.instance.updateOffset({elId:i}).o,s=this._jsPlumb.instance.updateOffset({elId:n}).o,r=this.endpoints[0],a=this.endpoints[1],l=r.anchor.getCurrentLocation({xy:[o.left,o.top],wh:[o.width,o.height],element:r,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.sourceId)}),u=a.anchor.getCurrentLocation({xy:[s.left,s.top],wh:[s.width,s.height],element:a,timestamp:e,rotation:this._jsPlumb.instance.getRotation(this.targetId)});this.connector.resetBounds(),this.connector.compute({sourcePos:l,targetPos:u,sourceOrientation:r.anchor.getOrientation(r),targetOrientation:a.anchor.getOrientation(a),sourceEndpoint:this.endpoints[0],targetEndpoint:this.endpoints[1],"stroke-width":this._jsPlumb.paintStyleInUse.strokeWidth,sourceInfo:o,targetInfo:s});var c={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0};for(var h in this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(h)){var d=this._jsPlumb.overlays[h];d.isVisible()&&(this._jsPlumb.overlayPlacements[h]=d.draw(this.connector,this._jsPlumb.paintStyleInUse,this.getAbsoluteOverlayPosition(d)),c.minX=Math.min(c.minX,this._jsPlumb.overlayPlacements[h].minX),c.maxX=Math.max(c.maxX,this._jsPlumb.overlayPlacements[h].maxX),c.minY=Math.min(c.minY,this._jsPlumb.overlayPlacements[h].minY),c.maxY=Math.max(c.maxY,this._jsPlumb.overlayPlacements[h].maxY))}var p=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||1)/2,f=parseFloat(this._jsPlumb.paintStyleInUse.strokeWidth||0),g={xmin:Math.min(this.connector.bounds.minX-(p+f),c.minX),ymin:Math.min(this.connector.bounds.minY-(p+f),c.minY),xmax:Math.max(this.connector.bounds.maxX+(p+f),c.maxX),ymax:Math.max(this.connector.bounds.maxY+(p+f),c.maxY)};for(var m in this.connector.paintExtents=g,this.connector.paint(this._jsPlumb.paintStyleInUse,null,g),this._jsPlumb.overlays)if(this._jsPlumb.overlays.hasOwnProperty(m)){var v=this._jsPlumb.overlays[m];v.isVisible()&&v.paint(this._jsPlumb.overlayPlacements[m],g)}}this._jsPlumb.lastPaintedAt=e}},repaint:function(t){var e=jsPlumb.extend(t||{},{});e.elId=this.sourceId,this.paint(e)},prepareEndpoint:function(t,n,i,s,r,a,l,u,c){var h;if(s)i.endpoints[r]=s,s.addConnection(i);else{a.endpoints||(a.endpoints=[null,null]);var d=c||a.endpoints[r]||a.endpoint||t.Defaults.Endpoints[r]||e.Defaults.Endpoints[r]||t.Defaults.Endpoint||e.Defaults.Endpoint;a.endpointStyles||(a.endpointStyles=[null,null]),a.endpointHoverStyles||(a.endpointHoverStyles=[null,null]);var p=a.endpointStyles[r]||a.endpointStyle||t.Defaults.EndpointStyles[r]||e.Defaults.EndpointStyles[r]||t.Defaults.EndpointStyle||e.Defaults.EndpointStyle;null==p.fill&&null!=a.paintStyle&&(p.fill=a.paintStyle.stroke),null==p.outlineStroke&&null!=a.paintStyle&&(p.outlineStroke=a.paintStyle.outlineStroke),null==p.outlineWidth&&null!=a.paintStyle&&(p.outlineWidth=a.paintStyle.outlineWidth);var f=a.endpointHoverStyles[r]||a.endpointHoverStyle||t.Defaults.EndpointHoverStyles[r]||e.Defaults.EndpointHoverStyles[r]||t.Defaults.EndpointHoverStyle||e.Defaults.EndpointHoverStyle;null!=a.hoverPaintStyle&&(null==f&&(f={}),null==f.fill&&(f.fill=a.hoverPaintStyle.stroke));var g=a.anchors?a.anchors[r]:a.anchor?a.anchor:o(t.Defaults.Anchors[r],u,t)||o(e.Defaults.Anchors[r],u,t)||o(t.Defaults.Anchor,u,t)||o(e.Defaults.Anchor,u,t);h=n({paintStyle:p,hoverPaintStyle:f,endpoint:d,connections:[i],uuid:a.uuids?a.uuids[r]:null,anchor:g,source:l,scope:a.scope,reattach:a.reattach||t.Defaults.ReattachConnections,detachable:a.detachable||t.Defaults.ConnectionsDetachable}),null==s&&h.setDeleteOnEmpty(!0),i.endpoints[r]=h,!1===a.drawEndpoints&&h.setVisible(!1,!0,!0)}return h},replaceEndpoint:function(t,e){var n=this.endpoints[t],i=n.elementId,o=this._jsPlumb.instance.getEndpoints(i),s=o.indexOf(n),r=this.makeEndpoint(0===t,n.element,i,null,e);this.endpoints[t]=r,o.splice(s,1,r),this._jsPlumb.instance.deleteObject({endpoint:n,deleteAttachedObjects:!1}),this._jsPlumb.instance.fire("endpointReplaced",{previous:n,current:r}),this._jsPlumb.instance.router.sourceOrTargetChanged(this.endpoints[1].elementId,this.endpoints[1].elementId,this,this.endpoints[1].element,1)}})}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumbUtil,e=this.jsPlumb;e.AnchorManager=function(n){var i={},o={},s={},r={},a=this,l={},u=n.jsPlumbInstance,c={},h=function(t,e){return e[0][0]-t[0][0]},d=function(t,e){return(t[0][0]<0?-Math.PI-t[0][0]:Math.PI-t[0][0])-(e[0][0]<0?-Math.PI-e[0][0]:Math.PI-e[0][0])},p={top:d,right:h,bottom:h,left:d},f=function(t,e){var n=u.getCachedData(t),i=n.s,r=n.o,a=function(e,n,i,r,a,l,c){if(r.length>0)for(var h=function(t,e,n,i,o,s,r,a){for(var l=[],u=e[o?0:1]/(i.length+1),c=0;c<i.length;c++){var h=(c+1)*u,d=s*e[o?1:0];r&&(h=e[o?0:1]-h);var p=o?h:d,f=n.left+p,g=p/e[0],m=o?d:h,v=n.top+m,y=m/e[1];if(0!==a){var b=jsPlumbUtil.rotatePoint([f,v],[n.centerx,n.centery],a);f=b[0],v=b[1]}l.push([f,v,g,y,i[c][1],i[c][2]])}return l}(0,n,i,(y=p[e],r.sort(y)),a,l,"right"===e||"top"===e,u.getRotation(t)),d=function(t,e){o[t.id]=[e[0],e[1],e[2],e[3]],s[t.id]=c},f=0;f<h.length;f++){var g=h[f][4],m=g.endpoints[0].elementId===t,v=g.endpoints[1].elementId===t;m&&d(g.endpoints[0],h[f]),v&&d(g.endpoints[1],h[f])}var y};a("bottom",i,r,e.bottom,!0,1,[0,1]),a("top",i,r,e.top,!0,0,[0,-1]),a("left",i,r,e.left,!1,0,[-1,0]),a("right",i,r,e.right,!1,1,[1,0])};this.reset=function(){i={},r={},l={}},this.addFloatingConnection=function(t,e){c[t]=e},this.newConnection=function(n){var i=n.sourceId,o=n.targetId,s=n.endpoints,a=!0,l=function(l,u,c,h,d){i===o&&c.isContinuous&&(n._jsPlumb.instance.removeElement(s[1].canvas),a=!1),t.addToList(r,h,[d,u,c.constructor===e.DynamicAnchor])};l(0,s[0],s[0].anchor,o,n),a&&l(0,s[1],s[1].anchor,i,n)};var g=function(e){!function(e,n){if(e){var i=function(t){return t[4]===n};t.removeWithFunction(e.top,i),t.removeWithFunction(e.left,i),t.removeWithFunction(e.bottom,i),t.removeWithFunction(e.right,i)}}(l[e.elementId],e.id)};this.connectionDetached=function(e,n){var i=e.connection||e,o=e.sourceId,s=e.targetId,l=i.endpoints,u=function(e,n,i,o,s){t.removeWithFunction(r[o],function(t){return t[0].id===s.id})};u(0,l[1],l[1].anchor,o,i),u(0,l[0],l[0].anchor,s,i),i.floatingId&&(u(i.floatingIndex,i.floatingEndpoint,i.floatingEndpoint.anchor,i.floatingId,i),g(i.floatingEndpoint)),g(i.endpoints[0]),g(i.endpoints[1]),n||(a.redraw(i.sourceId),i.targetId!==i.sourceId&&a.redraw(i.targetId))},this.addEndpoint=function(e,n){t.addToList(i,n,e)},this.changeId=function(t,e){r[e]=r[t],i[e]=i[t],delete r[t],delete i[t]},this.getConnectionsFor=function(t){return r[t]||[]},this.getEndpointsFor=function(t){return i[t]||[]},this.deleteEndpoint=function(e){t.removeWithFunction(i[e.elementId],function(t){return t.id===e.id}),g(e)},this.elementRemoved=function(t){delete c[t],delete i[t],i[t]=[]};var m=function(e,i,o,s,r,a,l,u,c,h,d,p){var f,g,m=-1,v=s.endpoints[l],y=v.id,b=[1,0][l],P=[[i,o],s,r,a,y],x=e[c],C=v._continuousAnchorEdge?e[v._continuousAnchorEdge]:null;if(C){var _=t.findWithFunction(C,function(t){return t[4]===y});if(-1!==_)for(C.splice(_,1),f=0;f<C.length;f++)g=C[f][1],t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,C[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,C[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id})}for(f=0;f<x.length;f++)g=x[f][1],1===n.idx&&x[f][3]===a&&-1===m&&(m=f),t.addWithFunction(d,g,function(t){return t.id===g.id}),t.addWithFunction(p,x[f][1].endpoints[l],function(t){return t.id===g.endpoints[l].id}),t.addWithFunction(p,x[f][1].endpoints[b],function(t){return t.id===g.endpoints[b].id});var j=u?-1!==m?m:0:x.length;x.splice(j,0,P),v._continuousAnchorEdge=c};this.sourceOrTargetChanged=function(n,i,o,s,a){if(0===a){if(n!==i){o.sourceId=i,o.source=s,t.removeWithFunction(r[n],function(t){return t[0].id===o.id});var l=t.findWithFunction(r[o.targetId],function(t){return t[0].id===o.id});l>-1&&(r[o.targetId][l][0]=o,r[o.targetId][l][1]=o.endpoints[0],r[o.targetId][l][2]=o.endpoints[0].anchor.constructor===e.DynamicAnchor),t.addToList(r,i,[o,o.endpoints[1],o.endpoints[1].anchor.constructor===e.DynamicAnchor]),o.endpoints[1].anchor.isContinuous&&(o.source===o.target?o._jsPlumb.instance.removeElement(o.endpoints[1].canvas):null==o.endpoints[1].canvas.parentNode&&o._jsPlumb.instance.appendElement(o.endpoints[1].canvas)),o.updateConnectedClass()}}else if(1===a){var u=o.endpoints[0].elementId;o.target=s,o.targetId=i;var c=t.findWithFunction(r[u],function(t){return t[0].id===o.id}),h=t.findWithFunction(r[n],function(t){return t[0].id===o.id});-1!==c&&(r[u][c][0]=o,r[u][c][1]=o.endpoints[1],r[u][c][2]=o.endpoints[1].anchor.constructor===e.DynamicAnchor),h>-1&&(r[n].splice(h,1),t.addToList(r,i,[o,o.endpoints[0],o.endpoints[0].anchor.constructor===e.DynamicAnchor])),o.updateConnectedClass()}},this.rehomeEndpoint=function(t,e,n){var o=i[e]||[],s=u.getId(n);if(s!==e){var r=o.indexOf(t);if(r>-1){var l=o.splice(r,1)[0];a.add(l,s)}}for(var c=0;c<t.connections.length;c++)t.connections[c].sourceId===e?a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,0):t.connections[c].targetId===e&&a.sourceOrTargetChanged(e,t.elementId,t.connections[c],t.element,1)},this.redraw=function(n,o,s,a,h,d){var p=[],g=[],v=[];if(!u.isSuspendDrawing()){var y=i[n]||[],b=r[n]||[];s=s||jsPlumbUtil.uuid(),a=a||{left:0,top:0},o&&(o={left:o.left+a.left,top:o.top+a.top});for(var P=u.updateOffset({elId:n,offset:o,recalc:!1,timestamp:s}),x={},C=0;C<b.length;C++){var _=b[C][0],j=_.sourceId,E=_.targetId,S=_.endpoints[0].anchor.isContinuous,w=_.endpoints[1].anchor.isContinuous;if(S||w){var D=j+"_"+E,A=x[D],I=_.sourceId===n?1:0,k=u.getRotation(E),O=u.getRotation(j);S&&!l[j]&&(l[j]={top:[],right:[],bottom:[],left:[]}),w&&!l[E]&&(l[E]={top:[],right:[],bottom:[],left:[]}),n!==E&&u.updateOffset({elId:E,timestamp:s}),n!==j&&u.updateOffset({elId:j,timestamp:s});var M=u.getCachedData(E),T=u.getCachedData(j);E===j&&(S||w)?(m(l[j],-Math.PI/2,0,_,!1,E,0,!1,"top",0,p,g),m(l[E],-Math.PI/2,0,_,!1,j,1,!1,"top",0,p,g)):(A||(A=this.calculateOrientation(j,E,T.o,M.o,_.endpoints[0].anchor,_.endpoints[1].anchor,_,O,k),x[D]=A),S&&m(l[j],A.theta,0,_,!1,E,0,!1,A.a[0],0,p,g),w&&m(l[E],A.theta2,-1,_,!0,j,1,!0,A.a[1],0,p,g)),S&&t.addWithFunction(v,j,function(t){return t===j}),w&&t.addWithFunction(v,E,function(t){return t===E}),t.addWithFunction(p,_,function(t){return t.id===_.id}),(S&&0===I||w&&1===I)&&t.addWithFunction(g,_.endpoints[I],function(t){return t.id===_.endpoints[I].id})}}for(C=0;C<y.length;C++)0===y[C].connections.length&&y[C].anchor.isContinuous&&(l[n]||(l[n]={top:[],right:[],bottom:[],left:[]}),m(l[n],-Math.PI/2,0,{endpoints:[y[C],y[C]],paint:function(){}},!1,n,0,!1,y[C].anchor.getDefaultFace(),0,p,g),t.addWithFunction(v,n,function(t){return t===n}));for(C=0;C<v.length;C++)f(v[C],l[v[C]]);for(C=0;C<y.length;C++)y[C].paint({timestamp:s,offset:P,dimensions:P.s,recalc:!0!==d});for(C=0;C<g.length;C++){var F=u.getCachedData(g[C].elementId);g[C].paint({timestamp:null,offset:F,dimensions:F.s})}for(C=0;C<b.length;C++){var L=b[C][1];if(L.anchor.constructor===e.DynamicAnchor){L.paint({elementWithPrecedence:n,timestamp:s}),t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id});for(var N=0;N<L.connections.length;N++)L.connections[N]!==b[C][0]&&t.addWithFunction(p,L.connections[N],function(t){return t.id===L.connections[N].id})}else t.addWithFunction(p,b[C][0],function(t){return t.id===b[C][0].id})}var R=c[n];for(R&&R.paint({timestamp:s,recalc:!1,elId:n}),C=0;C<p.length;C++)p[C].paint({elId:n,timestamp:null,recalc:!1,clearEdits:h})}return{c:p,e:g}};var v=function(e){t.EventGenerator.apply(this),this.type="Continuous",this.isDynamic=!0,this.isContinuous=!0;for(var n=e.faces||["top","right","bottom","left"],i=!(!1===e.clockwise),r={},a={top:"bottom",right:"left",left:"right",bottom:"top"},l={top:"right",right:"bottom",left:"top",bottom:"left"},u={top:"left",right:"top",left:"bottom",bottom:"right"},c=i?l:u,h=i?u:l,d=e.cssClass||"",p=null,f=null,g=["left","right"],m=["top","bottom"],v=null,y=0;y<n.length;y++)r[n[y]]=!0;this.getDefaultFace=function(){return 0===n.length?"top":n[0]},this.isRelocatable=function(){return!0},this.isSnapOnRelocate=function(){return!0},this.verifyEdge=function(t){return r[t]?t:r[a[t]]?a[t]:r[c[t]]?c[t]:r[h[t]]?h[t]:t},this.isEdgeSupported=function(t){return null==v?null==f?!0===r[t]:f===t:-1!==v.indexOf(t)},this.setCurrentFace=function(t,e){p=t,e&&null!=f&&(f=p)},this.getCurrentFace=function(){return p},this.getSupportedFaces=function(){var t=[];for(var e in r)r[e]&&t.push(e);return t},this.lock=function(){f=p},this.unlock=function(){f=null},this.isLocked=function(){return null!=f},this.lockCurrentAxis=function(){null!=p&&(v="left"===p||"right"===p?g:m)},this.unlockCurrentAxis=function(){v=null},this.compute=function(t){return o[t.element.id]||[0,0]},this.getCurrentLocation=function(t){return o[t.element.id]||[0,0]},this.getOrientation=function(t){return s[t.id]||[0,0]},this.getCssClass=function(){return d}};u.continuousAnchorFactory={get:function(t){return new v(t)},clear:function(t){delete o[t]}}},e.AnchorManager.prototype.calculateOrientation=function(t,e,n,i,o,s,r,a,l){var u=["left","top","right","bottom"];if(t===e)return{orientation:"identity",a:["top","top"]};var c=Math.atan2(i.centery-n.centery,i.centerx-n.centerx),h=Math.atan2(n.centery-i.centery,n.centerx-i.centerx),d=[],p={};!function(t,e){for(var n=0;n<t.length;n++)if(p[t[n]]={left:[e[n][0].left,e[n][0].centery],right:[e[n][0].right,e[n][0].centery],top:[e[n][0].centerx,e[n][0].top],bottom:[e[n][0].centerx,e[n][0].bottom]},0!==e[n][1])for(var i in p[t[n]])p[t[n]][i]=jsPlumbUtil.rotatePoint(p[t[n]][i],[e[n][0].centerx,e[n][0].centery],e[n][1])}(["source","target"],[[n,a],[i,l]]);for(var f=0;f<u.length;f++)for(var g=0;g<u.length;g++)d.push({source:u[f],target:u[g],dist:Biltong.lineLength(p.source[u[f]],p.target[u[g]])});d.sort(function(t,e){return t.dist<e.dist?-1:t.dist>e.dist?1:0});for(var m=d[0].source,v=d[0].target,y=0;y<d.length&&(m=o.isContinuous&&o.locked?o.getCurrentFace():!o.isContinuous||o.isEdgeSupported(d[y].source)?d[y].source:null,v=s.isContinuous&&s.locked?s.getCurrentFace():!s.isContinuous||s.isEdgeSupported(d[y].target)?d[y].target:null,null==m||null==v);y++);return o.isContinuous&&o.setCurrentFace(m),s.isContinuous&&s.setCurrentFace(v),{a:[m,v],theta:c,theta2:h}},e.Anchor=function(e){this.x=e.x||0,this.y=e.y||0,this.elementId=e.elementId,this.cssClass=e.cssClass||"",this.orientation=e.orientation||[0,0],this.lastReturnValue=null,this.offsets=e.offsets||[0,0],this.timestamp=null,this._unrotatedOrientation=[this.orientation[0],this.orientation[1]],this.relocatable=!1!==e.relocatable,this.snapOnRelocate=!1!==e.snapOnRelocate,this.locked=!1,t.EventGenerator.apply(this),this.compute=function(t){var e=t.xy,n=t.wh,i=t.timestamp;if(i&&i===this.timestamp)return this.lastReturnValue;var o=[e[0]+this.x*n[0]+this.offsets[0],e[1]+this.y*n[1]+this.offsets[1],this.x,this.y],s=t.rotation;if(null!=s&&0!==s){var r=jsPlumbUtil.rotatePoint(o,[e[0]+n[0]/2,e[1]+n[1]/2],s);this.orientation[0]=Math.round(this._unrotatedOrientation[0]*r[2]-this._unrotatedOrientation[1]*r[3]),this.orientation[1]=Math.round(this._unrotatedOrientation[1]*r[2]+this._unrotatedOrientation[0]*r[3]),this.lastReturnValue=[r[0],r[1],this.x,this.y]}else this.orientation[0]=this._unrotatedOrientation[0],this.orientation[1]=this._unrotatedOrientation[1],this.lastReturnValue=o;return this.timestamp=i,this.lastReturnValue},this.getCurrentLocation=function(t){return t=t||{},null==this.lastReturnValue||null!=t.timestamp&&this.timestamp!==t.timestamp?this.compute(t):this.lastReturnValue},this.setPosition=function(t,e,n,i,o){this.locked&&!o||(this.x=t,this.y=e,this.orientation=[n,i],this.lastReturnValue=null)}},t.extend(e.Anchor,t.EventGenerator,{equals:function(t){if(!t)return!1;var e=t.getOrientation(),n=this.getOrientation();return this.x===t.x&&this.y===t.y&&this.offsets[0]===t.offsets[0]&&this.offsets[1]===t.offsets[1]&&n[0]===e[0]&&n[1]===e[1]},getOrientation:function(){return this.orientation},getCssClass:function(){return this.cssClass}}),e.FloatingAnchor=function(t){e.Anchor.apply(this,arguments);var n=t.reference,i=t.referenceCanvas,o=e.getSize(i),s=null,r=null;this.orientation=null,this.x=0,this.y=0,this.isFloating=!0,this.compute=function(t){var e=t.xy,n=[e[0]+o[0]/2,e[1]+o[1]/2];return r=n,n},this.getOrientation=function(t){if(s)return s;var e=n.getOrientation(t);return[0*Math.abs(e[0])*-1,0*Math.abs(e[1])*-1]},this.over=function(t,e){s=t.getOrientation(e)},this.out=function(){s=null},this.getCurrentLocation=function(t){return null==r?this.compute(t):r}},t.extend(e.FloatingAnchor,e.Anchor);e.DynamicAnchor=function(t){e.Anchor.apply(this,arguments),this.isDynamic=!0,this.anchors=[],this.elementId=t.elementId,this.jsPlumbInstance=t.jsPlumbInstance;for(var n=0;n<t.anchors.length;n++)this.anchors[n]=(i=t.anchors[n],o=this.jsPlumbInstance,s=this.elementId,i.constructor===e.Anchor?i:o.makeAnchor(i,s,o));var i,o,s;this.getAnchors=function(){return this.anchors};var r=this.anchors.length>0?this.anchors[0]:null,a=r,l=function(t,e,n,i,o,s,r){var a=i[0]+t.x*o[0],l=i[1]+t.y*o[1],u=i[0]+o[0]/2,c=i[1]+o[1]/2;if(null!=s&&0!==s){var h=jsPlumbUtil.rotatePoint([a,l],[u,c],s);a=h[0],l=h[1]}return Math.sqrt(Math.pow(e-a,2)+Math.pow(n-l,2))+Math.sqrt(Math.pow(u-a,2)+Math.pow(c-l,2))},u=t.selector||function(t,e,n,i,o,s,r){for(var a=n[0]+i[0]/2,u=n[1]+i[1]/2,c=-1,h=1/0,d=0;d<r.length;d++){var p=l(r[d],a,u,t,e,o);p<h&&(c=d+0,h=p)}return r[c]};this.compute=function(t){var e=t.xy,n=t.wh,i=t.txy,o=t.twh,s=t.rotation,l=t.tRotation;return this.timestamp=t.timestamp,this.locked||null==i||null==o?(this.lastReturnValue=r.compute(t),this.lastReturnValue):(t.timestamp=null,r=u(e,n,i,o,s,l,this.anchors),this.x=r.x,this.y=r.y,r!==a&&this.fire("anchorChanged",r),a=r,this.lastReturnValue=r.compute(t),this.lastReturnValue)},this.getCurrentLocation=function(t){return null!=r?r.getCurrentLocation(t):null},this.getOrientation=function(t){return null!=r?r.getOrientation(t):[0,0]},this.over=function(t,e){null!=r&&r.over(t,e)},this.out=function(){null!=r&&r.out()},this.setAnchor=function(t){r=t},this.getCssClass=function(){return r&&r.getCssClass()||""},this.setAnchorCoordinates=function(t){var e=jsPlumbUtil.findWithFunction(this.anchors,function(e){return e.x===t[0]&&e.y===t[1]});return-1!==e&&(this.setAnchor(this.anchors[e]),!0)}},t.extend(e.DynamicAnchor,e.Anchor);var n=function(t,n,i,o,s,r){e.Anchors[s]=function(e){var a=e.jsPlumbInstance.makeAnchor([t,n,i,o,0,0],e.elementId,e.jsPlumbInstance);return a.type=s,r&&r(a,e),a}};n(.5,0,0,-1,"TopCenter"),n(.5,1,0,1,"BottomCenter"),n(0,.5,-1,0,"LeftMiddle"),n(1,.5,1,0,"RightMiddle"),n(.5,0,0,-1,"Top"),n(.5,1,0,1,"Bottom"),n(0,.5,-1,0,"Left"),n(1,.5,1,0,"Right"),n(.5,.5,0,0,"Center"),n(1,0,0,-1,"TopRight"),n(1,1,0,1,"BottomRight"),n(0,0,0,-1,"TopLeft"),n(0,1,0,1,"BottomLeft"),e.Defaults.DynamicAnchors=function(t){return t.jsPlumbInstance.makeAnchors(["TopCenter","RightMiddle","BottomCenter","LeftMiddle"],t.elementId,t.jsPlumbInstance)},e.Anchors.AutoDefault=function(t){var n=t.jsPlumbInstance.makeDynamicAnchor(e.Defaults.DynamicAnchors(t));return n.type="AutoDefault",n};var i=function(t,n){e.Anchors[t]=function(e){var i=e.jsPlumbInstance.makeAnchor(["Continuous",{faces:n}],e.elementId,e.jsPlumbInstance);return i.type=t,i}};e.Anchors.Continuous=function(t){return t.jsPlumbInstance.continuousAnchorFactory.get(t)},i("ContinuousLeft",["left"]),i("ContinuousTop",["top"]),i("ContinuousBottom",["bottom"]),i("ContinuousRight",["right"]),n(0,0,0,0,"Assign",function(t,e){var n=e.position||"Fixed";t.positionFinder=n.constructor===String?e.jsPlumbInstance.AnchorPositionFinders[n]:n,t.constructorParams=e}),this.jsPlumbInstance.prototype.AnchorPositionFinders={Fixed:function(t,e,n){return[(t.left-e.left)/n[0],(t.top-e.top)/n[1]]},Grid:function(t,e,n,i){var o=t.left-e.left,s=t.top-e.top,r=n[0]/i.grid[0],a=n[1]/i.grid[1],l=Math.floor(o/r),u=Math.floor(s/a);return[(l*r+r/2)/n[0],(u*a+a/2)/n[1]]}},e.Anchors.Perimeter=function(t){var e=(t=t||{}).anchorCount||60,n=t.shape;if(!n)throw new Error("no shape supplied to Perimeter Anchor type");var i=function(){for(var t=2*Math.PI/e,n=0,i=[],o=0;o<e;o++){var s=.5+.5*Math.sin(n),r=.5+.5*Math.cos(n);i.push([s,r,0,0]),n+=t}return i},o=function(t){for(var n=e/t.length,i=[],o=function(t,o,s,r,a,l,u){for(var c=(s-t)/(n=e*a),h=(r-o)/n,d=0;d<n;d++)i.push([t+c*d,o+h*d,null==l?0:l,null==u?0:u])},s=0;s<t.length;s++)o.apply(null,t[s]);return i},s=function(t){for(var e=[],n=0;n<t.length;n++)e.push([t[n][0],t[n][1],t[n][2],t[n][3],1/t.length,t[n][4],t[n][5]]);return o(e)},r=function(){return s([[0,0,1,0,0,-1],[1,0,1,1,1,0],[1,1,0,1,0,1],[0,1,0,0,-1,0]])},a={Circle:i,Ellipse:i,Diamond:function(){return s([[.5,0,1,.5],[1,.5,.5,1],[.5,1,0,.5],[0,.5,.5,0]])},Rectangle:r,Square:r,Triangle:function(){return s([[.5,0,1,1],[1,1,0,1],[0,1,.5,0]])},Path:function(t){for(var e=t.points,n=[],i=0,s=0;s<e.length-1;s++){var r=Math.sqrt(Math.pow(e[s][2]-e[s][0])+Math.pow(e[s][3]-e[s][1]));i+=r,n.push([e[s][0],e[s][1],e[s+1][0],e[s+1][1],r])}for(var a=0;a<n.length;a++)n[a][4]=n[a][4]/i;return o(n)}};if(!a[n])throw new Error("Shape ["+n+"] is unknown by Perimeter Anchor type");var l=a[n](t);t.rotation&&(l=function(t,e){for(var n=[],i=e/180*Math.PI,o=0;o<t.length;o++){var s=t[o][0]-.5,r=t[o][1]-.5;n.push([s*Math.cos(i)-r*Math.sin(i)+.5,s*Math.sin(i)+r*Math.cos(i)+.5,t[o][2],t[o][3]])}return n}(l,t.rotation));var u=t.jsPlumbInstance.makeDynamicAnchor(l);return u.type="Perimeter",u}}.call("undefined"!=typeof window?window:s),function(){this.jsPlumbUtil;var t=this.jsPlumb;t.DefaultRouter=function(e){this.jsPlumbInstance=e,this.anchorManager=new t.AnchorManager({jsPlumbInstance:e}),this.sourceOrTargetChanged=function(t,e,n,i,o){this.anchorManager.sourceOrTargetChanged(t,e,n,i,o)},this.reset=function(){this.anchorManager.reset()},this.changeId=function(t,e){this.anchorManager.changeId(t,e)},this.elementRemoved=function(t){this.anchorManager.elementRemoved(t)},this.newConnection=function(t){this.anchorManager.newConnection(t)},this.connectionDetached=function(t,e){this.anchorManager.connectionDetached(t,e)},this.redraw=function(t,e,n,i,o,s){return this.anchorManager.redraw(t,e,n,i,o,s)},this.deleteEndpoint=function(t){this.anchorManager.deleteEndpoint(t)},this.rehomeEndpoint=function(t,e,n){this.anchorManager.rehomeEndpoint(t,e,n)},this.addEndpoint=function(t,e){this.anchorManager.addEndpoint(t,e)}}}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Biltong;e.Segments={AbstractSegment:function(t){this.params=t,this.findClosestPointOnPath=function(t,e){return{d:1/0,x:null,y:null,l:null}},this.getBounds=function(){return{minX:Math.min(t.x1,t.x2),minY:Math.min(t.y1,t.y2),maxX:Math.max(t.x1,t.x2),maxY:Math.max(t.y1,t.y2)}},this.lineIntersection=function(t,e,n,i){return[]},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.y)}},Straight:function(t){var n,o,s,r,a,l,u;e.Segments.AbstractSegment.apply(this,arguments);this.type="Straight",this.getLength=function(){return n},this.getGradient=function(){return o},this.getCoordinates=function(){return{x1:r,y1:l,x2:a,y2:u}},this.setCoordinates=function(t){r=t.x1,l=t.y1,a=t.x2,u=t.y2,n=Math.sqrt(Math.pow(a-r,2)+Math.pow(u-l,2)),o=i.gradient({x:r,y:l},{x:a,y:u}),s=-1/o},this.setCoordinates({x1:t.x1,y1:t.y1,x2:t.x2,y2:t.y2}),this.getBounds=function(){return{minX:Math.min(r,a),minY:Math.min(l,u),maxX:Math.max(r,a),maxY:Math.max(l,u)}},this.pointOnPath=function(t,e){if(0!==t||e){if(1!==t||e){var o=e?t>0?t:n+t:t*n;return i.pointOnLine({x:r,y:l},{x:a,y:u},o)}return{x:a,y:u}}return{x:r,y:l}},this.gradientAtPoint=function(t){return o},this.pointAlongPathFrom=function(t,e,n){var o=this.pointOnPath(t,n),s=e<=0?{x:r,y:l}:{x:a,y:u};return e<=0&&Math.abs(e)>1&&(e*=-1),i.pointOnLine(o,s,e)};var c=function(t,e,n){return n>=Math.min(t,e)&&n<=Math.max(t,e)},h=function(t,e,n){return Math.abs(n-t)<Math.abs(n-e)?t:e};this.findClosestPointOnPath=function(t,e){var d={d:1/0,x:null,y:null,l:null,x1:r,x2:a,y1:l,y2:u};if(0===o)d.y=l,d.x=c(r,a,t)?t:h(r,a,t);else if(o===1/0||o===-1/0)d.x=r,d.y=c(l,u,e)?e:h(l,u,e);else{var p=l-o*r,f=(e-s*t-p)/(o-s),g=o*f+p;d.x=c(r,a,f)?f:h(r,a,f),d.y=c(l,u,g)?g:h(l,u,g)}var m=i.lineLength([d.x,d.y],[r,l]);return d.d=i.lineLength([t,e],[d.x,d.y]),d.l=m/n,d};var d=function(t,e,n){return n>e?e<=t&&t<=n:e>=t&&t>=n};this.lineIntersection=function(t,e,n,s){var c=Math.abs(i.gradient({x:t,y:e},{x:n,y:s})),h=Math.abs(o),p=h===1/0?r:l-h*r,f=[],g=c===1/0?t:e-c*t;if(c!==h)if(c===1/0&&0===h)d(t,r,a)&&d(l,e,s)&&(f=[t,l]);else if(0===c&&h===1/0)d(e,l,u)&&d(r,t,n)&&(f=[r,e]);else{var m,v;c===1/0?d(m=t,r,a)&&d(v=h*t+p,e,s)&&(f=[m,v]):0===c?d(v=e,l,u)&&d(m=(e-p)/h,t,n)&&(f=[m,v]):(v=h*(m=(g-p)/(h-c))+p,d(m,r,a)&&d(v,l,u)&&(f=[m,v]))}return f},this.boxIntersection=function(t,e,n,i){var o=[];return o.push.apply(o,this.lineIntersection(t,e,t+n,e)),o.push.apply(o,this.lineIntersection(t+n,e,t+n,e+i)),o.push.apply(o,this.lineIntersection(t+n,e+i,t,e+i)),o.push.apply(o,this.lineIntersection(t,e+i,t,e)),o},this.boundingBoxIntersection=function(t){return this.boxIntersection(t.x,t.y,t.w,t.h)}},Arc:function(t){e.Segments.AbstractSegment.apply(this,arguments);var n=function(e,n){return i.theta([t.cx,t.cy],[e,n])},o=2*Math.PI;this.radius=t.r,this.anticlockwise=t.ac,this.type="Arc",t.startAngle&&t.endAngle?(this.startAngle=t.startAngle,this.endAngle=t.endAngle,this.x1=t.cx+this.radius*Math.cos(t.startAngle),this.y1=t.cy+this.radius*Math.sin(t.startAngle),this.x2=t.cx+this.radius*Math.cos(t.endAngle),this.y2=t.cy+this.radius*Math.sin(t.endAngle)):(this.startAngle=n(t.x1,t.y1),this.endAngle=n(t.x2,t.y2),this.x1=t.x1,this.y1=t.y1,this.x2=t.x2,this.y2=t.y2),this.endAngle<0&&(this.endAngle+=o),this.startAngle<0&&(this.startAngle+=o);var s=this.endAngle<this.startAngle?this.endAngle+o:this.endAngle;this.sweep=Math.abs(s-this.startAngle),this.anticlockwise&&(this.sweep=o-this.sweep);var r=2*Math.PI*this.radius,a=this.sweep/o,l=r*a;this.getLength=function(){return l},this.getBounds=function(){return{minX:t.cx-t.r,maxX:t.cx+t.r,minY:t.cy-t.r,maxY:t.cy+t.r}};var u=function(t){var e=Math.floor(t),n=Math.ceil(t);return t-e<1e-10?e:n-t<1e-10?n:t};this.pointOnPath=function(e,n){if(0===e)return{x:this.x1,y:this.y1,theta:this.startAngle};if(1===e)return{x:this.x2,y:this.y2,theta:this.endAngle};n&&(e/=l);var i=function(t,e){if(t.anticlockwise){var n=t.startAngle<t.endAngle?t.startAngle+o:t.startAngle;return n-Math.abs(n-t.endAngle)*e}var i=t.endAngle<t.startAngle?t.endAngle+o:t.endAngle,s=Math.abs(i-t.startAngle);return t.startAngle+s*e}(this,e),s=t.cx+t.r*Math.cos(i),r=t.cy+t.r*Math.sin(i);return{x:u(s),y:u(r),theta:i}},this.gradientAtPoint=function(e,n){var o=this.pointOnPath(e,n),s=i.normal([t.cx,t.cy],[o.x,o.y]);return this.anticlockwise||s!==1/0&&s!==-1/0||(s*=-1),s},this.pointAlongPathFrom=function(e,n,i){var o=this.pointOnPath(e,i),s=n/r*2*Math.PI,a=this.anticlockwise?-1:1,l=o.theta+a*s;return{x:t.cx+this.radius*Math.cos(l),y:t.cy+this.radius*Math.sin(l)}}},Bezier:function(n){this.curve=[{x:n.x1,y:n.y1},{x:n.cp1x,y:n.cp1y},{x:n.cp2x,y:n.cp2y},{x:n.x2,y:n.y2}];var i=function(t){var e={x:0,y:0};if(0===t)return this.curve[0];var n=this.curve.length-1;if(1===t)return this.curve[n];var i=this.curve,o=1-t;if(0===n)return this.curve[0];if(1===n)return{x:o*i[0].x+t*i[1].x,y:o*i[0].y+t*i[1].y};if(n<4){var s,r,a,l=o*o,u=t*t,c=0;return 2===n?(i=[i[0],i[1],i[2],e],s=l,r=o*t*2,a=u):3===n&&(s=l*o,r=l*t*3,a=o*u*3,c=t*u),{x:s*i[0].x+r*i[1].x+a*i[2].x+c*i[3].x,y:s*i[0].y+r*i[1].y+a*i[2].y+c*i[3].y}}return e}.bind(this),o=function(){var t;(t=this.curve)[0].x===t[1].x&&t[0].y===t[1].y&&(this.length=0);var e,n,o=function(t){var e=[];t--;for(var n=0;n<=t;n++)e.push(i(n/t));return e}(16);this.length=0;for(var s=0;s<15;s++){var r=o[s],a=o[s+1];this.length+=(e=r,n=a,Math.sqrt(Math.pow(e.x-n.x,2)+Math.pow(e.y-n.y,2)))}}.bind(this);e.Segments.AbstractSegment.apply(this,arguments);this.bounds={minX:Math.min(n.x1,n.x2,n.cp1x,n.cp2x),minY:Math.min(n.y1,n.y2,n.cp1y,n.cp2y),maxX:Math.max(n.x1,n.x2,n.cp1x,n.cp2x),maxY:Math.max(n.y1,n.y2,n.cp1y,n.cp2y)},this.type="Bezier",o();var s=function(e,n,i){return i&&(n=t.jsBezier.locationAlongCurveFrom(e,n>0?0:1,n)),n};this.pointOnPath=function(e,n){return e=s(this.curve,e,n),t.jsBezier.pointOnCurve(this.curve,e)},this.gradientAtPoint=function(e,n){return e=s(this.curve,e,n),t.jsBezier.gradientAtPoint(this.curve,e)},this.pointAlongPathFrom=function(e,n,i){return e=s(this.curve,e,i),t.jsBezier.pointAlongCurveFrom(this.curve,e,n)},this.getLength=function(){return this.length},this.getBounds=function(){return this.bounds},this.findClosestPointOnPath=function(e,n){var i=t.jsBezier.nearestPointOnCurve({x:e,y:n},this.curve);return{d:Math.sqrt(Math.pow(i.point.x-e,2)+Math.pow(i.point.y-n,2)),x:i.point.x,y:i.point.y,l:1-i.location,s:this}},this.lineIntersection=function(e,n,i,o){return t.jsBezier.lineIntersection(e,n,i,o,this.curve)}}},e.SegmentRenderer={getPath:function(t,e){return{Straight:function(e){var n=t.getCoordinates();return(e?"M "+n.x1+" "+n.y1+" ":"")+"L "+n.x2+" "+n.y2},Bezier:function(e){var n=t.params;return(e?"M "+n.x2+" "+n.y2+" ":"")+"C "+n.cp2x+" "+n.cp2y+" "+n.cp1x+" "+n.cp1y+" "+n.x1+" "+n.y1},Arc:function(e){var n=t.params,i=t.sweep>Math.PI?1:0,o=t.anticlockwise?0:1;return(e?"M"+t.x1+" "+t.y1+" ":"")+"A "+t.radius+" "+n.r+" 0 "+i+","+o+" "+t.x2+" "+t.y2}}[t.type](e)}};var o=function(){this.resetBounds=function(){this.bounds={minX:1/0,minY:1/0,maxX:-1/0,maxY:-1/0}},this.resetBounds()};e.Connectors.AbstractConnector=function(t){o.apply(this,arguments);var s=[],r=0,a=[],l=[],u=t.stub||0,c=n.isArray(u)?u[0]:u,h=n.isArray(u)?u[1]:u,d=t.gap||0,p=n.isArray(d)?d[0]:d,f=n.isArray(d)?d[1]:d,g=null,m=null;this.getPathData=function(){for(var t="",n=0;n<s.length;n++)t+=e.SegmentRenderer.getPath(s[n],0===n),t+=" ";return t},this.findSegmentForPoint=function(t,e){for(var n={d:1/0,s:null,x:null,y:null,l:null},i=0;i<s.length;i++){var o=s[i].findClosestPointOnPath(t,e);o.d<n.d&&(n.d=o.d,n.l=o.l,n.x=o.x,n.y=o.y,n.s=s[i],n.x1=o.x1,n.x2=o.x2,n.y1=o.y1,n.y2=o.y2,n.index=i,n.connectorLocation=a[i][0]+o.l*(a[i][1]-a[i][0]))}return n},this.lineIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].lineIntersection(t,e,n,i));return o},this.boxIntersection=function(t,e,n,i){for(var o=[],r=0;r<s.length;r++)o.push.apply(o,s[r].boxIntersection(t,e,n,i));return o},this.boundingBoxIntersection=function(t){for(var e=[],n=0;n<s.length;n++)e.push.apply(e,s[n].boundingBoxIntersection(t));return e};var v=function(t,e){var n,i,o;if(e&&(t=t>0?t/r:(r+t)/r),1===t)n=s.length-1,o=1;else if(0===t)o=0,n=0;else if(t>=.5){for(n=0,o=0,i=a.length-1;i>-1;i--)if(a[i][1]>=t&&a[i][0]<=t){n=i,o=(t-a[i][0])/l[i];break}}else for(n=a.length-1,o=1,i=0;i<a.length;i++)if(a[i][1]>=t){n=i,o=(t-a[i][0])/l[i];break}return{segment:s[n],proportion:o,index:n}};this.setSegments=function(t){g=[],r=0;for(var e=0;e<t.length;e++)g.push(t[e]),r+=t[e].getLength()},this.getLength=function(){return r};var y=function(t){this.strokeWidth=t.strokeWidth;var e=i.quadrant(t.sourcePos,t.targetPos),n=t.targetPos[0]<t.sourcePos[0],o=t.targetPos[1]<t.sourcePos[1],s=t.strokeWidth||1,r=t.sourceEndpoint.anchor.getOrientation(t.sourceEndpoint),a=t.targetEndpoint.anchor.getOrientation(t.targetEndpoint),l=n?t.targetPos[0]:t.sourcePos[0],u=o?t.targetPos[1]:t.sourcePos[1],d=Math.abs(t.targetPos[0]-t.sourcePos[0]),g=Math.abs(t.targetPos[1]-t.sourcePos[1]);if(0===r[0]&&0===r[1]||0===a[0]&&0===a[1]){var m=d>g?0:1,v=[1,0][m];a=[],(r=[])[m]=t.sourcePos[m]>t.targetPos[m]?-1:1,a[m]=t.sourcePos[m]>t.targetPos[m]?1:-1,r[v]=0,a[v]=0}var y=n?d+p*r[0]:p*r[0],b=o?g+p*r[1]:p*r[1],P=n?f*a[0]:d+f*a[0],x=o?f*a[1]:g+f*a[1],C=r[0]*a[0]+r[1]*a[1],_={sx:y,sy:b,tx:P,ty:x,lw:s,xSpan:Math.abs(P-y),ySpan:Math.abs(x-b),mx:(y+P)/2,my:(b+x)/2,so:r,to:a,x:l,y:u,w:d,h:g,segment:e,startStubX:y+r[0]*c,startStubY:b+r[1]*c,endStubX:P+a[0]*h,endStubY:x+a[1]*h,isXGreaterThanStubTimes2:Math.abs(y-P)>c+h,isYGreaterThanStubTimes2:Math.abs(b-x)>c+h,opposite:-1===C,perpendicular:0===C,orthogonal:1===C,sourceAxis:0===r[0]?"y":"x",points:[l,u,d,g,y,b,P,x],stubs:[c,h]};return _.anchorOrientation=_.opposite?"opposite":_.orthogonal?"orthogonal":"perpendicular",_};return this.getSegments=function(){return s},this.updateBounds=function(t){var e=t.getBounds();this.bounds.minX=Math.min(this.bounds.minX,e.minX),this.bounds.maxX=Math.max(this.bounds.maxX,e.maxX),this.bounds.minY=Math.min(this.bounds.minY,e.minY),this.bounds.maxY=Math.max(this.bounds.maxY,e.maxY)},this.pointOnPath=function(t,e){var n=v(t,e);return n.segment&&n.segment.pointOnPath(n.proportion,!1)||[0,0]},this.gradientAtPoint=function(t,e){var n=v(t,e);return n.segment&&n.segment.gradientAtPoint(n.proportion,!1)||0},this.pointAlongPathFrom=function(t,e,n){var i=v(t,n);return i.segment&&i.segment.pointAlongPathFrom(i.proportion,e,!1)||[0,0]},this.compute=function(t){m=y.call(this,t),r=s.length=a.length=l.length=0,this._compute(m,t),this.x=m.points[0],this.y=m.points[1],this.w=m.points[2],this.h=m.points[3],this.segment=m.segment,function(){for(var t=0,e=0;e<s.length;e++){var n=s[e].getLength();l[e]=n/r,a[e]=[t,t+=n/r]}}()},{addSegment:function(t,n,i){if(i.x1!==i.x2||i.y1!==i.y2){var o=new e.Segments[n](i);s.push(o),r+=o.getLength(),t.updateBounds(o)}},prepareCompute:y,sourceStub:c,targetStub:h,maxStub:Math.max(c,h),sourceGap:p,targetGap:f,maxGap:Math.max(p,f)}},n.extend(e.Connectors.AbstractConnector,o),e.Endpoints.AbstractEndpoint=function(t){return o.apply(this,arguments),{compute:this.compute=function(t,e,n,i){var o=this._compute.apply(this,arguments);return this.x=o[0],this.y=o[1],this.w=o[2],this.h=o[3],this.bounds.minX=this.x,this.bounds.minY=this.y,this.bounds.maxX=this.x+this.w,this.bounds.maxY=this.y+this.h,o},cssClass:t.cssClass}},n.extend(e.Endpoints.AbstractEndpoint,o),e.Endpoints.Dot=function(t){this.type="Dot";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.radius=t.radius||10,this.defaultOffset=.5*this.radius,this.defaultInnerRadius=this.radius/3,this._compute=function(t,e,n,i){this.radius=n.radius||this.radius;var o=t[0]-this.radius,s=t[1]-this.radius,r=2*this.radius,a=2*this.radius;if(n.stroke){var l=n.strokeWidth||1;o-=l,s-=l,r+=2*l,a+=2*l}return[o,s,r,a,this.radius]}},n.extend(e.Endpoints.Dot,e.Endpoints.AbstractEndpoint),e.Endpoints.Rectangle=function(t){this.type="Rectangle";e.Endpoints.AbstractEndpoint.apply(this,arguments);t=t||{},this.width=t.width||20,this.height=t.height||20,this._compute=function(t,e,n,i){var o=n.width||this.width,s=n.height||this.height;return[t[0]-o/2,t[1]-s/2,o,s]}},n.extend(e.Endpoints.Rectangle,e.Endpoints.AbstractEndpoint);var s=function(t){e.jsPlumbUIComponent.apply(this,arguments),this._jsPlumb.displayElements=[]};n.extend(s,e.jsPlumbUIComponent,{getDisplayElements:function(){return this._jsPlumb.displayElements},appendDisplayElement:function(t){this._jsPlumb.displayElements.push(t)}}),e.Endpoints.Image=function(i){this.type="Image",s.apply(this,arguments),e.Endpoints.AbstractEndpoint.apply(this,arguments);var o=i.onload,r=i.src||i.url,a=i.cssClass?" "+i.cssClass:"";this._jsPlumb.img=new Image,this._jsPlumb.ready=!1,this._jsPlumb.initialized=!1,this._jsPlumb.deleted=!1,this._jsPlumb.widthToUse=i.width,this._jsPlumb.heightToUse=i.height,this._jsPlumb.endpoint=i.endpoint,this._jsPlumb.img.onload=function(){null!=this._jsPlumb&&(this._jsPlumb.ready=!0,this._jsPlumb.widthToUse=this._jsPlumb.widthToUse||this._jsPlumb.img.width,this._jsPlumb.heightToUse=this._jsPlumb.heightToUse||this._jsPlumb.img.height,o&&o(this))}.bind(this),this._jsPlumb.endpoint.setImage=function(t,e){var n=t.constructor===String?t:t.src;o=e,this._jsPlumb.img.src=n,null!=this.canvas&&this.canvas.setAttribute("src",this._jsPlumb.img.src)}.bind(this),this._jsPlumb.endpoint.setImage(r,o),this._compute=function(t,e,n,i){return this.anchorPoint=t,this._jsPlumb.ready?[t[0]-this._jsPlumb.widthToUse/2,t[1]-this._jsPlumb.heightToUse/2,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse]:[0,0,0,0]},this.canvas=e.createElement("img",{position:"absolute",margin:0,padding:0,outline:0},this._jsPlumb.instance.endpointClass+a),this._jsPlumb.widthToUse&&this.canvas.setAttribute("width",this._jsPlumb.widthToUse),this._jsPlumb.heightToUse&&this.canvas.setAttribute("height",this._jsPlumb.heightToUse),this._jsPlumb.instance.appendElement(this.canvas),this.actuallyPaint=function(t,e,i){if(!this._jsPlumb.deleted){this._jsPlumb.initialized||(this.canvas.setAttribute("src",this._jsPlumb.img.src),this.appendDisplayElement(this.canvas),this._jsPlumb.initialized=!0);var o=this.anchorPoint[0]-this._jsPlumb.widthToUse/2,s=this.anchorPoint[1]-this._jsPlumb.heightToUse/2;n.sizeElement(this.canvas,o,s,this._jsPlumb.widthToUse,this._jsPlumb.heightToUse)}},this.paint=function(e,n){null!=this._jsPlumb&&(this._jsPlumb.ready?this.actuallyPaint(e,n):t.setTimeout(function(){this.paint(e,n)}.bind(this),200))}},n.extend(e.Endpoints.Image,[s,e.Endpoints.AbstractEndpoint],{cleanup:function(t){t&&(this._jsPlumb.deleted=!0,this.canvas&&this.canvas.parentNode.removeChild(this.canvas),this.canvas=null)}}),e.Endpoints.Blank=function(t){e.Endpoints.AbstractEndpoint.apply(this,arguments);this.type="Blank",s.apply(this,arguments),this._compute=function(t,e,n,i){return[t[0],t[1],10,0]};var i=t.cssClass?" "+t.cssClass:"";this.canvas=e.createElement("div",{display:"block",width:"1px",height:"1px",background:"transparent",position:"absolute"},this._jsPlumb.instance.endpointClass+i),this._jsPlumb.instance.appendElement(this.canvas),this.paint=function(t,e){n.sizeElement(this.canvas,this.x,this.y,this.w,this.h)}},n.extend(e.Endpoints.Blank,[e.Endpoints.AbstractEndpoint,s],{cleanup:function(){this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas)}}),e.Endpoints.Triangle=function(t){this.type="Triangle",e.Endpoints.AbstractEndpoint.apply(this,arguments);var n=this;(t=t||{}).width=t.width||55,t.height=t.height||55,this.width=t.width,this.height=t.height,this._compute=function(t,e,i,o){var s=i.width||n.width,r=i.height||n.height;return[t[0]-s/2,t[1]-r/2,s,r]}};var r=e.Overlays.AbstractOverlay=function(t){this.visible=!0,this.isAppendedAtTopLevel=!0,this.component=t.component,this.loc=null==t.location?.5:t.location,this.endpointLoc=null==t.endpointLocation?[.5,.5]:t.endpointLocation,this.visible=!1!==t.visible};r.prototype={cleanup:function(t){t&&(this.component=null,this.canvas=null,this.endpointLoc=null)},reattach:function(t,e){},setVisible:function(t){this.visible=t,this.component.repaint()},isVisible:function(){return this.visible},hide:function(){this.setVisible(!1)},show:function(){this.setVisible(!0)},incrementLocation:function(t){this.loc+=t,this.component.repaint()},setLocation:function(t){this.loc=t,this.component.repaint()},getLocation:function(){return this.loc},updateFrom:function(){}},e.Overlays.Arrow=function(t){this.type="Arrow",r.apply(this,arguments),this.isAppendedAtTopLevel=!1,t=t||{};var o=this;this.length=t.length||20,this.width=t.width||20,this.id=t.id,this.direction=(t.direction||1)<0?-1:1;var s=t.paintStyle||{"stroke-width":1},a=t.foldback||.623;this.computeMaxSize=function(){return 1.5*o.width},this.elementCreated=function(n,i){if(this.path=n,t.events)for(var o in t.events)e.on(n,o,t.events[o])},this.draw=function(t,e){var o,r,l,u;if(t.pointAlongPathFrom){if(n.isString(this.loc)||this.loc>1||this.loc<0){var c=parseInt(this.loc,10),h=this.loc<0?1:0;o=t.pointAlongPathFrom(h,c,!1),r=t.pointAlongPathFrom(h,c-this.direction*this.length/2,!1),l=i.pointOnLine(o,r,this.length)}else if(1===this.loc){if(o=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,-this.length),l=i.pointOnLine(o,r,this.length),-1===this.direction){var d=l;l=o,o=d}}else if(0===this.loc){if(l=t.pointOnPath(this.loc),r=t.pointAlongPathFrom(this.loc,this.length),o=i.pointOnLine(l,r,this.length),-1===this.direction){var p=l;l=o,o=p}}else o=t.pointAlongPathFrom(this.loc,this.direction*this.length/2),r=t.pointOnPath(this.loc),l=i.pointOnLine(o,r,this.length);var f={hxy:o,tail:u=i.perpendicularLineTo(o,l,this.width),cxy:i.pointOnLine(o,l,a*this.length)},g=s.stroke||e.stroke,m=s.fill||e.stroke;return{component:t,d:f,"stroke-width":s.strokeWidth||e.strokeWidth,stroke:g,fill:m,minX:Math.min(o.x,u[0].x,u[1].x),maxX:Math.max(o.x,u[0].x,u[1].x),minY:Math.min(o.y,u[0].y,u[1].y),maxY:Math.max(o.y,u[0].y,u[1].y)}}return{component:t,minX:0,maxX:0,minY:0,maxY:0}}},n.extend(e.Overlays.Arrow,r,{updateFrom:function(t){this.length=t.length||this.length,this.width=t.width||this.width,this.direction=null!=t.direction?t.direction:this.direction,this.foldback=t.foldback||this.foldback},cleanup:function(){this.path&&this.path.parentNode&&this.path.parentNode.removeChild(this.path)}}),e.Overlays.PlainArrow=function(t){t=t||{};var n=e.extend(t,{foldback:1});e.Overlays.Arrow.call(this,n),this.type="PlainArrow"},n.extend(e.Overlays.PlainArrow,e.Overlays.Arrow),e.Overlays.Diamond=function(t){var n=(t=t||{}).length||40,i=e.extend(t,{length:n/2,foldback:2});e.Overlays.Arrow.call(this,i),this.type="Diamond"},n.extend(e.Overlays.Diamond,e.Overlays.Arrow);var a=function(t,e){return(null==t._jsPlumb.cachedDimensions||e)&&(t._jsPlumb.cachedDimensions=t.getDimensions()),t._jsPlumb.cachedDimensions},l=function(t){e.jsPlumbUIComponent.apply(this,arguments),r.apply(this,arguments);var i=this.fire;this.fire=function(){i.apply(this,arguments),this.component&&this.component.fire.apply(this.component,arguments)},this.detached=!1,this.id=t.id,this._jsPlumb.div=null,this._jsPlumb.initialised=!1,this._jsPlumb.component=t.component,this._jsPlumb.cachedDimensions=null,this._jsPlumb.create=t.create,this._jsPlumb.initiallyInvisible=!1===t.visible,this.getElement=function(){if(null==this._jsPlumb.div){var n=this._jsPlumb.div=e.getElement(this._jsPlumb.create(this._jsPlumb.component));n.style.position="absolute",jsPlumb.addClass(n,this._jsPlumb.instance.overlayClass+" "+(this.cssClass?this.cssClass:t.cssClass?t.cssClass:"")),this._jsPlumb.instance.appendElement(n),this._jsPlumb.instance.getId(n),this.canvas=n;var i="translate(-50%, -50%)";n.style.webkitTransform=i,n.style.mozTransform=i,n.style.msTransform=i,n.style.oTransform=i,n.style.transform=i,n._jsPlumb=this,!1===t.visible&&(n.style.display="none")}return this._jsPlumb.div},this.draw=function(t,e,i){var o=a(this);if(null!=o&&2===o.length){var s={x:0,y:0};if(i)s={x:i[0],y:i[1]};else if(t.pointOnPath){var r=this.loc,l=!1;(n.isString(this.loc)||this.loc<0||this.loc>1)&&(r=parseInt(this.loc,10),l=!0),s=t.pointOnPath(r,l)}else{var u=this.loc.constructor===Array?this.loc:this.endpointLoc;s={x:u[0]*t.w,y:u[1]*t.h}}var c=s.x-o[0]/2,h=s.y-o[1]/2;return{component:t,d:{minx:c,miny:h,td:o,cxy:s},minX:c,maxX:c+o[0],minY:h,maxY:h+o[1]}}return{minX:0,maxX:0,minY:0,maxY:0}}};n.extend(l,[e.jsPlumbUIComponent,r],{getDimensions:function(){return[1,1]},setVisible:function(t){this._jsPlumb.div&&(this._jsPlumb.div.style.display=t?"block":"none",t&&this._jsPlumb.initiallyInvisible&&(a(this,!0),this.component.repaint(),this._jsPlumb.initiallyInvisible=!1))},clearCachedDimensions:function(){this._jsPlumb.cachedDimensions=null},cleanup:function(t){t?null!=this._jsPlumb.div&&(this._jsPlumb.div._jsPlumb=null,this._jsPlumb.instance.removeElement(this._jsPlumb.div)):(this._jsPlumb&&this._jsPlumb.div&&this._jsPlumb.div.parentNode&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div),this.detached=!0)},reattach:function(t,e){null!=this._jsPlumb.div&&t.getContainer().appendChild(this._jsPlumb.div),this.detached=!1},computeMaxSize:function(){var t=a(this);return Math.max(t[0],t[1])},paint:function(t,e){this._jsPlumb.initialised||(this.getElement(),t.component.appendDisplayElement(this._jsPlumb.div),this._jsPlumb.initialised=!0,this.detached&&this._jsPlumb.div.parentNode.removeChild(this._jsPlumb.div)),this._jsPlumb.div.style.left=t.component.x+t.d.minx+"px",this._jsPlumb.div.style.top=t.component.y+t.d.miny+"px"}}),e.Overlays.Custom=function(t){this.type="Custom",l.apply(this,arguments)},n.extend(e.Overlays.Custom,l),e.Overlays.GuideLines=function(){var t=this;t.length=50,t.strokeWidth=5,this.type="GuideLines",r.apply(this,arguments),e.jsPlumbUIComponent.apply(this,arguments),this.draw=function(e,n){var o=e.pointAlongPathFrom(t.loc,t.length/2),s=e.pointOnPath(t.loc),r=i.pointOnLine(o,s,t.length),a=i.perpendicularLineTo(o,r,40),l=i.perpendicularLineTo(r,o,20);return{connector:e,head:o,tail:r,headLine:l,tailLine:a,minX:Math.min(o.x,r.x,l[0].x,l[1].x),minY:Math.min(o.y,r.y,l[0].y,l[1].y),maxX:Math.max(o.x,r.x,l[0].x,l[1].x),maxY:Math.max(o.y,r.y,l[0].y,l[1].y)}}},e.Overlays.Label=function(t){this.labelStyle=t.labelStyle,this.cssClass=null!=this.labelStyle?this.labelStyle.cssClass:null;var n=e.extend({create:function(){return e.createElement("div")}},t);if(e.Overlays.Custom.call(this,n),this.type="Label",this.label=t.label||"",this.labelText=null,this.labelStyle){var i=this.getElement();if(this.labelStyle.font=this.labelStyle.font||"12px sans-serif",i.style.font=this.labelStyle.font,i.style.color=this.labelStyle.color||"black",this.labelStyle.fill&&(i.style.background=this.labelStyle.fill),this.labelStyle.borderWidth>0){var o=this.labelStyle.borderStyle?this.labelStyle.borderStyle:"black";i.style.border=this.labelStyle.borderWidth+"px solid "+o}this.labelStyle.padding&&(i.style.padding=this.labelStyle.padding)}},n.extend(e.Overlays.Label,e.Overlays.Custom,{cleanup:function(t){t&&(this.div=null,this.label=null,this.labelText=null,this.cssClass=null,this.labelStyle=null)},getLabel:function(){return this.label},setLabel:function(t){this.label=t,this.labelText=null,this.clearCachedDimensions(),this.update(),this.component.repaint()},getDimensions:function(){return this.update(),l.prototype.getDimensions.apply(this,arguments)},update:function(){if("function"==typeof this.label){var t=this.label(this);this.getElement().innerHTML=t.replace(/\r\n/g,"<br/>")}else null==this.labelText&&(this.labelText=this.label,this.getElement().innerHTML=this.labelText.replace(/\r\n/g,"<br/>"))},updateFrom:function(t){null!=t.label&&this.setLabel(t.label)}})}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumbUtil,n=t.jsPlumbInstance,i="stop",o="revert",s="_jsPlumbGroup",r="show",a="hide",l=function(t){var n={},i={},o={},l=this;function u(e,n){for(var i=t.getContainer();;){if(null==e||e===i)return!1;if(e===n)return!0;e=e.parentNode}}function c(e,n){for(var i=e.getEl().querySelectorAll(".jtk-managed"),o=0;o<i.length;o++)t[n?r:a](i[o],!0)}t.bind("connection",function(n){var s=t.getGroupFor(n.source),r=t.getGroupFor(n.target);null!=s&&null!=r&&s===r?(i[n.connection.id]=s,o[n.connection.id]=s):(null!=s&&(e.suggest(s.connections.source,n.connection),i[n.connection.id]=s),null!=r&&(e.suggest(r.connections.target,n.connection),o[n.connection.id]=r))}),t.bind("internal.connectionDetached",function(t){!function(t){delete t.proxies;var n,s=i[t.id];null!=s&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete i[t.id]),null!=(s=o[t.id])&&(n=function(e){return e.id===t.id},e.removeWithFunction(s.connections.source,n),e.removeWithFunction(s.connections.target,n),delete o[t.id])}(t.connection)}),t.bind("connectionMoved",function(t){var e=(0===t.index?i:o)[t.connection.id];if(e){var n=e.connections[0===t.index?"source":"target"],s=n.indexOf(t.connection);-1!==s&&n.splice(s,1)}}),this.addGroup=function(e){t.addClass(e.getEl(),"jtk-group-expanded"),n[e.id]=e,e.manager=this,p(e),t.fire("group:add",{group:e})},this.addToGroup=function(e,n,i){if(e=this.getGroup(e)){var o=e.getEl();if(n._isJsPlumbGroup)return;var s=n._jsPlumbGroup;if(s!==e){t.removeFromDragSelection(n);var r=t.getOffset(n,!0),a=e.collapsed?t.getOffset(o,!0):t.getOffset(e.getDragArea(),!0);null!=s&&(s.remove(n,!1,i,!1,e),l.updateConnectionsForGroup(s)),e.add(n,i);var u=function(t,n){var i=0===n?1:0;t.each(function(t){t.setVisible(!1),t.endpoints[i].element._jsPlumbGroup===e?(t.endpoints[i].setVisible(!1),d(t,i,e)):(t.endpoints[n].setVisible(!1),h(t,n,e))})};e.collapsed&&(u(t.select({source:n}),0),u(t.select({target:n}),1));var c=t.getId(n);t.dragManager.setParent(n,c,o,t.getId(o),r);var p={left:r.left-a.left,top:r.top-a.top};if(t.setPosition(n,p),t.dragManager.revalidateParent(n,c,r),l.updateConnectionsForGroup(e),t.revalidate(c),!i){var f={group:e,el:n,pos:p};s&&(f.sourceGroup=s),t.fire("group:addMember",f)}}}},this.removeFromGroup=function(t,e,n){if(t=this.getGroup(t)){if(t.collapsed){var i=function(n,i){for(var o=0;o<n.length;o++){var s=n[o];if(s.proxies)for(var r=0;r<s.proxies.length;r++)if(null!=s.proxies[r]){var a=s.proxies[r].originalEp.element;(a===e||u(a,e))&&d(s,i,t)}}};i(t.connections.source.slice(),0),i(t.connections.target.slice(),1)}t.remove(e,null,n)}},this.getGroup=function(t){var i=t;if(e.isString(t)&&null==(i=n[t]))throw new TypeError("No such group ["+t+"]");return i},this.getGroups=function(){var t=[];for(var e in n)t.push(n[e]);return t},this.removeGroup=function(e,i,o,s){e=this.getGroup(e),this.expandGroup(e,!0);var r=e[i?"removeAll":"orphanAll"](o,s);return t.remove(e.getEl()),delete n[e.id],delete t._groups[e.id],t.fire("group:remove",{group:e}),r},this.removeAllGroups=function(t,e,i){for(var o in n)this.removeGroup(n[o],t,e,i)};var h=function(e,n,i){var o=e.endpoints[0===n?1:0].element;if(!o[s]||o[s].shouldProxy()||!o[s].collapsed){var r=i.getEl(),a=t.getId(r);t.proxyConnection(e,n,r,a,function(t,e){return i.getEndpoint(t,e)},function(t,e){return i.getAnchor(t,e)})}};this.collapseGroup=function(e){if(null!=(e=this.getGroup(e))&&!e.collapsed){var n=e.getEl();if(c(e,!1),e.shouldProxy()){var i=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];h(o,n,e)}};i(e.connections.source,0),i(e.connections.target,1)}e.collapsed=!0,t.removeClass(n,"jtk-group-expanded"),t.addClass(n,"jtk-group-collapsed"),t.revalidate(n),t.fire("group:collapse",{group:e})}};var d=function(e,n,i){t.unproxyConnection(e,n,t.getId(i.getEl()))};function p(e){for(var n=e.getMembers().slice(),s=[],r=0;r<n.length;r++)Array.prototype.push.apply(s,n[r].querySelectorAll(".jtk-managed"));Array.prototype.push.apply(n,s);var a=t.getConnections({source:n,scope:"*"},!0),l=t.getConnections({target:n,scope:"*"},!0),u={};e.connections.source.length=0,e.connections.target.length=0;var c=function(n){for(var s=0;s<n.length;s++)if(!u[n[s].id]){u[n[s].id]=!0;var r=t.getGroupFor(n[s].source),a=t.getGroupFor(n[s].target);r===e?(a!==e&&e.connections.source.push(n[s]),i[n[s].id]=e):a===e&&(e.connections.target.push(n[s]),o[n[s].id]=e)}};c(a),c(l)}this.expandGroup=function(e,n){if(null!=(e=this.getGroup(e))&&e.collapsed){var i=e.getEl();if(c(e,!0),e.shouldProxy()){var o=function(t,n){for(var i=0;i<t.length;i++){var o=t[i];d(o,n,e)}};o(e.connections.source,0),o(e.connections.target,1)}e.collapsed=!1,t.addClass(i,"jtk-group-expanded"),t.removeClass(i,"jtk-group-collapsed"),t.revalidate(i),this.repaintGroup(e),n||t.fire("group:expand",{group:e})}},this.repaintGroup=function(e){for(var n=(e=this.getGroup(e)).getMembers(),i=0;i<n.length;i++)t.revalidate(n[i])},this.updateConnectionsForGroup=p,this.refreshAllGroups=function(){for(var e in n)p(n[e]),t.dragManager.updateOffsets(t.getId(n[e].getEl()))}},u=function(n,r){var a=this,l=r.el;this.getEl=function(){return l},this.id=r.id||e.uuid(),l._isJsPlumbGroup=!0;var u=this.getDragArea=function(){var t=n.getSelector(l,"[jtk-group-content]");return t&&t.length>0?t[0]:l},c=!0===r.ghost,h=c||!0===r.constrain,d=!1!==r.revert,p=!0===r.orphan,f=!0===r.prune,g=!0===r.dropOverride,m=!1!==r.proxied,v=[];if(this.connections={source:[],target:[],internal:[]},this.getAnchor=function(t,e){return r.anchor||"Continuous"},this.getEndpoint=function(t,e){return r.endpoint||["Dot",{radius:10}]},this.collapsed=!1,!1!==r.draggable){var y={drag:function(){for(var t=0;t<v.length;t++)n.draw(v[t])},stop:function(t){n.fire("groupDragStop",jsPlumb.extend(t,{group:a}))},scope:"_jsPlumbGroupDrag"};r.dragOptions&&t.jsPlumb.extend(y,r.dragOptions),n.draggable(r.el,y)}!1!==r.droppable&&n.droppable(r.el,{drop:function(t){var e=t.drag.el;if(!e._isJsPlumbGroup){var i=e._jsPlumbGroup;if(i!==a){if(null!=i&&i.overrideDrop(e,a))return;n.getGroupManager().addToGroup(a,e,!1)}}}});var b=function(t,e){for(var n=null==t.nodeType?t:[t],i=0;i<n.length;i++)e(n[i])};function P(t,e){var i=function(t){return t.offsetParent}(t),o=n.getSize(i),s=n.getSize(t),r=e[0],a=r+s[0],l=e[1],u=l+s[1];return a>0&&r<o[0]&&u>0&&l<o[1]}function x(t){var e=n.getId(t),i=n.getOffset(t);return t.parentNode.removeChild(t),n.getContainer().appendChild(t),n.setPosition(t,i),j(t),n.dragManager.clearParent(t,e),[e,i]}function C(t){var e=[];function i(t,e,i){var o=null;if(!P(t,[e,i])){var s=t._jsPlumbGroup;f?n.remove(t):o=x(t),s.remove(t)}return o}for(var o=0;o<t.selection.length;o++)e.push(i(t.selection[o][0],t.selection[o][1].left,t.selection[o][1].top));return 1===e.length?e[0]:e}function _(t){var e=n.getId(t);n.revalidate(t),n.dragManager.revalidateParent(t,e)}function j(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.off(i,C),f||p||!d||(t._katavorioDrag.off(o,_),t._katavorioDrag.setRevert(null)))}function E(t){t._katavorioDrag&&((f||p)&&t._katavorioDrag.on(i,C),h&&t._katavorioDrag.setConstrain(!0),c&&t._katavorioDrag.setUseGhostProxy(!0),f||p||!d||(t._katavorioDrag.on(o,_),t._katavorioDrag.setRevert(function(t,e){return!P(t,e)})))}this.overrideDrop=function(t,e){return g&&(d||f||p)},this.add=function(t,e){var i=u();b(t,function(t){if(null!=t._jsPlumbGroup){if(t._jsPlumbGroup===a)return;t._jsPlumbGroup.remove(t,!0,e,!1)}t._jsPlumbGroup=a,v.push(t),n.isAlreadyDraggable(t)&&E(t),t.parentNode!==i&&i.appendChild(t)}),n.getGroupManager().updateConnectionsForGroup(a)},this.remove=function(t,i,o,s,r){b(t,function(t){if(t._jsPlumbGroup===a){if(delete t._jsPlumbGroup,e.removeWithFunction(v,function(e){return e===t}),i)try{a.getDragArea().removeChild(t)}catch(t){jsPlumbUtil.log("Could not remove element from Group "+t)}if(j(t),!o){var s={group:a,el:t};r&&(s.targetGroup=r),n.fire("group:removeMember",s)}}}),s||n.getGroupManager().updateConnectionsForGroup(a)},this.removeAll=function(t,e){for(var i=0,o=v.length;i<o;i++){var s=v[0];a.remove(s,t,e,!0),n.remove(s,!0)}v.length=0,n.getGroupManager().updateConnectionsForGroup(a)},this.orphanAll=function(){for(var t={},e=0;e<v.length;e++){var n=x(v[e]);t[n[0]]=n[1]}return v.length=0,t},this.getMembers=function(){return v},l[s]=this,n.bind("elementDraggable",function(t){t.el._jsPlumbGroup===this&&E(t.el)}.bind(this)),this.shouldProxy=function(){return m},n.getGroupManager().addGroup(this)};n.prototype.addGroup=function(t){var e=this;if(e._groups=e._groups||{},null!=e._groups[t.id])throw new TypeError("cannot create Group ["+t.id+"]; a Group with that ID exists");if(null!=t.el[s])throw new TypeError("cannot create Group ["+t.id+"]; the given element is already a Group");var n=new u(e,t);return e._groups[n.id]=n,t.collapsed&&this.collapseGroup(n),n},n.prototype.addToGroup=function(t,e,n){var i=function(e){var i=this.getId(e);this.manage(i,e),this.getGroupManager().addToGroup(t,e,n)}.bind(this);if(Array.isArray(e))for(var o=0;o<e.length;o++)i(e[o]);else i(e)},n.prototype.removeFromGroup=function(t,e,n){this.getGroupManager().removeFromGroup(t,e,n),this.getContainer().appendChild(e)},n.prototype.removeGroup=function(t,e,n,i){return this.getGroupManager().removeGroup(t,e,n,i)},n.prototype.removeAllGroups=function(t,e,n){this.getGroupManager().removeAllGroups(t,e,n)},n.prototype.getGroup=function(t){return this.getGroupManager().getGroup(t)},n.prototype.getGroups=function(){return this.getGroupManager().getGroups()},n.prototype.expandGroup=function(t){this.getGroupManager().expandGroup(t)},n.prototype.collapseGroup=function(t){this.getGroupManager().collapseGroup(t)},n.prototype.repaintGroup=function(t){this.getGroupManager().repaintGroup(t)},n.prototype.toggleGroup=function(t){null!=(t=this.getGroupManager().getGroup(t))&&this.getGroupManager()[t.collapsed?"expandGroup":"collapseGroup"](t)},n.prototype.getGroupManager=function(){var t=this._groupManager;return null==t&&(t=this._groupManager=new l(this)),t},n.prototype.removeGroupManager=function(){delete this._groupManager},n.prototype.getGroupFor=function(t){if(t=this.getElement(t)){for(var e=this.getContainer(),n=!1,i=null;!n;)null==t||t===e?n=!0:t[s]?(i=t[s],n=!0):t=t.parentNode;return i}}}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.Flowchart=function(e){this.type="Flowchart",(e=e||{}).stub=null==e.stub?30:e.stub;var n,i=t.Connectors.AbstractConnector.apply(this,arguments),o=null==e.midpoint||isNaN(e.midpoint)?.5:e.midpoint,s=!0===e.alwaysRespectStubs,r=null,a=null,l=null!=e.cornerRadius?e.cornerRadius:0,u=(e.loopbackRadius,function(t){return t<0?-1:0===t?0:1}),c=function(t){return[u(t[2]-t[0]),u(t[3]-t[1])]},h=function(t,e,n,i){if(r!==e||a!==n){var o=null==r?i.sx:r,s=null==a?i.sy:a,l=o===e?"v":"h";r=e,a=n,t.push([o,s,e,n,l])}},d=function(t){return Math.sqrt(Math.pow(t[0]-t[2],2)+Math.pow(t[1]-t[3],2))},p=function(t){var e=[];return e.push.apply(e,t),e};this.midpoint=o,this._compute=function(t,e){n=[],r=null,a=null;var u=function(){return[t.startStubX,t.startStubY,t.endStubX,t.endStubY]},f={perpendicular:u,orthogonal:u,opposite:function(e){var n=t,i="x"===e?0:1;return!s&&{x:function(){return 1===n.so[i]&&(n.startStubX>n.endStubX&&n.tx>n.startStubX||n.sx>n.endStubX&&n.tx>n.sx)||-1===n.so[i]&&(n.startStubX<n.endStubX&&n.tx<n.startStubX||n.sx<n.endStubX&&n.tx<n.sx)},y:function(){return 1===n.so[i]&&(n.startStubY>n.endStubY&&n.ty>n.startStubY||n.sy>n.endStubY&&n.ty>n.sy)||-1===n.so[i]&&(n.startStubY<n.endStubY&&n.ty<n.startStubY||n.sy<n.endStubY&&n.ty<n.sy)}}[e]()?{x:[(t.sx+t.tx)/2,t.startStubY,(t.sx+t.tx)/2,t.endStubY],y:[t.startStubX,(t.sy+t.ty)/2,t.endStubX,(t.sy+t.ty)/2]}[e]:[t.startStubX,t.startStubY,t.endStubX,t.endStubY]}}[t.anchorOrientation](t.sourceAxis),g="x"===t.sourceAxis?0:1,m="x"===t.sourceAxis?1:0,v=f[g],y=f[m],b=f[g+2],P=f[m+2];h(n,f[0],f[1],t);var x=t.startStubX+(t.endStubX-t.startStubX)*o,C=t.startStubY+(t.endStubY-t.startStubY)*o,_={x:[0,1],y:[1,0]},j={perpendicular:function(e){var n=t,i={x:[[n.startStubX,n.endStubX],null,[n.endStubX,n.startStubX]],y:[[n.startStubY,n.endStubY],null,[n.endStubY,n.startStubY]]},o={x:[[x,n.startStubY],[x,n.endStubY]],y:[[n.startStubX,C],[n.endStubX,C]]},s={x:[[n.endStubX,n.startStubY]],y:[[n.startStubX,n.endStubY]]},r={x:[[n.startStubX,n.endStubY],[n.endStubX,n.endStubY]],y:[[n.endStubX,n.startStubY],[n.endStubX,n.endStubY]]},a={x:[[n.startStubX,C],[n.endStubX,C],[n.endStubX,n.endStubY]],y:[[x,n.startStubY],[x,n.endStubY],[n.endStubX,n.endStubY]]},l={x:[n.startStubY,n.endStubY],y:[n.startStubX,n.endStubX]},u=_[e][0],c=_[e][1],h=n.so[u]+1,d=n.to[c]+1,p=-1===n.to[c]&&l[e][1]<l[e][0]||1===n.to[c]&&l[e][1]>l[e][0],f=i[e][h][0],g=i[e][h][1],m={x:[[[1,2,3,4],null,[2,1,4,3]],null,[[4,3,2,1],null,[3,4,1,2]]],y:[[[3,2,1,4],null,[2,3,4,1]],null,[[4,1,2,3],null,[1,4,3,2]]]}[e][h][d];return n.segment===m[3]||n.segment===m[2]&&p?o[e]:n.segment===m[2]&&g<f?s[e]:n.segment===m[2]&&g>=f||n.segment===m[1]&&!p?a[e]:n.segment===m[0]||n.segment===m[1]&&p?r[e]:void 0},orthogonal:function(e,n,i,o,s){var r=t,a={x:-1===r.so[0]?Math.min(n,o):Math.max(n,o),y:-1===r.so[1]?Math.min(n,o):Math.max(n,o)}[e];return{x:[[a,i],[a,s],[o,s]],y:[[i,a],[s,a],[s,o]]}[e]},opposite:function(n,o,s,r){var a=t,l={x:"y",y:"x"}[n],u={x:"height",y:"width"}[n],c=a["is"+n.toUpperCase()+"GreaterThanStubTimes2"];if(e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=s+(1-e.sourceEndpoint.anchor[l])*e.sourceInfo[u]+i.maxStub;return{x:[[o,h],[r,h]],y:[[h,o],[h,r]]}[n]}return!c||1===a.so[g]&&o>r||-1===a.so[g]&&o<r?{x:[[o,C],[r,C]],y:[[x,o],[x,r]]}[n]:1===a.so[g]&&o<r||-1===a.so[g]&&o>r?{x:[[x,a.sy],[x,a.ty]],y:[[a.sx,C],[a.tx,C]]}[n]:void 0}}[t.anchorOrientation](t.sourceAxis,v,y,b,P);if(j)for(var E=0;E<j.length;E++)h(n,j[E][0],j[E][1],t);h(n,f[2],f[3],t),h(n,t.tx,t.ty,t),function(t,e,n){for(var o,s,r,a=null,u=0;u<e.length-1;u++){if(a=a||p(e[u]),o=p(e[u+1]),s=c(a),r=c(o),l>0&&a[4]!==o[4]){var h=Math.min(d(a),d(o)),f=Math.min(l,h/2);a[2]-=s[0]*f,a[3]-=s[1]*f,o[0]+=r[0]*f,o[1]+=r[1]*f;var g=s[1]===r[0]&&1===r[0]||s[1]===r[0]&&0===r[0]&&s[0]!==r[1]||s[1]===r[0]&&-1===r[0],m=(o[1]>a[3]?1:-1)==(o[0]>a[2]?1:-1),v=m&&g||!m&&!g?o[0]:a[2],y=m&&g||!m&&!g?a[3]:o[1];i.addSegment(t,"Straight",{x1:a[0],y1:a[1],x2:a[2],y2:a[3]}),i.addSegment(t,"Arc",{r:f,x1:a[2],y1:a[3],x2:o[0],y2:o[1],cx:v,cy:y,ac:g})}else{var b=a[2]===a[0]?0:a[2]>a[0]?n.lw/2:-n.lw/2,P=a[3]===a[1]?0:a[3]>a[1]?n.lw/2:-n.lw/2;i.addSegment(t,"Straight",{x1:a[0]-b,y1:a[1]-P,x2:a[2]+b,y2:a[3]+P})}a=o}null!=o&&i.addSegment(t,"Straight",{x1:o[0],y1:o[1],x2:o[2],y2:o[3]})}(this,n,t)}},e.extend(t.Connectors.Flowchart,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil;t.Connectors.AbstractBezierConnector=function(e){var n,i=!1!==(e=e||{}).showLoopback,o=(e.curviness,e.margin||5),s=(e.proximityLimit,e.orientation&&"clockwise"===e.orientation),r=e.loopbackRadius||25;return this._compute=function(t,e){var a=e.sourcePos,l=e.targetPos,u=Math.abs(a[0]-l[0]),c=Math.abs(a[1]-l[1]);if(i&&e.sourceEndpoint.elementId===e.targetEndpoint.elementId){var h=e.sourcePos[0],d=e.sourcePos[1]-o,p=h,f=d-r,g=p-r,m=f-r;u=2*r,c=2*r,t.points[0]=g,t.points[1]=m,t.points[2]=u,t.points[3]=c,n.addSegment(this,"Arc",{loopback:!0,x1:h-g+4,y1:d-m,startAngle:0,endAngle:2*Math.PI,r:r,ac:!s,x2:h-g-4,y2:d-m,cx:p-g,cy:f-m})}else this._computeBezier(t,e,a,l,u,c)},n=t.Connectors.AbstractConnector.apply(this,arguments)},e.extend(t.Connectors.AbstractBezierConnector,t.Connectors.AbstractConnector);var n=function(e){e=e||{},this.type="Bezier";var n=t.Connectors.AbstractBezierConnector.apply(this,arguments),i=e.curviness||150;this.getCurviness=function(){return i},this._findControlPoint=function(t,e,n,o,s,r,a){var l=[];return r[0]!==a[0]||r[1]===a[1]?(0===a[0]?l.push(n[0]<e[0]?t[0]+10:t[0]-10):l.push(t[0]+i*a[0]),0===a[1]?l.push(n[1]<e[1]?t[1]+10:t[1]-10):l.push(t[1]+i*r[1])):(0===r[0]?l.push(e[0]<n[0]?t[0]+10:t[0]-10):l.push(t[0]-i*r[0]),0===r[1]?l.push(e[1]<n[1]?t[1]+10:t[1]-10):l.push(t[1]+i*a[1])),l},this._computeBezier=function(t,e,i,o,s,r){var a,l,u=i[0]<o[0]?s:0,c=i[1]<o[1]?r:0,h=i[0]<o[0]?0:s,d=i[1]<o[1]?0:r;a=this._findControlPoint([u,c],i,o,e.sourceEndpoint,e.targetEndpoint,t.so,t.to),l=this._findControlPoint([h,d],o,i,e.targetEndpoint,e.sourceEndpoint,t.to,t.so),n.addSegment(this,"Bezier",{x1:u,y1:c,x2:h,y2:d,cp1x:a[0],cp1y:a[1],cp2x:l[0],cp2y:l[1]})}};t.Connectors.Bezier=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){e=e||{},this.type="StateMachine";var n,i=t.Connectors.AbstractBezierConnector.apply(this,arguments),o=e.curviness||10,s=e.margin||5,r=e.proximityLimit||80;e.orientation&&e.orientation;this._computeBezier=function(t,e,a,l,u,c){var h=e.sourcePos[0]<e.targetPos[0]?0:u,d=e.sourcePos[1]<e.targetPos[1]?0:c,p=e.sourcePos[0]<e.targetPos[0]?u:0,f=e.sourcePos[1]<e.targetPos[1]?c:0;0===e.sourcePos[2]&&(h-=s),1===e.sourcePos[2]&&(h+=s),0===e.sourcePos[3]&&(d-=s),1===e.sourcePos[3]&&(d+=s),0===e.targetPos[2]&&(p-=s),1===e.targetPos[2]&&(p+=s),0===e.targetPos[3]&&(f-=s),1===e.targetPos[3]&&(f+=s);var g,m,v,y,b,P,x,C,_=(h+p)/2,j=(d+f)/2,E=(P=d,C=f,(b=h)<=(x=p)&&C<=P?1:b<=x&&P<=C?2:x<=b&&C>=P?3:4),S=Math.sqrt(Math.pow(p-h,2)+Math.pow(f-d,2));g=(n=function(t,e,n,i,o,s,r,a,l){return a<=l?[t,e]:1===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:2===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]>=1&&o[2]<=0?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:3===n?i[3]>=1&&o[3]<=0?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+-1*s,e+-1*r]:4===n?i[3]<=0&&o[3]>=1?[t+(i[2]<.5?-1*s:s),e]:i[2]<=0&&o[2]>=1?[t,e+(i[3]<.5?-1*r:r)]:[t+s,e+-1*r]:void 0}(_,j,E,e.sourcePos,e.targetPos,o,o,S,r))[0],m=n[0],v=n[1],y=n[1],i.addSegment(this,"Bezier",{x1:p,y1:f,x2:h,y2:d,cp1x:g,cp1y:v,cp2x:m,cp2y:y})}};t.Connectors.StateMachine=n,e.extend(n,t.Connectors.AbstractBezierConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n=function(e){this.type="Straight";var n=t.Connectors.AbstractConnector.apply(this,arguments);this._compute=function(t,e){n.addSegment(this,"Straight",{x1:t.sx,y1:t.sy,x2:t.startStubX,y2:t.startStubY}),n.addSegment(this,"Straight",{x1:t.startStubX,y1:t.startStubY,x2:t.endStubX,y2:t.endStubY}),n.addSegment(this,"Straight",{x1:t.endStubX,y1:t.endStubY,x2:t.tx,y2:t.ty})}};t.Connectors.Straight=n,e.extend(n,t.Connectors.AbstractConnector)}.call("undefined"!=typeof window?window:s),function(){var t=this.jsPlumb,e=this.jsPlumbUtil,n={"stroke-linejoin":"stroke-linejoin","stroke-dashoffset":"stroke-dashoffset","stroke-linecap":"stroke-linecap"},i="http://www.w3.org/2000/svg",o=function(t,e){for(var n in e)t.setAttribute(n,""+e[n])},s=function(e,n){return(n=n||{}).version="1.1",n.xmlns=i,t.createElementNS(i,e,null,null,n)},r=function(t){return"position:absolute;left:"+t[0]+"px;top:"+t[1]+"px"},a=function(t){for(var e=t.querySelectorAll(" defs,linearGradient,radialGradient"),n=0;n<e.length;n++)e[n].parentNode.removeChild(e[n])},l=function(t,e,i,o,r){if(e.setAttribute("fill",i.fill?i.fill:"none"),e.setAttribute("stroke",i.stroke?i.stroke:"none"),i.gradient?function(t,e,n,i,o){var r,l="jsplumb_gradient_"+o._jsPlumb.instance.idstamp();a(t),r=n.gradient.offset?s("radialGradient",{id:l}):s("linearGradient",{id:l,gradientUnits:"userSpaceOnUse"});var u=s("defs");t.appendChild(u),u.appendChild(r);for(var c=0;c<n.gradient.stops.length;c++){var h=1===o.segment||2===o.segment?c:n.gradient.stops.length-1-c,d=n.gradient.stops[h][1],p=s("stop",{offset:Math.floor(100*n.gradient.stops[c][0])+"%","stop-color":d});r.appendChild(p)}var f=n.stroke?"stroke":"fill";e.setAttribute(f,"url(#"+l+")")}(t,e,i,0,r):(a(t),e.setAttribute("style","")),i.strokeWidth&&e.setAttribute("stroke-width",i.strokeWidth),i.dashstyle&&i.strokeWidth&&!i["stroke-dasharray"]){var l=-1===i.dashstyle.indexOf(",")?" ":",",u=i.dashstyle.split(l),c="";u.forEach(function(t){c+=Math.floor(t*i.strokeWidth)+l}),e.setAttribute("stroke-dasharray",c)}else i["stroke-dasharray"]&&e.setAttribute("stroke-dasharray",i["stroke-dasharray"]);for(var h in n)i[h]&&e.setAttribute(n[h],i[h])},u=function(t,e,n){t.childNodes.length>n?t.insertBefore(e,t.childNodes[n]):t.appendChild(e)};e.svg={node:s,attr:o,pos:r};var c=function(n){var i=n.pointerEventsSpec||"all",a={};t.jsPlumbUIComponent.apply(this,n.originalArgs),this.canvas=null,this.path=null,this.svg=null,this.bgCanvas=null;var l=n.cssClass+" "+(n.originalArgs[0].cssClass||""),u={style:"",width:0,height:0,"pointer-events":i,position:"absolute"};this.svg=s("svg",u),n.useDivWrapper?(this.canvas=t.createElement("div",{position:"absolute"}),e.sizeElement(this.canvas,0,0,1,1),this.canvas.className=l):(o(this.svg,{class:l}),this.canvas=this.svg),n._jsPlumb.appendElement(this.canvas,n.originalArgs[0].parent),n.useDivWrapper&&this.canvas.appendChild(this.svg);var c=[this.canvas];return this.getDisplayElements=function(){return c},this.appendDisplayElement=function(t){c.push(t)},this.paint=function(t,i,s){if(null!=t){var l,u=[this.x,this.y],c=[this.w,this.h];null!=s&&(s.xmin<0&&(u[0]+=s.xmin),s.ymin<0&&(u[1]+=s.ymin),c[0]=s.xmax+(s.xmin<0?-s.xmin:0),c[1]=s.ymax+(s.ymin<0?-s.ymin:0)),n.useDivWrapper?(e.sizeElement(this.canvas,u[0],u[1],c[0]>0?c[0]:1,c[1]>0?c[1]:1),u[0]=0,u[1]=0,l=r([0,0])):l=r([u[0],u[1]]),a.paint.apply(this,arguments),o(this.svg,{style:l,width:c[0]||1,height:c[1]||1})}},{renderer:a}};e.extend(c,t.jsPlumbUIComponent,{cleanup:function(t){t||null==this.typeId?(this.canvas&&(this.canvas._jsPlumb=null),this.svg&&(this.svg._jsPlumb=null),this.bgCanvas&&(this.bgCanvas._jsPlumb=null),this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.svg=null,this.canvas=null,this.path=null,this.group=null,this._jsPlumb=null):(this.canvas&&this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas),this.bgCanvas&&this.bgCanvas.parentNode&&this.bgCanvas.parentNode.removeChild(this.bgCanvas))},reattach:function(t){var e=t.getContainer();this.canvas&&null==this.canvas.parentNode&&e.appendChild(this.canvas),this.bgCanvas&&null==this.bgCanvas.parentNode&&e.appendChild(this.bgCanvas)},setVisible:function(t){this.canvas&&(this.canvas.style.display=t?"block":"none")}}),t.ConnectorRenderers.svg=function(e){var n=this;c.apply(this,[{cssClass:e._jsPlumb.connectorClass,originalArgs:arguments,pointerEventsSpec:"none",_jsPlumb:e._jsPlumb}]).renderer.paint=function(i,r,a){var c=n.getSegments(),h=[0,0];if(a.xmin<0&&(h[0]=-a.xmin),a.ymin<0&&(h[1]=-a.ymin),c.length>0){var d={d:n.getPathData(),transform:"translate("+h[0]+","+h[1]+")","pointer-events":e["pointer-events"]||"visibleStroke"},p=null;n.x,n.y,n.w,n.h;if(i.outlineStroke){var f=i.outlineWidth||1,g=i.strokeWidth+2*f;delete(p=t.extend({},i)).gradient,p.stroke=i.outlineStroke,p.strokeWidth=g,null==n.bgPath?(n.bgPath=s("path",d),t.addClass(n.bgPath,t.connectorOutlineClass),u(n.svg,n.bgPath,0)):o(n.bgPath,d),l(n.svg,n.bgPath,p,0,n)}null==n.path?(n.path=s("path",d),u(n.svg,n.path,i.outlineStroke?1:0)):o(n.path,d),l(n.svg,n.path,i,0,n)}}},e.extend(t.ConnectorRenderers.svg,c);var h=t.SvgEndpoint=function(e){c.apply(this,[{cssClass:e._jsPlumb.endpointClass,originalArgs:arguments,pointerEventsSpec:"all",useDivWrapper:!0,_jsPlumb:e._jsPlumb}]).renderer.paint=function(e){var n=t.extend({},e);n.outlineStroke&&(n.stroke=n.outlineStroke),null==this.node?(this.node=this.makeNode(n),this.svg.appendChild(this.node)):null!=this.updateNode&&this.updateNode(this.node),l(this.svg,this.node,n,(this.x,this.y,this.w,this.h),this),r(this.node,(this.x,this.y))}.bind(this)};e.extend(h,c),t.Endpoints.svg.Dot=function(){t.Endpoints.Dot.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("circle",{cx:this.w/2,cy:this.h/2,r:this.radius})},this.updateNode=function(t){o(t,{cx:this.w/2,cy:this.h/2,r:this.radius})}},e.extend(t.Endpoints.svg.Dot,[t.Endpoints.Dot,h]),t.Endpoints.svg.Rectangle=function(){t.Endpoints.Rectangle.apply(this,arguments),h.apply(this,arguments),this.makeNode=function(t){return s("rect",{width:this.w,height:this.h})},this.updateNode=function(t){o(t,{width:this.w,height:this.h})}},e.extend(t.Endpoints.svg.Rectangle,[t.Endpoints.Rectangle,h]),t.Endpoints.svg.Image=t.Endpoints.Image,t.Endpoints.svg.Blank=t.Endpoints.Blank,t.Overlays.svg.Label=t.Overlays.Label,t.Overlays.svg.Custom=t.Overlays.Custom;var d=function(e,n){e.apply(this,n),t.jsPlumbUIComponent.apply(this,n),this.isAppendedAtTopLevel=!1,this.path=null,this.paint=function(t,e){if(t.component.svg&&e){null==this.path&&(this.path=s("path",{"pointer-events":"all"}),t.component.svg.appendChild(this.path),this.elementCreated&&this.elementCreated(this.path,t.component),this.canvas=t.component.svg);var r=n&&1===n.length&&n[0].cssClass||"",a=[0,0];e.xmin<0&&(a[0]=-e.xmin),e.ymin<0&&(a[1]=-e.ymin),o(this.path,{d:i(t.d),class:r,stroke:t.stroke?t.stroke:null,fill:t.fill?t.fill:null,transform:"translate("+a[0]+","+a[1]+")"})}};var i=function(t){return isNaN(t.cxy.x)||isNaN(t.cxy.y)?"":"M"+t.hxy.x+","+t.hxy.y+" L"+t.tail[0].x+","+t.tail[0].y+" L"+t.cxy.x+","+t.cxy.y+" L"+t.tail[1].x+","+t.tail[1].y+" L"+t.hxy.x+","+t.hxy.y};this.transfer=function(t){t.canvas&&this.path&&this.path.parentNode&&(this.path.parentNode.removeChild(this.path),t.canvas.appendChild(this.path))}},p={cleanup:function(t){null!=this.path&&(t?this._jsPlumb.instance.removeElement(this.path):this.path.parentNode&&this.path.parentNode.removeChild(this.path))},reattach:function(t,e){this.path&&e.canvas&&e.canvas.appendChild(this.path)},setVisible:function(t){null!=this.path&&(this.path.style.display=t?"block":"none")}};e.extend(d,[t.jsPlumbUIComponent,t.Overlays.AbstractOverlay]),t.Overlays.svg.Arrow=function(){d.apply(this,[t.Overlays.Arrow,arguments])},e.extend(t.Overlays.svg.Arrow,[t.Overlays.Arrow,d],p),t.Overlays.svg.PlainArrow=function(){d.apply(this,[t.Overlays.PlainArrow,arguments])},e.extend(t.Overlays.svg.PlainArrow,[t.Overlays.PlainArrow,d],p),t.Overlays.svg.Diamond=function(){d.apply(this,[t.Overlays.Diamond,arguments])},e.extend(t.Overlays.svg.Diamond,[t.Overlays.Diamond,d],p),t.Overlays.svg.GuideLines=function(){var e,n,i=null,r=this;t.Overlays.GuideLines.apply(this,arguments),this.paint=function(t,l){null==i&&(i=s("path"),t.connector.svg.appendChild(i),r.attachListeners(i,t.connector),r.attachListeners(i,r),e=s("path"),t.connector.svg.appendChild(e),r.attachListeners(e,t.connector),r.attachListeners(e,r),n=s("path"),t.connector.svg.appendChild(n),r.attachListeners(n,t.connector),r.attachListeners(n,r));var u=[0,0];l.xmin<0&&(u[0]=-l.xmin),l.ymin<0&&(u[1]=-l.ymin),o(i,{d:a(t.head,t.tail),stroke:"red",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(e,{d:a(t.tailLine[0],t.tailLine[1]),stroke:"blue",fill:null,transform:"translate("+u[0]+","+u[1]+")"}),o(n,{d:a(t.headLine[0],t.headLine[1]),stroke:"green",fill:null,transform:"translate("+u[0]+","+u[1]+")"})};var a=function(t,e){return"M "+t.x+","+t.y+" L"+e.x+","+e.y}},e.extend(t.Overlays.svg.GuideLines,t.Overlays.GuideLines)}.call("undefined"!=typeof window?window:s),function(){var t=this,e=t.jsPlumb,n=t.jsPlumbUtil,i=t.Katavorio,o=t.Biltong,s=function(t,n){var s="_katavorio_"+(n=n||"main"),r=t[s],a=t.getEventManager();return r||((r=new i({bind:a.on,unbind:a.off,getSize:e.getSize,getConstrainingRectangle:function(t){return[t.parentNode.scrollWidth,t.parentNode.scrollHeight]},getPosition:function(e,n){var i=t.getOffset(e,n,e._katavorioDrag?e.offsetParent:null);return[i.left,i.top]},setPosition:function(t,e){t.style.left=e[0]+"px",t.style.top=e[1]+"px"},addClass:e.addClass,removeClass:e.removeClass,intersects:o.intersects,indexOf:function(t,e){return t.indexOf(e)},scope:t.getDefaultScope(),css:{noSelect:t.dragSelectClass,droppable:"jtk-droppable",draggable:"jtk-draggable",drag:"jtk-drag",selected:"jtk-drag-selected",active:"jtk-drag-active",hover:"jtk-drag-hover",ghostProxy:"jtk-ghost-proxy"}})).setZoom(t.getZoom()),t[s]=r,t.bind("zoom",r.setZoom)),r},r=function(t,e){if(null==e)return[0,0];var n=h(e),i=c(n,0);return[i[t+"X"],i[t+"Y"]]},a=r.bind(this,"page"),l=r.bind(this,"screen"),u=r.bind(this,"client"),c=function(t,e){return t.item?t.item(e):t[e]},h=function(t){return t.touches&&t.touches.length>0?t.touches:t.changedTouches&&t.changedTouches.length>0?t.changedTouches:t.targetTouches&&t.targetTouches.length>0?t.targetTouches:[t]},d=function(t){var e={},n=[],i={},o={},s={};this.register=function(r){var a,l=t.getId(r);e[l]||(e[l]=r,n.push(r),i[l]={});var u=function(e){if(e)for(var n=0;n<e.childNodes.length;n++)if(3!==e.childNodes[n].nodeType&&8!==e.childNodes[n].nodeType){var c=jsPlumb.getElement(e.childNodes[n]),h=t.getId(e.childNodes[n],null,!0);if(h&&o[h]&&o[h]>0){a||(a=t.getOffset(r));var d=t.getOffset(c);i[l][h]={id:h,offset:{left:d.left-a.left,top:d.top-a.top}},s[h]=l}u(e.childNodes[n])}};u(r)},this.updateOffsets=function(e,n){if(null!=e){n=n||{};var o,r=jsPlumb.getElement(e),a=t.getId(r),l=i[a];if(l)for(var u in l)if(l.hasOwnProperty(u)){var c=jsPlumb.getElement(u),h=n[u]||t.getOffset(c);if(null==c.offsetParent&&null!=i[a][u])continue;o||(o=t.getOffset(r)),i[a][u]={id:u,offset:{left:h.left-o.left,top:h.top-o.top}},s[u]=a}}},this.endpointAdded=function(n,r){r=r||t.getId(n);var a=document.body,l=n.parentNode;for(o[r]=o[r]?o[r]+1:1;null!=l&&l!==a;){var u=t.getId(l,null,!0);if(u&&e[u]){var c=t.getOffset(l);if(null==i[u][r]){var h=t.getOffset(n);i[u][r]={id:r,offset:{left:h.left-c.left,top:h.top-c.top}},s[r]=u}break}l=l.parentNode}},this.endpointDeleted=function(t){if(o[t.elementId]&&(o[t.elementId]--,o[t.elementId]<=0))for(var e in i)i.hasOwnProperty(e)&&i[e]&&(delete i[e][t.elementId],delete s[t.elementId])},this.changeId=function(t,e){i[e]=i[t],i[t]={},s[e]=s[t],s[t]=null},this.getElementsForDraggable=function(t){return i[t]},this.elementRemoved=function(t){var e=s[t];e&&(i[e]&&delete i[e][t],delete s[t])},this.reset=function(){e={},n=[],i={},o={}},this.dragEnded=function(e){if(null!=e.offsetParent){var n=t.getId(e),i=s[n];i&&this.updateOffsets(i)}},this.setParent=function(e,n,o,r,a){var l=s[n];i[r]||(i[r]={});var u=t.getOffset(o),c=a||t.getOffset(e);l&&i[l]&&delete i[l][n],i[r][n]={id:n,offset:{left:c.left-u.left,top:c.top-u.top}},s[n]=r},this.clearParent=function(t,e){var n=s[e];n&&(delete i[n][e],delete s[e])},this.revalidateParent=function(e,n,i){var o=s[n];if(o){var r={};r[n]=i,this.updateOffsets(o,r),t.revalidate(o)}},this.getDragAncestor=function(e){var n=jsPlumb.getElement(e),i=t.getId(n),o=s[i];return o?jsPlumb.getElement(o):null}},p=function(t,e,i){e=n.fastTrim(e),void 0!==t.className.baseVal?t.className.baseVal=e:t.className=e;try{var o=t.classList;if(null!=o){for(;o.length>0;)o.remove(o.item(0));for(var s=0;s<i.length;s++)i[s]&&o.add(i[s])}}catch(t){n.log("JSPLUMB: cannot set class list",t)}},f=function(t){return void 0===t.className.baseVal?t.className:t.className.baseVal},g=function(t,e,i){e=null==e?[]:n.isArray(e)?e:e.split(/\s+/),i=null==i?[]:n.isArray(i)?i:i.split(/\s+/);var o=f(t).split(/\s+/),s=function(t,e){for(var n=0;n<e.length;n++)if(t)-1===o.indexOf(e[n])&&o.push(e[n]);else{var i=o.indexOf(e[n]);-1!==i&&o.splice(i,1)}};s(!0,e),s(!1,i),p(t,o.join(" "),o)};t.jsPlumb.extend(t.jsPlumbInstance.prototype,{headless:!1,pageLocation:a,screenLocation:l,clientLocation:u,getDragManager:function(){return null==this.dragManager&&(this.dragManager=new d(this)),this.dragManager},recalculateOffsets:function(t){this.getDragManager().updateOffsets(t)},createElement:function(t,e,n,i){return this.createElementNS(null,t,e,n,i)},createElementNS:function(t,e,n,i,o){var s,r=null==t?document.createElement(e):document.createElementNS(t,e);for(s in n=n||{})r.style[s]=n[s];for(s in i&&(r.className=i),o=o||{})r.setAttribute(s,""+o[s]);return r},getAttribute:function(t,e){return null!=t.getAttribute?t.getAttribute(e):null},setAttribute:function(t,e,n){null!=t.setAttribute&&t.setAttribute(e,n)},setAttributes:function(t,e){for(var n in e)e.hasOwnProperty(n)&&t.setAttribute(n,e[n])},appendToRoot:function(t){document.body.appendChild(t)},getRenderModes:function(){return["svg"]},getClass:f,addClass:function(t,e){jsPlumb.each(t,function(t){g(t,e)})},hasClass:function(t,e){return(t=jsPlumb.getElement(t)).classList?t.classList.contains(e):-1!==f(t).indexOf(e)},removeClass:function(t,e){jsPlumb.each(t,function(t){g(t,null,e)})},toggleClass:function(t,e){jsPlumb.hasClass(t,e)?jsPlumb.removeClass(t,e):jsPlumb.addClass(t,e)},updateClasses:function(t,e,n){jsPlumb.each(t,function(t){g(t,e,n)})},setClass:function(t,e){null!=e&&jsPlumb.each(t,function(t){p(t,e,e.split(/\s+/))})},setPosition:function(t,e){t.style.left=e.left+"px",t.style.top=e.top+"px"},getPosition:function(t){var e=function(e){var n=t.style[e];return n?n.substring(0,n.length-2):0};return{left:e("left"),top:e("top")}},getStyle:function(t,e){return void 0!==window.getComputedStyle?getComputedStyle(t,null).getPropertyValue(e):t.currentStyle[e]},getSelector:function(t,e){return 1===arguments.length?null!=t.nodeType?t:document.querySelectorAll(t):t.querySelectorAll(e)},getOffset:function(t,e,n){t=jsPlumb.getElement(t),n=n||this.getContainer();for(var i={left:t.offsetLeft,top:t.offsetTop},o=e||null!=n&&t!==n&&t.offsetParent!==n?t.offsetParent:null,s=function(t){null!=t&&t!==document.body&&(t.scrollTop>0||t.scrollLeft>0)&&(i.left-=t.scrollLeft,i.top-=t.scrollTop)}.bind(this);null!=o;)i.left+=o.offsetLeft,i.top+=o.offsetTop,s(o),o=e?o.offsetParent:o.offsetParent===n?null:o.offsetParent;if(null!=n&&!e&&(n.scrollTop>0||n.scrollLeft>0)){var r=null!=t.offsetParent?this.getStyle(t.offsetParent,"position"):"static",a=this.getStyle(t,"position");"absolute"!==a&&"fixed"!==a&&"absolute"!==r&&"fixed"!==r&&(i.left-=n.scrollLeft,i.top-=n.scrollTop)}return i},getPositionOnElement:function(t,e,n){var i=void 0!==e.getBoundingClientRect?e.getBoundingClientRect():{left:0,top:0,width:0,height:0},o=document.body,s=document.documentElement,r=window.pageYOffset||s.scrollTop||o.scrollTop,a=window.pageXOffset||s.scrollLeft||o.scrollLeft,l=s.clientTop||o.clientTop||0,u=s.clientLeft||o.clientLeft||0,c=i.top+r-l+0*n,h=i.left+a-u+0*n,d=jsPlumb.pageLocation(t),p=i.width||e.offsetWidth*n,f=i.height||e.offsetHeight*n;return[(d[0]-h)/p,(d[1]-c)/f]},getAbsolutePosition:function(t){var e=function(e){var n=t.style[e];if(n)return parseFloat(n.substring(0,n.length-2))};return[e("left"),e("top")]},setAbsolutePosition:function(t,e,n,i){n?this.animate(t,{left:"+="+(e[0]-n[0]),top:"+="+(e[1]-n[1])},i):(t.style.left=e[0]+"px",t.style.top=e[1]+"px")},getSize:function(t){return[t.offsetWidth,t.offsetHeight]},getWidth:function(t){return t.offsetWidth},getHeight:function(t){return t.offsetHeight},getRenderMode:function(){return"svg"},draggable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this._initDraggableIfNecessary(i.el,!0,e,i.id,!0)}.bind(this)),this},snapToGrid:function(t,e,n){var i=[],o=function(t){var o=this.info(t);if(null!=o.el&&o.el._katavorioDrag){var s=o.el._katavorioDrag.snap(e,n);this.revalidate(o.el),i.push([o.el,s])}}.bind(this);if(1===arguments.length||3===arguments.length)o(t,e,n);else{var s=this.getManagedElements();for(var r in s)o(r,arguments[0],arguments[1])}return i},initDraggable:function(t,e,n){s(this,n).draggable(t,e),t._jsPlumbDragOptions=e},destroyDraggable:function(t,e){s(this,e).destroyDraggable(t),t._jsPlumbDragOptions=null,t._jsPlumbRelatedElement=null},unbindDraggable:function(t,e,n,i){s(this,i).destroyDraggable(t,e,n)},setDraggable:function(t,e){return jsPlumb.each(t,function(t){this.isDragSupported(t)&&(this._draggableStates[this.getAttribute(t,"id")]=e,this.setElementDraggable(t,e))}.bind(this))},_draggableStates:{},toggleDraggable:function(t){var e;return jsPlumb.each(t,function(t){var n=this.getAttribute(t,"id");return e=!(e=null!=this._draggableStates[n]&&this._draggableStates[n]),this._draggableStates[n]=e,this.setDraggable(t,e),e}.bind(this)),e},_initDraggableIfNecessary:function(t,e,i,o,s){if(!jsPlumb.headless&&(null!=e&&e&&jsPlumb.isDragSupported(t,this))){var r=i||this.Defaults.DragOptions;if(r=jsPlumb.extend({},r),jsPlumb.isAlreadyDraggable(t,this))i.force&&this.initDraggable(t,r);else{var a=jsPlumb.dragEvents.drag,l=jsPlumb.dragEvents.stop,u=jsPlumb.dragEvents.start;this.manage(o,t),r[u]=n.wrap(r[u],function(t){var e=t.el._jsPlumbDragOptions,n=!0;return e.canDrag&&(n=e.canDrag()),n&&(this.setHoverSuspended(!0),this.select({source:t.el}).addClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:t.el}).addClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),this.setConnectionBeingDragged(!0)),n}.bind(this)),r[a]=n.wrap(r[a],function(t){var e=this.getUIPosition(arguments,this.getZoom());if(null!=e){var n=t.el._jsPlumbDragOptions;this.draw(t.el,e,null,!0),n._dragging&&this.addClass(t.el,"jtk-dragged"),n._dragging=!0}}.bind(this)),r[l]=n.wrap(r[l],function(t){for(var e,n=t.selection,i=function(n){var i;null!=n[1]&&(e=this.getUIPosition([{el:n[2].el,pos:[n[1].left,n[1].top]}]),i=this.draw(n[2].el,e)),null!=n[0]._jsPlumbDragOptions&&delete n[0]._jsPlumbDragOptions._dragging,this.removeClass(n[0],"jtk-dragged"),this.select({source:n[2].el}).removeClass(this.elementDraggingClass+" "+this.sourceElementDraggingClass,!0),this.select({target:n[2].el}).removeClass(this.elementDraggingClass+" "+this.targetElementDraggingClass,!0),t.e._drawResult=t.e._drawResult||{c:[],e:[],a:[]},Array.prototype.push.apply(t.e._drawResult.c,i.c),Array.prototype.push.apply(t.e._drawResult.e,i.e),Array.prototype.push.apply(t.e._drawResult.a,i.a),this.getDragManager().dragEnded(n[2].el)}.bind(this),o=0;o<n.length;o++)i(n[o]);this.setHoverSuspended(!1),this.setConnectionBeingDragged(!1)}.bind(this));var c=this.getId(t);this._draggableStates[c]=!0;var h=this._draggableStates[c];r.disabled=null!=h&&!h,this.initDraggable(t,r),this.getDragManager().register(t),s&&this.fire("elementDraggable",{el:t,options:r})}}},animationSupported:!0,getElement:function(t){return null==t?null:"string"==typeof(t="string"==typeof t?t:null==t.tagName&&null!=t.length&&null==t.enctype?t[0]:t)?document.getElementById(t):t},removeElement:function(t){s(this).elementRemoved(t),this.getEventManager().remove(t)},doAnimate:function(t,i,o){o=o||{};var s=this.getOffset(t),r=function(t,e){var i=function(i){if(null!=e[i]){if(n.isString(e[i])){var o=e[i].match(/-=/)?-1:1,s=e[i].substring(2);return t[i]+o*s}return e[i]}return t[i]};return[i("left"),i("top")]}(s,i),a=r[0]-s.left,l=r[1]-s.top,u=o.duration||250,c=u/15,h=15/u*a,d=15/u*l,p=0,f=setInterval(function(){e.setPosition(t,{left:s.left+h*(p+1),top:s.top+d*(p+1)}),null!=o.step&&o.step(p,Math.ceil(c)),++p>=c&&(window.clearInterval(f),null!=o.complete&&o.complete())},15)},destroyDroppable:function(t,e){s(this,e).destroyDroppable(t)},unbindDroppable:function(t,e,n,i){s(this,i).destroyDroppable(t,e,n)},droppable:function(t,e){var i;return t=n.isArray(t)||null!=t.length&&!n.isString(t)?t:[t],(e=e||{}).allowLoopback=!1,Array.prototype.slice.call(t).forEach(function(t){(i=this.info(t)).el&&this.initDroppable(i.el,e)}.bind(this)),this},initDroppable:function(t,e,n){s(this,n).droppable(t,e)},isAlreadyDraggable:function(t){return null!=t._katavorioDrag},isDragSupported:function(t,e){return!0},isDropSupported:function(t,e){return!0},isElementDraggable:function(t){return(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.isEnabled()},getDragObject:function(t){return t[0].drag.getDragElement()},getDragScope:function(t){return t._katavorioDrag&&t._katavorioDrag.scopes.join(" ")||""},getDropEvent:function(t){return t[0].e},getUIPosition:function(t,e){var n=t[0].el;if(null==n.offsetParent)return null;var i=t[0].finalPos||t[0].pos,o={left:i[0],top:i[1]};if(n._katavorioDrag&&n.offsetParent!==this.getContainer()){var s=this.getOffset(n.offsetParent);o.left+=s.left,o.top+=s.top}return o},setDragFilter:function(t,e,n){t._katavorioDrag&&t._katavorioDrag.setFilter(e,n)},setElementDraggable:function(t,n){(t=e.getElement(t))._katavorioDrag&&t._katavorioDrag.setEnabled(n)},setDragScope:function(t,e){t._katavorioDrag&&t._katavorioDrag.k.setDragScope(t,e)},setDropScope:function(t,e){t._katavorioDrop&&t._katavorioDrop.length>0&&t._katavorioDrop[0].k.setDropScope(t,e)},addToPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.addToPosse.apply(o,t)})},setPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.setPosse.apply(o,t)})},removeFromPosse:function(t,n){var i=Array.prototype.slice.call(arguments,1),o=s(this);e.each(t,function(t){(t=[e.getElement(t)]).push.apply(t,i),o.removeFromPosse.apply(o,t)})},removeFromAllPosses:function(t){var n=s(this);e.each(t,function(t){n.removeFromAllPosses(e.getElement(t))})},setPosseState:function(t,n,i){var o=s(this);e.each(t,function(t){o.setPosseState(e.getElement(t),n,i)})},dragEvents:{start:"start",stop:"stop",drag:"drag",step:"step",over:"over",out:"out",drop:"drop",complete:"complete",beforeStart:"beforeStart"},animEvents:{step:"step",complete:"complete"},stopDrag:function(t){t._katavorioDrag&&t._katavorioDrag.abort()},addToDragSelection:function(t){var e=this.getElement(t);null==e||!e._isJsPlumbGroup&&null!=e._jsPlumbGroup||s(this).select(t)},removeFromDragSelection:function(t){s(this).deselect(t)},getDragSelection:function(){return s(this).getSelection()},clearDragSelection:function(){s(this).deselectAll()},trigger:function(t,e,n,i){this.getEventManager().trigger(t,e,n,i)},doReset:function(){for(var t in this)0===t.indexOf("_katavorio_")&&this[t].reset()},getEventManager:function(){return(n=(e=this)._mottle)||(n=e._mottle=new t.Mottle),n;var e,n},on:function(t,e,n){return this.getEventManager().on.apply(this,arguments),this},off:function(t,e,n){return this.getEventManager().off.apply(this,arguments),this}});var m,v;m=e.init,(v=function(){/complete|loaded|interactive/.test(document.readyState)&&void 0!==document.body&&null!=document.body?m():setTimeout(v,9)})()}.call("undefined"!=typeof window?window:s)}(r={exports:{}},r.exports),r.exports),l=(a.jsBezier,a.Biltong,a.Mottle,a.Katavorio,a.jsPlumbUtil,a.jsPlumb);var u=function(t,e,n,i,o,s,r,a,l,u){"boolean"!=typeof r&&(l=a,a=r,r=!1);var c,h="function"==typeof n?n.options:n;if(t&&t.render&&(h.render=t.render,h.staticRenderFns=t.staticRenderFns,h._compiled=!0,o&&(h.functional=!0)),i&&(h._scopeId=i),s?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),e&&e.call(this,l(t)),t&&t._registeredComponents&&t._registeredComponents.add(s)},h._ssrRegister=c):e&&(c=r?function(){e.call(this,u(this.$root.$options.shadowRoot))}:function(t){e.call(this,a(t))}),c)if(h.functional){var d=h.render;h.render=function(t,e){return c.call(e),d(t,e)}}else{var p=h.beforeCreate;h.beforeCreate=p?[].concat(p,c):[c]}return n},c="undefined"!=typeof navigator&&/msie [6-9]\\b/.test(navigator.userAgent.toLowerCase());var h=document.head||document.getElementsByTagName("head")[0],d={};var p=function(t){return function(t,e){return function(t,e){var n=c?e.media||"default":t,i=d[n]||(d[n]={ids:new Set,styles:[]});if(!i.ids.has(t)){i.ids.add(t);var o=e.source;if(e.map&&(o+="\n/*# sourceURL="+e.map.sources[0]+" */",o+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(e.map))))+" */"),i.element||(i.element=document.createElement("style"),i.element.type="text/css",e.media&&i.element.setAttribute("media",e.media),h.appendChild(i.element)),"styleSheet"in i.element)i.styles.push(o),i.element.styleSheet.cssText=i.styles.filter(Boolean).join("\n");else{var s=i.ids.size-1,r=document.createTextNode(o),a=i.element.childNodes;a[s]&&i.element.removeChild(a[s]),a.length?i.element.insertBefore(r,a[s]):i.element.appendChild(r)}}}(t,e)}},f=u({render:function(){var t=this,e=t.$createElement;return(t._self._c||e)("div",{staticClass:"palette-panel"},[t._t("palette",function(){return[t._m(0)]})],2)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("ul",{staticClass:"palette-group"},[e("li",[e("div",{staticClass:"palette-default-item startpoint",attrs:{"data-type":"startpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item endpoint",attrs:{"data-type":"endpoint"}})]),e("li",[e("div",{staticClass:"palette-default-item tasknode",attrs:{"data-type":"tasknode"}})]),e("li",[e("div",{staticClass:"palette-default-item gateway",attrs:{"data-type":"gateway"}})])])}]},function(t){t&&t("data-v-09b6e314_0",{source:".palette-group{margin:0;padding:0;background:#fcfcfc;text-align:center;list-style:none}.palette-group>li{padding:14px 0}.palette-default-item{display:inline-block;width:40px;height:40px;font-size:12px;color:#888;border:1px solid #999;border-radius:2px;cursor:pointer;user-select:none}.palette-default-item:hover{box-shadow:0 0 8px rgba(50,50,50,.3)}.startpoint{border-radius:50%;border:4px solid #6a6c8a}.endpoint{border-radius:50%;background:#6a6c8a}.tasknode{height:30px;border:2px solid #33d0c6}.gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}",map:void 0,media:void 0})},{name:"PalettePanel",props:["selector"],data:function(){return{}}},void 0,!1,void 0,p,void 0),g=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"tool-panel"},t._l(t.tools,function(e,i){return n("div",{key:i,class:["tool-item",e.cls,{actived:"frameSelect"===e.type&&t.isFrameSelecting}],on:{click:function(n){return t.onToolClick(e)}}},[t._v("\n        "+t._s(e.name)+"\n    ")])}),0)},staticRenderFns:[]},function(t){t&&t("data-v-2c518942_0",{source:".tool-item{display:inline-block;margin-right:10px;user-select:none;cursor:pointer}.tool-item:last-child{margin-right:0}.tool-item.actived{color:#3a84ff}",map:void 0,media:void 0})},{name:"ToolPanel",props:["tools","isFrameSelecting"],data:function(){return{}},methods:{onToolClick:function(t){this.$emit("onToolClick",t)}}},void 0,!1,void 0,p,void 0),m=u({render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"bk-flow-location",on:{mousedown:this.onMouseDown,mouseup:this.onMouseUp}},["startpoint"===this.node.type?e("div",{staticClass:"circle-node startpoint"}):"endpoint"===this.node.type?e("div",{staticClass:"circle-node endpoint"}):"tasknode"===this.node.type?e("div",{staticClass:"tasknode"}):"gateway"===this.node.type?e("div",{staticClass:"gateway"}):e("div",{staticClass:"node-default"})])},staticRenderFns:[]},function(t){t&&t("data-v-0604134d_0",{source:".bk-flow-location .circle-node{width:30px;height:30px;border-radius:50%;text-align:center}.bk-flow-location .startpoint{border:4px solid #6a6c8a}.bk-flow-location .endpoint{background:#6a6c8a}.bk-flow-location .tasknode{width:80px;height:50px;border:2px solid #33d0c6}.bk-flow-location .gateway{width:30px;height:30px;background:#7c68fc;transform:rotate(-45deg)}.bk-flow-location .node-default{width:120px;height:80px;line-height:80px;border:1px solid #ccc;border-radius:2px;text-align:center}.bk-flow-location .node-default.selected{border:1px solid #3a84ff}",map:void 0,media:void 0})},{name:"NodeTemplate",props:{node:{type:Object,default:function(){return{}}}},data:function(){return{moveFlag:{x:0,y:0,moved:!1}}},methods:{onMouseDown:function(t){this.moveFlag={x:t.pageX,y:t.pageY,moved:!1},this.$el.addEventListener("mousemove",this.mouseMoveHandler)},onMouseUp:function(t){var e=t.pageX,n=t.pageY;this.moveFlag.x=e,this.moveFlag.y=n,this.moveFlag.moved?(console.log("drag event"),this.moveFlag.moved=!1):console.log("click event"),this.$el.removeEventListener("mousemove",this.mouseMoveHandler)},mouseMoveHandler:function(t){var e=t.pageX,n=t.pageY;(Math.abs(e-this.moveFlag.x)>2||Math.abs(n-this.moveFlag.y)>2)&&(this.moveFlag.moved=!0)}}},void 0,!1,void 0,p,void 0);function v(t){return"touches"in t?t.touches[0]:t}var y={grid:[5,5]},b={connector:["Bezier",{curviness:30}],paintStyle:{strokeWidth:2,stroke:"#567567",outlineStroke:"tranparent",outlineWidth:6},hoverPaintStyle:{fill:"transparent",stroke:"#3a84ff"}},P={endpoint:"Dot",connector:["Flowchart",{stub:[1,6],alwaysRespectStub:!0,gap:8,cornerRadius:2}],connectorOverlays:[["PlainArrow",{width:8,length:6,location:1,id:"arrow"}]],paintStyle:{fill:"#3a84ff",radius:5},anchor:["Left","Right","Top","Bottom"],isSource:!0,isTarget:!0};function x(){for(var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e="",n=0;n<7;n++)e+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return t+e}var C={showPalette:{type:Boolean,default:!0},showTool:{type:Boolean,default:!0},tools:{type:Array,default:function(){return[{type:"zoomIn",name:"放大",cls:"tool-item"},{type:"zoomOut",name:"缩小",cls:"tool-item"},{type:"resetPosition",name:"重置",cls:"tool-item"}]}},editable:{type:Boolean,default:!0},selector:{type:String,default:"palette-default-item"},data:{type:Object,default:function(){return{nodes:[],lines:[]}}},nodeOptions:{type:Object,default:function(){return e({},y)}},connectorOptions:{type:Object,default:function(){return e({},b)}},endpointOptions:{type:Object,default:function(){return e({},P)}}},_={mousedown:"ontouchstart"in document.documentElement?"touchstart":"mousedown",mousemove:"ontouchmove"in document.documentElement?"touchmove":"mousemove",mouseup:"ontouchend"in document.documentElement?"touchend":"mouseup"},j=u({render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{class:["jsflow",{editable:t.editable}]},[n("div",{staticClass:"canvas-area"},[t.showTool?n("div",{staticClass:"tool-panel-wrap"},[t._t("toolPanel",function(){return[n("tool-panel",{attrs:{tools:t.tools,"is-frame-selecting":t.isFrameSelecting},on:{onToolClick:t.onToolClick}})]})],2):t._e(),t.showPalette?n("div",{ref:"palettePanel",staticClass:"palette-panel-wrap"},[t._t("palettePanel",function(){return[n("palette-panel",{attrs:{selector:t.selector}})]})],2):t._e(),n("div",{ref:"canvasFlowWrap",staticClass:"canvas-flow-wrap",style:t.canvasWrapStyle,on:t._d({},[t.mousedown,t.onCanvasMouseDown,t.mouseup,t.onCanvasMouseUp])},[n("div",{ref:"canvasFlow",staticClass:"canvas-flow",attrs:{id:"canvas-flow"}},[t._l(t.nodes,function(e){return n("div",{key:e.id},[n("div",{staticClass:"jsflow-node canvas-node",attrs:{id:e.id},on:{mouseenter:function(n){return t.toggleHighLight(e,!0)},mouseleave:function(n){return t.toggleHighLight(e,!1)}}},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:e}})]},{node:e})],2)])}),n("div",{staticClass:"reference-line-vertical"}),n("div",{staticClass:"reference-line-horizontal"})],2),t.isFrameSelecting?n("div",{staticClass:"canvas-frame-selector",style:t.frameSelectorStyle}):t._e()]),t.showAddingNode?n("div",{staticClass:"jsflow-node adding-node",style:t.setNodeInitialPos(t.addingNodeConfig)},[t._t("nodeTemplate",function(){return[n("node-template",{attrs:{node:t.addingNodeConfig}})]},{node:t.addingNodeConfig})],2):t._e()])])},staticRenderFns:[]},function(t){t&&t("data-v-6bebbff3_0",{source:".jsflow{height:100%;border:1px solid #ccc}.jsflow .canvas-area{position:relative;height:100%}.jsflow .tool-panel-wrap{position:absolute;top:20px;left:70px;padding:10px 20px;background:#c4c6cc;opacity:.65;border-radius:4px;z-index:4}.jsflow .palette-panel-wrap{float:left;width:60px;height:100%;border-right:1px solid #ccc}.jsflow .canvas-flow-wrap{position:relative;height:100%;overflow:hidden}.jsflow .canvas-flow{position:relative;min-width:100%;min-height:100%}.jsflow .canvas-frame-selector{position:absolute;border:1px solid #3a84ff;background:rgba(58,132,255,.15)}.jsflow .jsflow-node{position:absolute;user-select:none}.jsflow .jtk-endpoint{z-index:1;cursor:pointer}.jsflow .adding-node{opacity:.8}.jsflow .jtk-endpoint.jtk-dragging{z-index:0}.jsflow .jtk-connector{cursor:pointer}.jsflow .reference-line-vertical{display:none;position:absolute;top:-100000px;bottom:-100000px;left:0;width:2px;background:rgba(30,144,255,.8);z-index:1}.jsflow .reference-line-horizontal{display:none;position:absolute;left:-100000px;right:-100000px;top:0;height:2px;background:rgba(30,144,255,.8);z-index:1}",map:void 0,media:void 0})},{name:"JsFlow",components:{PalettePanel:f,ToolPanel:g,NodeTemplate:m},model:{prop:"data",event:"change"},props:C,data:function(){var t=this.data;return e({nodes:t.nodes,lines:t.lines,canvasGrabbing:!1,isFrameSelecting:!1,frameMoving:null,mouseDownPos:{},canvasPos:{x:0,y:0},canvasOffset:{x:0,y:0},frameSelectorPos:{x:0,y:0},frameSelectorRect:{width:0,height:0},selectedNodes:[],showAddingNode:!1,addingNodeConfig:{},addingNodeRect:{},canvasRect:{},paletteRect:{},zoom:1,moveTimer:null},_)},computed:{canvasWrapStyle:function(){return{cursor:this.isFrameSelecting?"crosshair":this.canvasGrabbing?"-webkit-grabbing":"-webkit-grab"}},frameSelectorStyle:function(){return{left:"".concat(this.frameSelectorPos.x,"px"),top:"".concat(this.frameSelectorPos.y,"px"),width:"".concat(this.frameSelectorRect.width,"px"),height:"".concat(this.frameSelectorRect.height,"px")}}},watch:{"data.nodes":{handler:function(t){this.nodes=t},deep:!0},editable:function(t){var e=this.$el.querySelectorAll(".canvas-node");this.toggleNodeDraggable(e,t)}},mounted:function(){this.initCanvas(),this.registerEvent(),this.renderData(),this.$refs.palettePanel&&(this.paletteRect=this.$refs.palettePanel.getBoundingClientRect(),this.registerPaletteEvent())},beforeDestroy:function(){this.$refs.palettePanel&&this.$refs.palettePanel.removeEventListener(this.mousedown,this.nodeCreateHandler),this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler)},methods:{initCanvas:function(){var t={},n=e(e({},this.endpointOptions),this.connectorOptions);for(var i in n){var o=i[0].toUpperCase();t["".concat(o).concat(i.slice(1))]=n[i]}this.instance=l.getInstance(e({Container:this.$refs.canvasFlow},t))},registerEvent:function(){var t=this;this.instance.bind("beforeDrag",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrag||t.$listeners.onBeforeDrag(e))}),this.instance.bind("connectionDrag",function(e){"function"==typeof t.$listeners.onConnectionDrag&&t.$emit("onConnectionDrag",e)}),this.instance.bind("beforeDrop",function(e){return!!t.editable&&("function"!=typeof t.$listeners.onBeforeDrop||t.$listeners.onBeforeDrop(e))}),this.instance.bind("connection",function(e){"function"==typeof t.$listeners.onConnection&&t.$emit("onConnection",e)}),this.instance.bind("connectionDragStop",function(e,n){if(!e.target||!e.target.classList.contains("jsflow-node")){var i=t.getNodeByEvent(n.target);if(i){var o=t.nodes.find(function(t){return i.id===t.id});if("function"==typeof t.$listeners.onConnectionDragStop){var s={id:e.source.id,arrow:e.endpoints[0].anchor.type||e.endpoints[0].anchor.cssClass};t.$emit("onConnectionDragOnNode",s,o.id,n)}}"function"==typeof t.$listeners.onConnectionDragStop&&t.$emit("onConnectionDragStop",e)}}),this.instance.bind("beforeDetach",function(e){return"function"!=typeof t.$listeners.onBeforeDetach||t.$listeners.onBeforeDetach(e)}),this.instance.bind("connectionDetached",function(e,n){var i=t.lines.filter(function(t){return t.source.id!==e.sourceId&&t.target.id!==e.targetId});t.lines=i,"function"==typeof t.$listeners.onConnectionDetached&&t.$emit("onConnectionDetached",e)}),this.instance.bind("connectionMoved",function(e,n){"function"==typeof t.$listeners.onConnectionMoved&&t.$emit("onConnectionMoved",lines)}),this.instance.bind("click",function(e,n){"function"==typeof t.$listeners.onConnectionClick&&t.$emit("onConnectionClick",e,n)}),this.instance.bind("dblclick",function(e,n){"function"==typeof t.$listeners.onConnectionDbClick&&t.$emit("onConnectionDbClick",e,n)}),this.instance.bind("endpointClick",function(e,n){"function"==typeof t.$listeners.onEndpointClick&&t.$emit("onEndpointClick",e,n)}),this.instance.bind("endpointDblClick",function(e,n){"function"==typeof t.$listeners.onEndpointDbClick&&t.$emit("onEndpointDbClick",e,n)})},renderData:function(){var t=this;this.instance.batch(function(){t.nodes.forEach(function(e){t.initNode(e)}),t.lines.forEach(function(e){t.createConnector(e,t.connectorOptions)})})},updateCanvas:function(t){this.removeAllConnector(),this.lines=t.lines,this.nodes=t.nodes,this.renderData()},createNode:function(t){var e=this;("function"!=typeof this.$listeners.onCreateNodeBefore||this.$listeners.onCreateNodeBefore(t))&&(this.nodes.push(t),this.$nextTick(function(){e.initNode(t)}))},initNode:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.setNodeDraggable(t,this.nodeOptions),this.setNodeEndPoint(t,this.endpointOptions),"function"==typeof this.$listeners.onCreateNodeAfter&&this.$emit("onCreateNodeAfter",t)},removeNode:function(t){var e=this.nodes.findIndex(function(e){return e.id===t.id});this.nodes.splice(e,1),this.instance.remove(t.id)},setNodeEndPoint:function(t,n){var i=this,o=n.anchors||{Top:[.5,0,0,-1,"Top"],Right:[1,.5,1,0,"Right"],Bottom:[.5,1,0,1,"Bottom"],Left:[0,.5,-1,0,"Left"]};Object.keys(o).forEach(function(s){var r=o[s],a=i.instance.addEndpoint(i.$el.querySelector("#".concat(t.id)),e({anchor:r,uuid:s+t.id},n));a&&a.endpoint.canvas&&(a.endpoint.canvas.dataset.pos=s)})},setNodeDraggable:function(t,n){if(this.editable){var o=this;this.instance.draggable(t.id,e({grid:[20,20],drag:function(e){var n=o.instance.getDragSelection().map(function(t){return t.el.id}),i=o.nodes.find(function(e){return t.id===e.id}),s=Object.assign({},i);if(o.toggleHighLight(t,!1),0===n.length)o.setReferenceLine(t.id,e),o.setBoundaryOffset(e);else if(n.some(function(e){return e===t.id})){var r;if(!o.frameMoving){var a,l,u=Math.min.apply(null,o.selectedNodes.map(function(t){return t.x})),c=Math.min.apply(null,o.selectedNodes.map(function(t){return t.y}));o.selectedNodes.some(function(t){if(t.x===u)return a=t,!0}),o.selectedNodes.some(function(t){if(t.y===c)return l=t,!0}),o.frameMoving={left:a,top:l}}(null===(r=o.frameMoving.left)||void 0===r?void 0:r.id)===t.id&&o.setFrameReferLine()}else o.cancelFrameSelectorHandler();o.$emit("onNodeMoving",s,e)},stop:function(e){var n=-1,s=i(e.pos,2),r=s[0],a=s[1],l=o.nodes.find(function(e,i){if(e.id===t.id)return n=i,!0}),u=Object.assign({},l,{x:r,y:a});o.nodes.splice(n,1,u),o.frameMoving=null,o.$emit("onNodeMoveStop",u,e);var c=o.$refs.canvasFlow.querySelector(".reference-line-vertical"),h=o.$refs.canvasFlow.querySelector(".reference-line-horizontal");c.setAttribute("style","display: none; left: 0"),h.setAttribute("style","display: none; top: 0"),clearTimeout(this.moveTimer)}},n))}},setReferenceLine:function(t,e){var n=this,o=e.el,s=o.clientWidth,r=o.clientHeight,a=i(e.pos,2),l=[a[0]+s/2,a[1]+r/2],u=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),c=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");u.setAttribute("style","display: none; left: 0"),c.setAttribute("style","display: none; top: 0");var h=!1,d=!1;this.data.nodes.some(function(e){if(e.id!==t){var i=n.$refs.canvasFlow.querySelector("#".concat(e.id)),o=window.getComputedStyle(i),s=o.width,r=o.height,a=[e.x+Number(s.replace("px",""))/2,e.y+Number(r.replace("px",""))/2];return h||a[0]!==l[0]||(u.setAttribute("style","display: inline-block; left: ".concat(a[0]-1,"px;")),h=!0),d||a[1]!==l[1]||(c.setAttribute("style","display: inline-block; top: ".concat(a[1]-1,"px;")),d=!0),!(!h||!d)||void 0}})},setFrameReferLine:function(){var t=this,e=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.left.id)),n=this.$refs.canvasFlow.querySelector("#".concat(this.frameMoving.top.id)),i=Number(window.getComputedStyle(e).left.replace("px","")),o=Number(window.getComputedStyle(n).top.replace("px","")),s=this.$refs.canvasFlow.querySelector(".reference-line-vertical"),r=this.$refs.canvasFlow.querySelector(".reference-line-horizontal");s.setAttribute("style","display: none; left: 0"),r.setAttribute("style","display: none; top: 0");var a=!1,l=!1;this.data.nodes.some(function(e){if(!t.selectedNodes.find(function(t){return t.id===e.id})){var n=[e.x,e.y];return a||n[0]!==i||(s.setAttribute("style","display: inline-block; left: ".concat(i,"px;")),a=!0),l||n[1]!==o||(r.setAttribute("style","display: inline-block; top: ".concat(o,"px;")),l=!0),!(!a||!l)||void 0}})},setBoundaryOffset:function(t){var e=this.$refs.canvasFlowWrap.getBoundingClientRect(),n=e.left,i=e.top,o=e.width,s=e.height;t.e.pageX<n&&this.intervalMoveCanvas("horizontal",20),t.e.pageX>n+o&&this.intervalMoveCanvas("horizontal",-20),t.e.pageY<i&&this.intervalMoveCanvas("vertical",20),t.e.pageY>i+s&&this.intervalMoveCanvas("vertical",-20)},intervalMoveCanvas:function(t,e){var n=this;this.moveTimer&&clearTimeout(this.moveTimer),this.moveTimer=setTimeout(function(){var i=n.canvasOffset,o=i.x,s=i.y;"horizontal"===t?o+=e:s+=e,n.setCanvasPosition(o,s),n.moveTimer||n.intervalMoveCanvas(t,e)},16)},setNodePosition:function(t){var e=this.$el.querySelector("#".concat(t.id));e.style.left="".concat(t.x,"px"),e.style.top="".concat(t.y,"px"),this.instance.revalidate(e)},toggleNodeDraggable:function(t,e){this.instance.setDraggable(t,e)},setNodeInitialPos:function(t){var e={left:"".concat(t.x,"px"),top:"".concat(t.y,"px"),visibility:t.visible?"initial":"hidden"};return 1!==this.zoom&&(e.transform="matrix(".concat(this.zoom,", 0, 0, ").concat(this.zoom,", 0, 0)")),e},createConnector:function(t,n){var i=t.options||{};return this.instance.connect({source:this.$el.querySelector("#".concat(t.source.id)),target:this.$el.querySelector("#".concat(t.target.id)),uuids:[t.source.arrow+t.source.id,t.target.arrow+t.target.id]},e(e({},n),i))},setConnector:function(t,e,n){var i=this;this.instance.getAllConnections().filter(function(n){return n.sourceId===t&&n.targetId===e}).forEach(function(t){t.setConnector(n),i.endpointOptions&&i.endpointOptions.connectorOverlays&&i.endpointOptions.connectorOverlays.forEach(function(e){t.addOverlay(e)})})},removeConnector:function(t){var e=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){e.instance.deleteConnection(t)})},removeAllConnector:function(){this.instance.deleteEveryConnection(),this.lines=[]},getConnectorsByNodeId:function(t){return this.instance.getAllConnections().filter(function(e){return e.sourceId===t||e.targetId===t})},getNodeByEvent:function(t){var e=t.parentNode;return!(!e||"HTML"===e.nodeName)&&(e.classList.contains("jsflow-node")?e:this.getNodeByEvent(e))},addLineOverlay:function(t,e){var n=this;this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.addOverlay([e.type,{label:e.name,location:e.location,cssClass:e.cls,id:e.id,events:{click:function(t,e){n.$emit("onOverlayClick",t,e)}}}])})},removeLineOverlay:function(t,e){this.instance.getConnections({source:t.source.id,target:t.target.id}).forEach(function(t){t.removeOverlay(e)})},onCanvasMouseDown:function(t){"touchstart"!==t.type&&0!==t.button||(t=v(t),this.isFrameSelecting?this.frameSelectHandler(t):(this.canvasGrabbing=!0,this.mouseDownPos={x:t.pageX,y:t.pageY},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.canvasFlowMoveHandler,!1)))},canvasFlowMoveHandler:function(t){t=v(t),this.canvasOffset={x:this.canvasPos.x+t.pageX-this.mouseDownPos.x,y:this.canvasPos.y+t.pageY-this.mouseDownPos.y},this.$refs.canvasFlow.style.left="".concat(this.canvasOffset.x,"px"),this.$refs.canvasFlow.style.top="".concat(this.canvasOffset.y,"px"),this.$emit("onCanvasMove",{left:this.canvasOffset.x,top:this.canvasOffset.y})},onCanvasMouseUp:function(t){this.isFrameSelecting?this.frameSelectEndHandler(t):(this.canvasGrabbing=!1,this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.canvasFlowMoveHandler),this.canvasPos={x:this.canvasOffset.x,y:this.canvasOffset.y})},registerPaletteEvent:function(){this.$refs.palettePanel.addEventListener(this.mousedown,this.nodeCreateHandler,!1)},nodeCreateHandler:function(t){var n=this,i=function t(e,n){return 1===e.nodeType&&e.classList.contains(n)?e:"HTML"!==e.parentNode.nodeName?t(e.parentNode,n):null}(t.target,this.selector);if(i){var o=i.dataset.type?i.dataset.type:"",s={};for(var r in i.dataset){var a=r.match(/(config)(\w*)/);if(a&&""!==a[2]){var l=a[2],u=l[0].toLowerCase()+l.slice(1);s[u]=i.dataset[r]}}this.showAddingNode=!0,this.addingNodeConfig.id=x("node"),this.addingNodeConfig.type=o,this.$nextTick(function(){var i=n.$el.querySelector(".adding-node");n.addingNodeRect=i.getBoundingClientRect();var r=n.getAddingNodePos(t);n.addingNodeConfig=e({id:x("node"),type:o,x:r.x,y:r.y,adding:!0,visible:!1},s),n.$el.addEventListener(n.mousemove,n.nodeMovingHandler,!1),document.addEventListener(n.mouseup,n.nodeMoveEndHandler,!1)})}},nodeMovingHandler:function(t){var e=this.getAddingNodePos(t);this.$set(this.addingNodeConfig,"x",e.x),this.$set(this.addingNodeConfig,"y",e.y),this.$set(this.addingNodeConfig,"visible",!0),"function"==typeof this.$listeners.onAddNodeMoving&&this.$emit("onAddNodeMoving",{type:this.addingNodeConfig.type,x:e.x,y:e.y})},nodeMoveEndHandler:function(t){if(this.$el.removeEventListener(this.mousemove,this.nodeMovingHandler),document.removeEventListener(this.mouseup,this.nodeMoveEndHandler),this.showAddingNode=!1,t.pageX>this.paletteRect.left+this.paletteRect.width){var e=(this.addingNodeConfig.x-this.paletteRect.width-this.canvasOffset.x+this.addingNodeRect.width*(1-this.zoom)/2)/this.zoom,n=(this.addingNodeConfig.y-this.canvasOffset.y+this.addingNodeRect.height*(1-this.zoom)/2)/this.zoom;this.$set(this.addingNodeConfig,"x",e),this.$set(this.addingNodeConfig,"y",n),delete this.addingNodeConfig.adding,delete this.addingNodeConfig.visible,this.createNode(this.addingNodeConfig)}this.addingNodeConfig={},this.addingNodeRect={}},getAddingNodePos:function(t){return{x:t.pageX-this.paletteRect.left-this.addingNodeRect.width/this.zoom/2,y:t.pageY-this.paletteRect.top-this.addingNodeRect.height/this.zoom/2}},toggleHighLight:function(t){var e=this,n=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(this.editable){var i=this.$el.querySelector("#".concat(t.id));this.instance.selectEndpoints({source:i}).each(function(t){var i;n?(i=e.endpointOptions.hoverPaintStyle,t.endpoint.canvas.classList.add("jtk-endpoint-highlight")):(i=e.endpointOptions.paintStyle,t.endpoint.canvas.classList.remove("jtk-endpoint-highlight")),i&&t.setStyle(i)})}},onToolClick:function(t){"function"==typeof this[t.type]&&this[t.type](),this.$emit("onToolClick",t)},setZoom:function(t,e,n){this.instance.setContainer(this.$refs.canvasFlow),this.$refs.canvasFlow.style.transform="matrix("+t+",0,0,"+t+","+e+","+n+")",this.$refs.canvasFlow.style.transformOrigin="0 0",this.$refs.canvasFlow.zoom=t,this.zoom=t,this.instance.setZoom(t)},zoomIn:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:1.1,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i>2||this.setZoom(i,o,s)},zoomOut:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:.9,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,i=this.zoom*t,o=e-e*i,s=n-n*i;i<.1||this.setZoom(i,o,s)},resetPosition:function(){this.setZoom(1,0,0),this.setCanvasPosition(0,0)},setCanvasPosition:function(t,e){this.canvasOffset={x:t,y:e},this.canvasPos={x:t,y:e},this.$refs.canvasFlow.style.left=this.canvasOffset.x+"px",this.$refs.canvasFlow.style.top=this.canvasOffset.y+"px"},frameSelect:function(){var t=!(arguments.length>0&&void 0!==arguments[0])||arguments[0];this.isFrameSelecting=t},onOpenFrameSelect:function(){this.frameSelect()},onCloseFrameSelect:function(){this.frameSelect(!1)},frameSelectHandler:function(t){this.canvasRect=this.$refs.canvasFlowWrap.getBoundingClientRect(),this.mouseDownPos={x:t.clientX-this.canvasRect.left,y:t.clientY-this.canvasRect.top},this.$refs.canvasFlowWrap.addEventListener(this.mousemove,this.frameSelectMovingHandler,!1)},frameSelectMovingHandler:function(t){var e=t.clientX-this.mouseDownPos.x-this.canvasRect.left,n=t.clientY-this.mouseDownPos.y-this.canvasRect.top;this.frameSelectorRect={width:Math.abs(e),height:Math.abs(n)},this.frameSelectorPos={x:e>0?this.mouseDownPos.x:this.mouseDownPos.x+e,y:n>0?this.mouseDownPos.y:this.mouseDownPos.y+n}},frameSelectEndHandler:function(t){this.$refs.canvasFlowWrap.removeEventListener(this.mousemove,this.frameSelectMovingHandler),this.$refs.canvasFlowWrap.removeEventListener(this.mouseup,this.frameSelectEndHandler),document.addEventListener(this.mousedown,this.cancelFrameSelectorHandler,{capture:!1,once:!0});var e=this.getSelectedNodes(),n=e.map(function(t){return t.id}),i=this.mouseDownPos,o=i.x,s=i.y;this.isFrameSelecting=!1,this.frameSelectorPos={x:0,y:0},this.frameSelectorRect={width:0,height:0},this.selectedNodes=e,this.clearNodesDragSelection(),this.addNodesToDragSelection(n),this.$emit("onFrameSelectEnd",e.slice(0),o,s)},getSelectedNodes:function(){var t=this,e=this.frameSelectorPos,n=e.x,i=e.y,o=this.frameSelectorRect,s=o.width,r=o.height;return this.nodes.filter(function(e){var o=t.$el.querySelector("#".concat(e.id)).getBoundingClientRect(),a=o.left-t.canvasRect.left,l=o.top-t.canvasRect.top;if(n<a&&n+s>a&&i<l&&i+r>l)return!0})},cancelFrameSelectorHandler:function(t){this.selectedNodes=[],this.clearNodesDragSelection(),this.$emit("onCloseFrameSelect")},addNodesToDragSelection:function(t){var e=this;t.forEach(function(t){var n=e.$el.querySelector("#".concat(t));n&&n.classList.add("selected")}),this.instance.addToDragSelection(t)},clearNodesDragSelection:function(){this.$el.querySelectorAll(".jsflow-node.selected").forEach(function(t){t.classList.remove("selected")}),this.instance.clearDragSelection()}}},void 0,!1,void 0,p,void 0);"undefined"!=typeof window&&"Vue"in window&&window.Vue.component("js-flow",j);export default j;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index 5f8a9b1c29..a104cffa90 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -10,7 +10,17 @@
 * specific language governing permissions and limitations under the License.
 */
 <template>
-    <div class="rf-form-group" :key="randomKey" :class="[{ 'rf-has-hook': option.showHook }, scheme.status || '']" v-show="showForm">
+    <div
+        class="rf-form-group"
+        :key="randomKey"
+        :class="[
+            {
+                'rf-has-hook': option.showHook,
+                'show-render': isShowRenderIcon
+            },
+            scheme.status || ''
+        ]"
+        v-show="showForm">
         <!-- 分组名称和提示 -->
         <div v-if="showFormTitle" :class="['rf-group-name', { 'not-reuse': showNotReuseTitle }]">
             <span class="scheme-name">{{scheme.name || scheme.attrs.name}}</span>
@@ -90,9 +100,9 @@
             </component>
         </div>
         <!-- 变量勾选checkbox -->
-        <div class="rf-tag-hook" v-if="showHook">
+        <div class="rf-tag-hook" v-if="showHook" :class="{ 'hide-render-icon': !isShowRenderIcon }">
             <i
-                :class="['common-icon-var hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                 v-bk-tooltips="{
                     content: hook ? $t('取消变量引用') : $t('设置为变量'),
                     placement: 'bottom',
@@ -100,7 +110,16 @@
                 }"
                 @click="onHookForm(!hook)">
             </i>
-            <i class="bk-icon icon-angle-up-fill"></i>
+            <i
+                v-if="isShowRenderIcon"
+                :class="['common-icon-render-skip render-skip-icon', { actived: !render, disabled: !option.formEdit || hook }]"
+                v-bk-tooltips="{
+                    content: !render ? $t('取消变量免渲染') : $t('变量免渲染'),
+                    placement: 'bottom',
+                    zIndex: 3000
+                }"
+                @click="onRenderChange">
+            </i>
         </div>
         <!-- 分组描述 -->
         <div class="scheme-desc-wrap" v-if="scheme.attrs.desc">
@@ -182,7 +201,8 @@
                 showForm, // combine 类型 Tag 组是否显示
                 showHook, // combine 类型 Tag 组是否可勾选
                 isDescTipsShow: false,
-                isExpand: false
+                isExpand: false,
+                isShowRenderIcon: false
             }
         },
         computed: {
@@ -227,6 +247,40 @@
                     }
                 })
             }
+            // 移除「变量免渲染」的功能开关
+            const { type, attrs } = this.scheme
+            if (type === 'code_editor') {
+                if (attrs.variable_render === false) { // variable_render 开启变量渲染
+                    /**
+                     * need_render:
+                        1. false
+                            之前已勾选，现在去掉免渲染icon
+                        2.true，判断value
+                            a. 不包含${}，需要把need_render置为false，去掉免渲染icon
+                            b. 包含${}，保留免渲染icon
+                     */
+                    if (this.render) {
+                        const regex = /\${[a-zA-Z_]\w*}/g
+                        const matchList = this.value.match(regex)
+                        const isMatch = matchList && matchList.some(item => {
+                            return !!this.constants[item]
+                        })
+                        if (isMatch) {
+                            this.isShowRenderIcon = true
+                        } else {
+                            this.$nextTick(() => {
+                                this.onRenderChange()
+                            })
+                        }
+                    }
+                } else {
+                    if (!this.render) {
+                        this.isShowRenderIcon = true
+                    }
+                }
+            } else if (!this.render) { // 如果开启了免渲染则展示按钮
+                this.isShowRenderIcon = true
+            }
         },
         beforeDestroy () {
             if (this.scheme.events) {
@@ -260,6 +314,12 @@
                 }
                 this.$emit('onHook', this.scheme.tag_code, val)
             },
+            onRenderChange () {
+                if (!this.option.formEdit || this.hook) {
+                    return
+                }
+                this.$emit('onRenderChange', this.scheme.tag_code, !this.render)
+            },
             get_parent () {
                 return this.$parent
             },
@@ -363,7 +423,7 @@
         background: #ffeeec;
     }
     &.rf-has-hook .rf-tag-form {
-        margin-right: 64px;
+        margin-right: 45px;
     }
     .rf-group-name {
         display: block
@@ -385,7 +445,6 @@
         align-items: center;
         justify-content: center;
         padding: 0 8px;
-        width: 56px;
         height: 32px;
         background: #f0f1f5;
         border-radius: 2px;
@@ -410,6 +469,9 @@
             color: #c4c6cc;
             margin: 3px 0 0 6px;
         }
+        &.hide-render-icon {
+            justify-content: center;
+        }
     }
     .tag-label-tips {
         position: relative;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index ee2d8e4a42..6847f626fc 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -20,6 +20,7 @@
             {
                 'rf-has-hook': option.showHook,
                 'show-label': option.showLabel,
+                'show-render': isShowRenderIcon,
                 'rf-view-mode': !option.formMode,
                 'rf-col-layout': scheme.attrs.cols,
                 'rf-section-item': scheme.type === 'section'
@@ -128,7 +129,7 @@
             <!-- 变量勾选checkbox -->
             <div class="rf-tag-hook" v-if="showHook" :class="{ 'hide-render-icon': !isShowRenderIcon }">
                 <i
-                    :class="['common-icon-var hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                    :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                     v-bk-tooltips="{
                         content: hook ? $t('取消变量引用') : $t('设置为变量'),
                         placement: 'bottom',
@@ -146,7 +147,6 @@
                     }"
                     @click="onRenderChange">
                 </i>
-                <i v-else class="bk-icon icon-angle-up-fill"></i>
             </div>
             <div class="scheme-desc-wrap" v-if="scheme.attrs.desc">
                 <div class="hide-html-text">{{ scheme.attrs.desc }}</div>
@@ -310,33 +310,39 @@
             })
         },
         created () {
-            // 针对job的代码编辑框，移除「变量免渲染」的功能开关
+            // 移除「变量免渲染」的功能开关
             const { type, attrs } = this.scheme
             if (type === 'code_editor') {
-                if (attrs.variable_render) { // variable_render 是否开启变量渲染
-                    this.isShowRenderIcon = true
-                    return
-                }
-                /**
-                 * need_render:
-                    1. false
-                        之前已勾选，现在去掉免渲染icon
-                    2.true，判断value
-                        a. 不包含${}，需要把need_render置为false，去掉免渲染icon
-                        b. 包含${}，保留免渲染icon
-                 */
-                if (this.render) {
-                    const regex = /\${[a-zA-Z_]\w*}/g
-                    const matchList = this.value.match(regex)
-                    const isMatch = matchList && matchList.some(item => {
-                        return !!this.constants[item]
-                    })
-                    if (isMatch) {
+                if (attrs.variable_render === false) { // variable_render 开启变量渲染
+                    /**
+                     * need_render:
+                        1. false
+                            之前已勾选，现在去掉免渲染icon
+                        2.true，判断value
+                            a. 不包含${}，需要把need_render置为false，去掉免渲染icon
+                            b. 包含${}，保留免渲染icon
+                     */
+                    if (this.render) {
+                        const regex = /\${[a-zA-Z_]\w*}/g
+                        const matchList = this.value.match(regex)
+                        const isMatch = matchList && matchList.some(item => {
+                            return !!this.constants[item]
+                        })
+                        if (isMatch) {
+                            this.isShowRenderIcon = true
+                        } else {
+                            this.$nextTick(() => {
+                                this.onRenderChange()
+                            })
+                        }
+                    }
+                } else {
+                    if (!this.render) {
                         this.isShowRenderIcon = true
-                    } else {
-                        this.onRenderChange()
                     }
                 }
+            } else if (!this.render) { // 如果开启了免渲染则展示按钮
+                this.isShowRenderIcon = true
             }
         },
         mounted () {
@@ -570,6 +576,11 @@
     }
     &.rf-has-hook {
         & > .rf-tag-form {
+            margin-right: 45px;
+        }
+    }
+    &.show-render {
+        > .rf-tag-form {
             margin-right: 64px;
         }
     }
@@ -637,7 +648,6 @@
         align-items: center;
         justify-content: space-between;
         padding: 0 8px;
-        width: 56px;
         height: 32px;
         background: #f0f1f5;
         border-radius: 2px;
@@ -658,6 +668,9 @@
         .hook-icon {
             font-size: 19px;
         }
+        .render-skip-icon {
+            margin-left: 7px;
+        }
         .icon-angle-up-fill {
             font-size: 12px;
             color: #c4c6cc;
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/EndPoint.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/EndPoint.vue
index b46f17ddd2..cacc810567 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/EndPoint.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/EndPoint.vue
@@ -10,7 +10,12 @@
 * specific language governing permissions and limitations under the License.
 */
 <template>
-    <div :class="['circle-node', 'end-point', node.status ? node.status.toLowerCase() : '', { 'ready': node.ready }]">
+    <div :class="[
+        'circle-node',
+        'end-point', node.status ? node.status.toLowerCase() : '',
+        { 'ready': node.ready },
+        { 'actived': node.isActived }
+    ]">
         <div class="circle-node-text">
             {{ $t('结束') }}
         </div>
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/StartPoint.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/StartPoint.vue
index 036d760d52..b28f86eac0 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/StartPoint.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/StartPoint.vue
@@ -10,7 +10,12 @@
 * specific language governing permissions and limitations under the License.
 */
 <template>
-    <div :class="['circle-node', 'start-point', node.status ? node.status.toLowerCase() : '', { 'ready': node.ready }]">
+    <div :class="[
+        'circle-node',
+        'start-point', node.status ? node.status.toLowerCase() : '',
+        { 'ready': node.ready },
+        { 'actived': node.isActived }
+    ]">
         <div class="circle-node-text">
             {{ $t('开始') }}
         </div>
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
index 3dde9af1a2..3ddc4a0d86 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
@@ -71,10 +71,6 @@
                     {{ $t('继续') }}
                 </span>
             </template>
-            <span v-if="!isSubProcessNode" @click.stop="$emit('onSubflowDetailClick', node.id)">
-                <i class="common-icon-bkflow-setting"></i>
-                {{ $t('节点参数') }}
-            </span>
         </div>
     </div>
 </template>
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index e11bd7ce29..748e14c05c 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1753,7 +1753,9 @@ const cn = {
     'tagCodeEditorTips': '脚本内容{0}全局变量。检测到疑似 {1} 处引用，建议使用脚本参数传入。',
     '不再支持': '不再支持',
     '执行结果': '执行结果',
-    '最大化': '最大化'
+    '最大化': '最大化',
+    '间隔': '间隔',
+    'error_handle_秒': '秒'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 8feec4f759..f966fd3065 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1319,7 +1319,7 @@ const en = {
     '需要前往配置平台新建业务': 'Need to go to CMDB to creat new business',
     '创建新业务': 'Create new business',
     '删除连线': 'Delete Line',
-    '自动重试': 'auto retry',
+    '自动重试': 'Auto Retry',
     '次': 'Times',
     '子流程有更新，更新时若存在相同表单数据则获取原表单的值。': 'The subflow has been updated. If the same form data exists during the update, the value of the original form will be obtained.',
     '更新子流程': 'Update Subflow',
@@ -1787,7 +1787,9 @@ const en = {
     '不再支持': 'no supported',
     '添加收藏': 'Collection',
     '执行结果': 'Results',
-    '最大化': 'Max'
+    '最大化': 'Max',
+    '间隔': 'with ',
+    'error_handle_秒': 'Sec Interval'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 60efa29f34..d9556bcc77 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -14,9 +14,9 @@
         <bk-resize-layout class="details-wrapper" placement="left" :max="500" :initial-divide="403" :min="400">
             <NodeTree
                 slot="aside"
-                :data="nodeData"
-                :node-display-status="nodeDisplayStatus"
+                :tree-data="nodeData"
                 :default-active-id="defaultActiveId"
+                @dynamicLoad="handleDynamicLoad"
                 @onSelectNode="onSelectNode">
             </NodeTree>
             <div slot="main" class="execute-content">
@@ -31,7 +31,8 @@
                 <div :class="['scroll-box', { 'subprocess-scroll': subProcessPipeline }]">
                     <div
                         :class="['sub-process', { 'canvas-expand': canvasExpand }]"
-                        v-if="subProcessPipeline">
+                        v-if="subProcessPipeline"
+                        v-bkloading="{ isLoading: subprocessLoading, opacity: 1, zIndex: 100 }">
                         <TemplateCanvas
                             ref="subProcessCanvas"
                             :key="canvasRandomKey"
@@ -204,6 +205,7 @@
     import i18n from '@/config/i18n/index.js'
     import TemplateCanvas from '@/components/common/TemplateCanvas/index.vue'
     import { mapState, mapMutations, mapActions } from 'vuex'
+    import axios from 'axios'
     import tools from '@/utils/tools.js'
     import atomFilter from '@/utils/atomFilter.js'
     import { TASK_STATE_DICT, NODE_DICT } from '@/constants/index.js'
@@ -214,6 +216,9 @@
     import ExecuteInfoForm from './ExecuteInfo/ExecuteInfoForm.vue'
     import taskCondition from './taskCondition.vue'
 
+    const CancelToken = axios.CancelToken
+    let source = CancelToken.source()
+
     export default {
         name: 'ExecuteInfo',
         components: {
@@ -309,7 +314,11 @@
                 executeRecord: {},
                 subFlowData: {},
                 subCanvasData: {},
-                canvasExpand: false
+                canvasExpand: false,
+                timer: null,
+                subprocessLoading: true,
+                subprocessTasks: [],
+                subprocessNodeStatus: {}
             }
         },
         computed: {
@@ -327,8 +336,13 @@
             }),
             // 节点实时状态
             realTimeState () {
-                const { root_node, node_id } = this.nodeDetailConfig
+                const { root_node, node_id, taskId } = this.nodeDetailConfig
                 let nodes = this.nodeDisplayStatus.children || {}
+                // 独立子流程节点状态特殊处理
+                if (taskId && Object.keys(this.subprocessNodeStatus).length) {
+                    nodes = this.subprocessNodeStatus[taskId]
+                    nodes = nodes && nodes.data.children
+                }
                 if (this.subProcessPipeline) {
                     const parentId = root_node?.split('-') || []
                     parentId.forEach(id => {
@@ -406,6 +420,9 @@
             isLegacySubProcess () { // 是否为旧版子流程
                 return !this.isSubProcessNode && this.nodeActivity && this.nodeActivity.type === 'SubProcess'
             },
+            subProcessTaskId () { // 独立子流程节点的任务id
+                return this.nodeDetailConfig.taskId
+            },
             subProcessPipeline () {
                 let pipelineData
                 if (this.isSubProcessNode || this.isLegacySubProcess) {
@@ -466,6 +483,8 @@
             },
             nodeDisplayStatus: {
                 handler (val) {
+                    // 设置节点树状态
+                    this.nodeAddStatus(this.nodeData, val.children)
                     this.updateNodeInfo()
                 },
                 deep: true,
@@ -480,9 +499,17 @@
                 })
             }
         },
+        beforeDestroy () {
+            if (source) {
+                source.cancel('cancelled')
+            }
+            this.cancelTaskStatusTimer()
+        },
         methods: {
             ...mapActions('task/', [
-                'getNodeActDetail'
+                'getNodeActDetail',
+                'getTaskInstanceData',
+                'getBatchInstanceStatus'
             ]),
             ...mapActions('atomForm/', [
                 'loadAtomConfig',
@@ -513,6 +540,26 @@
                         this.theExecuteTime = respData.loop
                     }
                     this.executeInfo = respData
+                    // 独立子流程任务特殊处理
+                    if (this.isSubProcessNode) {
+                        const taskId = respData.outputsInfo[0].value
+                        const { root_node, node_id } = this.nodeDetailConfig
+                        this.subprocessLoading = true
+                        // 获取子流程任务详情
+                        await this.getSubprocessData({
+                            taskId,
+                            root_node,
+                            node_id
+                        })
+                        this.subprocessTasks[taskId] = {
+                            root_node,
+                            node_id
+                        }
+                        // 获取独立子流程任务状态
+                        this.loadSubprocessStatus()
+                    } else if (this.subProcessPipeline) {
+                        this.subprocessLoading = false
+                    }
                     this.historyInfo = respData.skip ? [] : [respData]
                     if (respData.histories) {
                         this.historyInfo.unshift(...respData.histories)
@@ -685,18 +732,18 @@
                 this.$set(record, 'last_time', tools.timeTransform(record.elapsed_time))
                 this.$set(record, 'isExpand', true)
             },
-            async getTaskNodeDetail () {
+            async getTaskNodeDetail (nodeConfig = this.nodeDetailConfig) {
                 try {
-                    let query = Object.assign({}, this.nodeDetailConfig, { loop: this.theExecuteTime })
+                    let query = Object.assign({}, nodeConfig, { loop: this.theExecuteTime })
                     let res
 
                     // 非任务节点请求参数不传 component_code
-                    if (!this.nodeDetailConfig.component_code) {
+                    if (!nodeConfig.component_code) {
                         delete query.component_code
                     }
 
                     if (this.adminView && this.engineVer === 1) {
-                        const { instance_id: task_id, node_id, subprocess_stack } = this.nodeDetailConfig
+                        const { instance_id: task_id, node_id, subprocess_stack } = nodeConfig
                         query = { task_id, node_id, subprocess_stack }
                         res = await this.taskflowNodeDetail(query)
                     } else {
@@ -901,36 +948,82 @@
             onSelectNode (node) {
                 this.loading = true
                 if (this.subProcessPipeline) {
-                    this.onUpdateNodeInfo(this.nodeDetailConfig.node_id, { isActived: false })
+                    this.toggleNodeActive(this.nodeDetailConfig.node_id, false)
                 }
-                if (node.isSubProcess || node.parentId) {
-                    if (!this.subProcessPipeline || !this.subProcessPipeline.activities[node.id]) {
-                        this.canvasRandomKey = new Date().getTime()
-                        this.$nextTick(() => {
-                            this.setSubprocessCanvasZoom()
-                        })
-                    }
+                const updateCanvas = node.parentId && (!this.subProcessPipeline || !this.subProcessPipeline.activities[node.id])
+                if (node.isSubProcess || updateCanvas) {
+                    this.canvasRandomKey = new Date().getTime()
+                    this.$nextTick(() => {
+                        this.setSubprocessCanvasZoom()
+                    })
                 }
                 this.$emit('onClickTreeNode', node)
                 this.$nextTick(() => {
                     if (node.parentId) {
-                        this.onUpdateNodeInfo(node.id, { isActived: true })
+                        this.toggleNodeActive(node.id, true)
                     }
-                    this.updateNodeInfo()
+                    let nodeStatus
+                    if (node.taskId && Object.keys(this.subprocessNodeStatus).length) {
+                        nodeStatus = this.subprocessNodeStatus[node.taskId]
+                        nodeStatus = nodeStatus.data.children
+                    }
+                    this.updateNodeInfo(nodeStatus)
                 })
             },
             setSubprocessCanvasZoom () {
                 const flowDom = this.$el.querySelector('.sub-flow')
-                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
+                if (!flowDom) return
+                const { height = 0, width = 0 } = flowDom.getBoundingClientRect()
                 let jsFlowInstance = this.$refs.subProcessCanvas
                 jsFlowInstance = jsFlowInstance.$refs.jsFlow
                 jsFlowInstance && jsFlowInstance.zoomOut(0.75, width / 2, height / 2)
+                const { start_event, flows } = this.subProcessPipeline
+                const firstNodeId = flows[start_event.outgoing].target
+                const firstNodeDom = document.querySelector(`#${firstNodeId}`)
+                const { y } = firstNodeDom.getBoundingClientRect()
+                jsFlowInstance.setCanvasPosition(0, 180 - y)
+            },
+            
+            toggleNodeActive (id, isActive) {
+                const node = document.getElementById(id)
+                if (!id || !node) return
+                if (!isActive) {
+                    node.classList.remove('active')
+                } else {
+                    node.classList.add('active')
+                }
+            },
+            // 设置节点树状态
+            nodeAddStatus (treeData = [], states) {
+                treeData.forEach(node => {
+                    const { id, conditionType, isSubProcess, children } = node
+                    if (conditionType) {
+                        if (children?.length) {
+                            this.nodeAddStatus(children, states)
+                        }
+                        return
+                    }
+                    if (!states[id]) return
+                    const nodeState = states[id].skip ? 'SKIP' : states[id].state
+                    this.$set(node, 'state', nodeState)
+                    if (children) {
+                        const newStates = isSubProcess ? Object.assign({}, states, states[id].children) : states
+                        this.nodeAddStatus(children, newStates)
+                    }
+                })
             },
-            updateNodeInfo () {
+            /**
+             * 更新子流程画布
+             * nodeStatus 独立子流程任务状态
+            */
+            updateNodeInfo (nodeStatus) {
                 if (!this.subProcessPipeline) return
                 const { root_node, node_id } = this.nodeDetailConfig
-                const parentId = root_node?.split('-') || [node_id]
-                let nodes = this.nodeDisplayStatus.children
+                const parentId = root_node?.split('-') || []
+                if (this.isSubProcessNode || this.isLegacySubProcess) {
+                    parentId.push(node_id)
+                }
+                let nodes = nodeStatus || this.nodeDisplayStatus.children
                 parentId.forEach(id => {
                     if (nodes[id]) {
                         nodes = nodes[id].children
@@ -939,14 +1032,18 @@
                 for (const id in nodes) {
                     let code, skippable, retryable, errorIgnorable, autoRetry
                     const currentNode = nodes[id]
-                    const nodeActivities = this.subProcessPipeline.activities[id]
+                    const nodeActivity = this.subProcessPipeline.activities[id]
+                    // 独立子流程节点特殊处理
+                    if (this.subProcessTaskId && !nodeStatus) {
+                        return
+                    }
 
-                    if (nodeActivities) {
-                        code = nodeActivities.component ? nodeActivities.component.code : ''
-                        skippable = nodeActivities.isSkipped || nodeActivities.skippable
-                        retryable = nodeActivities.can_retry || nodeActivities.retryable
-                        errorIgnorable = nodeActivities.error_ignorable
-                        autoRetry = nodeActivities.auto_retry
+                    if (nodeActivity) {
+                        code = nodeActivity.component ? nodeActivity.component.code : ''
+                        skippable = nodeActivity.isSkipped || nodeActivity.skippable
+                        retryable = nodeActivity.can_retry || nodeActivity.retryable
+                        errorIgnorable = nodeActivity.error_ignorable
+                        autoRetry = nodeActivity.auto_retry
                     }
                     const data = {
                         code,
@@ -971,20 +1068,200 @@
             onUpdateNodeInfo (id, info) {
                 this.$refs.subProcessCanvas && this.$refs.subProcessCanvas.onUpdateNodeInfo(id, info)
             },
+            // 只点击子流程展开/收起
+            async handleDynamicLoad (node) {
+                try {
+                    // 子节点动态加载
+                    if (!node.dynamicLoad || !node.expanded) return
+                    const { id, parentId } = node
+                    const { instance_id } = this.$route.query
+                    // 该独立子流程节点的父流程也可能为独立子流程
+                    const nodeDetailConfig = this.getNodeDetailConfig(node, node.taskId || instance_id)
+                    const nodeConfig = await this.getTaskNodeDetail(nodeDetailConfig)
+                    if (!nodeConfig) return
+                    // 获取子流程任务id
+                    const taskId = nodeConfig.outputs[0].value
+                    this.subprocessLoading = false
+                    await this.getSubprocessData({
+                        taskId,
+                        root_node: parentId,
+                        node_id: id
+                    })
+                    this.subprocessTasks[taskId] = {
+                        root_node: parentId,
+                        node_id: id
+                    }
+                    this.loadSubprocessStatus()
+                } catch (error) {
+                    console.warn(error)
+                }
+            },
+            // 获取节点配置
+            getNodeDetailConfig (node, instance_id) {
+                const { id, parentId, taskId } = node
+                let pipelineData = this.pipelineData
+                if (parentId) {
+                    const parentIdList = parentId.split('-')
+                    parentIdList.forEach(item => {
+                        const nodeData = pipelineData.activities[item]
+                        if (nodeData.pipeline) {
+                            pipelineData = nodeData.pipeline
+                        } else {
+                            let { data: componentData } = nodeData.component
+                            componentData = componentData && componentData.subprocess
+                            componentData = componentData && componentData.value
+                            componentData = componentData && componentData.pipeline
+                            pipelineData = componentData || pipelineData
+                        }
+                    })
+                }
+                let code, version, componentData
+                const nodeInfo = pipelineData.activities[id]
+                if (nodeInfo) {
+                    componentData = nodeInfo.component.data
+                    code = nodeInfo.component.code
+                    version = nodeInfo.component.version || 'legacy'
+                }
+                this.isCondition = false
+                const subprocessStack = parentId && !taskId ? parentId.split('-') : []
+                return {
+                    component_code: code,
+                    version: version,
+                    node_id: id,
+                    instance_id,
+                    root_node: parentId,
+                    subprocess_stack: JSON.stringify(subprocessStack),
+                    componentData
+                }
+            },
+            // 获取独立子流程节点详情
+            async getSubprocessData (taskInfo) {
+                try {
+                    const { taskId, root_node, node_id } = taskInfo
+                    let nodes = this.nodeData
+                    const parentId = root_node?.split('-') || []
+                    parentId.forEach(id => {
+                        nodes.some(item => {
+                            if (item.id === id) {
+                                nodes = item.children
+                                return true
+                            }
+                        })
+                    })
+                    const nodeInfo = nodes.find(item => item.id === node_id)
+                    if (nodeInfo?.dynamicLoad) {
+                        const resp = await this.getTaskInstanceData(taskId)
+                        const pipelineTree = JSON.parse(resp.pipeline_tree)
+                        const parentInfo = {
+                            parentId: nodeInfo.parentId ? nodeInfo.parentId + '-' + nodeInfo.id : nodeInfo.id,
+                            parentLevel: nodeInfo.nodeLevel,
+                            lastLevelStyle: 'margin-left: 0px',
+                            taskId
+                        }
+                        const parentInstance = this.$parent.$parent
+                        nodeInfo.children = parentInstance.getOrderedTree(pipelineTree, parentInfo)
+                        nodeInfo.dynamicLoad = false
+                        nodeInfo.expanded = true
+
+                        let pipelineData = parentInstance.nodeTreePipelineData
+                        if (parentId) {
+                            parentId.forEach(item => {
+                                const nodeData = pipelineData.activities[item]
+                                if (nodeData.pipeline) {
+                                    pipelineData = nodeData.pipeline
+                                } else {
+                                    let { data: componentData } = nodeData.component
+                                    componentData = componentData && componentData.subprocess
+                                    componentData = componentData && componentData.value
+                                    componentData = componentData && componentData.pipeline
+                                    pipelineData = componentData || pipelineData
+                                }
+                            })
+                        }
+                        const nodeActivity = pipelineData.activities[node_id]
+                        this.$set(nodeActivity, 'pipeline', { ...pipelineTree, taskId })
+                        this.canvasRandomKey = new Date().getTime()
+                        this.$nextTick(() => {
+                            this.setSubprocessCanvasZoom()
+                        })
+                    }
+                } catch (error) {
+                    console.warn(error)
+                    this.subprocessLoading = false
+                }
+            },
+            async loadSubprocessStatus () {
+                try {
+                    if (source) {
+                        source.cancel('cancelled') // 取消定时器里已经执行的请求
+                        this.timer = null
+                    }
+                    source = CancelToken.source()
+                    const taskIds = Object.keys(this.subprocessTasks)
+                    if (!taskIds.length) return
+                    const data = {
+                        task_ids: taskIds,
+                        project_id: this.project_id,
+                        cancelToken: source.token
+                    }
+                    const resp = await this.getBatchInstanceStatus(data)
+                    if (!resp.result) return
+                    Object.assign(this.subprocessNodeStatus, resp.data)
+                    for (const [key, value] of Object.entries(resp.data)) {
+                        const { root_node, node_id } = this.subprocessTasks[key]
+                        let nodes = this.nodeData
+                        const parentId = root_node?.split('-') || []
+                        parentId.forEach(id => {
+                            nodes.some(item => {
+                                if (item.id === id) {
+                                    nodes = item.children
+                                    return true
+                                }
+                            })
+                        })
+                        const nodeInfo = nodes.find(item => item.id === node_id)
+                        this.nodeAddStatus(nodeInfo.children, value.data.children)
+                        this.updateNodeInfo(value.data.children)
+                        if (!['CREATED', 'RUNNING'].includes(value.data.state)) {
+                            delete this.subprocessTasks[key]
+                        }
+                    }
+                    if (Object.keys(this.subprocessTasks).length) {
+                        this.setTaskStatusTimer()
+                    }
+                } catch (error) {
+                    console.warn(error)
+                } finally {
+                    source = null
+                    this.subprocessLoading = false
+                }
+            },
+            setTaskStatusTimer (time = 3000) {
+                this.cancelTaskStatusTimer()
+                this.timer = setTimeout(() => {
+                    this.loadSubprocessStatus()
+                }, time)
+            },
+            cancelTaskStatusTimer () {
+                if (this.timer) {
+                    clearTimeout(this.timer)
+                    this.timer = null
+                }
+            },
             onRetryClick () {
-                this.$emit('onRetryClick', this.nodeDetailConfig.node_id)
+                this.$emit('onRetryClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
             onSkipClick () {
-                this.$emit('onSkipClick', this.nodeDetailConfig.node_id)
+                this.$emit('onSkipClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
             onResumeClick () {
-                this.$emit('onTaskNodeResumeClick', this.nodeDetailConfig.node_id)
+                this.$emit('onTaskNodeResumeClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
             onModifyTimeClick () {
-                this.$emit('onModifyTimeClick', this.nodeDetailConfig.node_id)
+                this.$emit('onModifyTimeClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
             mandatoryFailure () {
-                this.$emit('onForceFail', this.nodeDetailConfig.node_id)
+                this.$emit('onForceFail', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             }
         }
     }
@@ -1109,7 +1386,7 @@
             border: 0;
             background: #e1e4e8;
             /deep/.canvas-flow {
-                .actived {
+                .active {
                     box-shadow: none;
                     &::before {
                         content: '';
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 7b94139a00..80aeb626c0 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -51,7 +51,7 @@
                     </template>
                     <template v-if="templateConfig.auto_retry && templateConfig.auto_retry.enable">
                         <span class="error-handle-icon"><span class="text">AR</span></span>
-                        {{ $t('在') + $tc('秒', templateConfig.auto_retry.interval) + $t('后') + $t('，') + $t('自动重试') + ' ' + templateConfig.auto_retry.times + ' ' + $t('次') }}
+                        {{ $t('自动重试') + ' ' + templateConfig.auto_retry.times + ' ' + $t('次') + $t('，') + $t('间隔') + ' ' + templateConfig.auto_retry.interval + ' ' + $t('error_handle_秒') }}
                     </template>
                 </span>
                 <span v-else class="td">{{ '--' }}</span>
@@ -76,6 +76,7 @@
                     <render-form
                         v-if="inputs.length > 0"
                         ref="renderForm"
+                        :class="{ 'subflow-form': isLegacySubProcess }"
                         :scheme="inputs"
                         :hooked="hooked"
                         :constants="isSubProcessNode ? subflowForms : constants"
@@ -444,7 +445,7 @@
                         // 获取参数
                         const { outputs: respsOutputs, forms, inputs } = resp.data
                         if (forms.renderform) {
-                            if (!this.isSubflow) {
+                            if (!this.isLegacySubProcess) {
                                 // 获取第三方插件公共输出参数
                                 if (!this.pluginOutput['remote_plugin']) {
                                     await this.loadAtomConfig({ atom: 'remote_plugin', version: '1.0.0' })
@@ -675,35 +676,90 @@
         padding-top: 20px;
     }
     /deep/.render-form {
+        >.rf-form-item {
+            .rf-group-name {
+                display: none;
+            }
+            
+            .hide-render-icon {
+                top: 0;
+            }
+        }
+        .rf-form-group {
+            .rf-group-name {
+                display: none;
+            }
+            .rf-tag-hook {
+                top: 0;
+            }
+        }
         .rf-tag-label {
-            display: none;
+            width: 130px;
+            padding-right: 24px;
+            .label {
+                white-space: initial;
+            }
+            .required {
+                position: absolute;
+                top: 2px;
+                right: 15px;
+            }
         }
+    }
+    /deep/.subflow-form {
         .rf-form-group {
-            >.rf-form-item {
-                margin-top: 0;
+            .rf-group-name {
+                display: block;
+                width: 130px;
+                padding-right: 24px;
+                text-align: right;
+                .scheme-name {
+                    font-size: 12px;
+                }
+            }
+            .rf-has-hook {
+                .rf-tag-label {
+                    display: none;
+                }
+            }
+            .rf-tag-hook {
+                top: 0;
+            }
+        }
+        >.rf-form-group {
+            .rf-group-name {
+                float: left;
+            }
+            .form-item-group {
+                margin-left: 130px;
             }
         }
         .form-item-group {
             padding: 16px;
-            margin-right: 64px;
+            margin-right: 45px;
             background: #f5f7fa;
             .rf-tag-form {
                 margin-right: 0;
             }
             .rf-form-item {
                 .rf-tag-label {
-                    display: block;
-                    float: initial;
+                    display: flex;
                     text-align: left;
-                    margin: 0 0 6px;
                     color: #63656e;
+                    width: 100px;
                     line-height: 20px;
+                    padding-right: 10px;
+                    margin-top: 6px;
+                    .label {
+                        white-space: initial;
+                    }
                     .required {
-                        position: relative;
-                        top: 0;
-                        right: 0;
+                        position: initial;
                     }
                 }
+                .rf-tag-form {
+                    margin-left: 100px;
+                }
                 &:last-child {
                     margin-bottom: 0;
                 }
@@ -718,8 +774,10 @@
                 padding: 0;
             }
         }
-        .rf-tag-form {
-            margin-left: 0;
+        .show-render {
+            .form-item-group {
+                margin-right: 64px;
+            }
         }
     }
     
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
index 14f5e2e9ed..a1350c291e 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
@@ -14,13 +14,13 @@
         <NodeTreeItem
             :active-id="activeId"
             :node-list="treeData"
+            @dynamicLoad="$emit('dynamicLoad', $event)"
             @click="handleClickNode">
         </NodeTreeItem>
     </div>
 </template>
 <script>
 
-    import tools from '@/utils/tools.js'
     import NodeTreeItem from './NodeTreeItem'
 
     export default {
@@ -29,7 +29,7 @@
             NodeTreeItem
         },
         props: {
-            data: {
+            treeData: {
                 type: Array,
                 default () {
                     return []
@@ -38,35 +38,11 @@
             defaultActiveId: {
                 type: String,
                 default: ''
-            },
-            nodeDisplayStatus: {
-                type: Object,
-                default: {},
-                required: true
             }
         },
         data () {
             return {
-                activeId: this.defaultActiveId,
-                treeData: []
-            }
-        },
-        watch: {
-            data: {
-                handler (value) {
-                    const treeData = tools.deepClone(value)
-                    this.nodeAddStatus(this.treeData, this.nodeDisplayStatus.children)
-                    this.treeData = treeData
-                },
-                deep: true,
-                immediate: true
-            },
-            nodeDisplayStatus: {
-                handler (val) {
-                    this.nodeAddStatus(this.treeData, val.children)
-                },
-                deep: true,
-                immediate: true
+                activeId: this.defaultActiveId
             }
         },
         mounted () {
@@ -79,28 +55,10 @@
                 this.activeId = node.id
                 this.$emit('onSelectNode', node)
             },
-            nodeAddStatus (treeData = [], states) {
-                treeData.forEach(node => {
-                    const { id, conditionType, isSubProcess, children } = node
-                    if (conditionType) {
-                        if (children?.length) {
-                            this.nodeAddStatus(children, states)
-                        }
-                        return
-                    }
-                    if (!states[id]) return
-                    let nodeState = 'READY'
-                    nodeState = states[id].skip ? 'SKIP' : states[id].state
-                    if (children) {
-                        const newStates = isSubProcess ? Object.assign({}, states, states[id].children) : states
-                        this.nodeAddStatus(children, newStates)
-                    }
-                    this.$set(node, 'state', nodeState)
-                })
-            },
             setDefaultActiveId (treeData = [], id) {
                 return treeData.some(item => {
                     if (item.id === id) {
+                        item.expanded = !!item.isSubProcess
                         return true
                     } else if (item.children?.length) {
                         item.expanded = this.setDefaultActiveId(item.children, id)
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
index 1fb76f1bd8..6872e223c9 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -18,6 +18,14 @@
                 @click="handleClickNode(node)">
                 <!-- 左侧图标 -->
                 <div :class="['node-flex-start', { expanded: node.expanded }]">
+                    <!--打回图标-->
+                    <span
+                        v-if="node.isCallback"
+                        class="callback-box"
+                        v-bk-tooltips.top="$t('退回节点：') + node.callbackInfo.name"
+                        @click.stop="handleClickNode(node.callbackInfo)">
+                        <i class="common-icon-reback-branch"></i>
+                    </span>
                     <!--子流程展开/收起-->
                     <span
                         v-if="node.isSubProcess"
@@ -26,25 +34,17 @@
                     </span>
                     <!--分支条件图标-->
                     <span
-                        v-else-if="node.conditionType"
+                        v-else-if="node.conditionType && (node.isCallback ? node.children.length : true)"
                         class="branch-condition-box"
                         :class="{ 'default-condition': node.conditionType === 'default' }"
                         @click.stop="toggleExpanded(node)">
                         <i v-if="node.children && node.children.length" class="common-icon-next-triangle-shape"></i>
                     </span>
                     <!--空的占位符-->
-                    <span v-else-if="!node.parentId" class="empty-div"></span>
-                    <!--打回图标-->
-                    <span
-                        v-if="node.isCallback"
-                        class="callback-box"
-                        v-bk-tooltips.top="$t('退回节点：') + node.callbackInfo.name"
-                        @click.stop="handleClickNode(node.callbackInfo)">
-                        <i class="common-icon-reback-branch"></i>
-                    </span>
+                    <span v-else-if="node.isCallback ? false : !node.parentId" class="empty-div"></span>
                     <!--网关图标-->
                     <span
-                        v-else-if="nodeType[node.type]"
+                        v-if="nodeType[node.type]"
                         :class="[
                             nodeType[node.type],
                             nodeStateMap[node.state]
@@ -57,11 +57,17 @@
                 <!-- 节点名称 -->
                 <span v-bk-overflow-tips class="node-name">{{ node.title }}</span>
             </div>
+            <div
+                v-if="node.expanded && node.dynamicLoad"
+                class="dynamic-load"
+                v-bkloading="{ isLoading: node.expanded && node.dynamicLoad, opacity: 1 }">
+            </div>
             <NodeTreeItem
-                v-if="node.expanded && node.children && node.children.length"
+                v-else-if="node.expanded && node.children && node.children.length"
                 v-show="node.expanded"
                 :active-id="activeId"
                 :node-list="node.children"
+                @dynamicLoad="$emit('dynamicLoad', $event)"
                 @click="handleClickNode">
             </NodeTreeItem>
         </li>
@@ -112,6 +118,9 @@
                         item.expanded = false
                     })
                 }
+                if (node.dynamicLoad) {
+                    this.$emit('dynamicLoad', node)
+                }
             },
             handleClickNode (node) {
                 const { conditionType, children } = node
@@ -267,7 +276,7 @@
         &::before {
             content: '';
             display: block;
-            height: calc(100% - 25px);
+            height: calc(100% - 20px);
             position: absolute;
             top: 28px;
             left: 25.5px;
@@ -294,7 +303,7 @@
         &::before {
             content: '';
             display: block;
-            height: calc(100% - 25px);
+            height: calc(100% - 20px);
             position: absolute;
             top: 28px;
             left: 25.5px;
@@ -302,5 +311,13 @@
             border-left: 1px dashed #dcdee5;
         }
     }
+    .dynamic-load {
+        margin-left: 42px;
+        height: 40px;
+        /deep/.bk-loading-wrapper {
+            top: 70%;
+            left: 15%;
+        }
+    }
 }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 5f2f1a095d..72938fd5d6 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -80,7 +80,7 @@
                 <div class="header">
                     <span>{{sideSliderTitle}}</span>
                     <div class="sub-title" v-if="nodeInfoType === 'modifyParams' && retryNodeId">
-                        {{ previewData.activities[retryNodeId] && previewData.activities[retryNodeId].name }}
+                        {{ nodePipelineData.activities[retryNodeId] && nodePipelineData.activities[retryNodeId].name }}
                     </div>
                 </div>
             </div>
@@ -92,7 +92,7 @@
                     :params-can-be-modify="paramsCanBeModify"
                     :instance-actions="instanceActions"
                     :instance-name="instanceName"
-                    :instance_id="instance_id"
+                    :instance_id="subProcessTaskId || instance_id"
                     :retry-node-id="retryNodeId"
                     :is-sub-canvas="nodeNav.length > 1"
                     @nodeTaskRetry="nodeTaskRetry"
@@ -331,6 +331,7 @@
                 taskParamsType: '',
                 timer: null,
                 pipelineData: pipelineData,
+                nodeTreePipelineData: tools.deepClone(pipelineData),
                 treeNodeConfig: {},
                 nodeDetailConfig: {},
                 nodeSwitching: false,
@@ -387,6 +388,8 @@
                 isCondition: false,
                 conditionOutgoing: [],
                 unrenderedCoverNode: [],
+                subProcessTaskId: null,
+                nodeData: [],
                 convergeInfo: {},
                 nodeSourceMaps: {},
                 nodeTargetMaps: {}
@@ -439,10 +442,6 @@
             common () {
                 return this.templateSource !== 'project'
             },
-            nodeData () {
-                this.convergeInfo = {}
-                return this.getOrderedTree(this.completePipelineData)
-            },
             taskState () {
                 return TASK_STATE_DICT[this.state]
             },
@@ -831,7 +830,7 @@
                     this.pending.task = false
                 }
             },
-            async nodeTaskSkip (id) {
+            async nodeTaskSkip (id, taskId) {
                 if (this.pending.skip) {
                     return
                 }
@@ -840,7 +839,7 @@
                 this.isFailedSubproceeNodeInfo = null
                 try {
                     const data = {
-                        instance_id: this.instance_id,
+                        instance_id: taskId || this.instance_id,
                         node_id: id
                     }
                     const res = await this.instanceNodeSkip(data)
@@ -861,7 +860,7 @@
                     this.pending.skip = false
                 }
             },
-            async nodeForceFail (id) {
+            async nodeForceFail (id, taskId) {
                 if (this.pending.forceFail) {
                     return
                 }
@@ -869,7 +868,7 @@
                 try {
                     const params = {
                         node_id: id,
-                        task_id: Number(this.instance_id)
+                        task_id: Number(taskId || this.instance_id)
                     }
                     const res = await this.forceFail(params)
                     if (res.result) {
@@ -913,14 +912,14 @@
                     this.pending.selectGateway = false
                 }
             },
-            async nodeResume (id) {
+            async nodeResume (id, taskId) {
                 if (this.pending.parseNodeResume) {
                     return
                 }
                 this.pending.parseNodeResume = true
                 try {
                     const data = {
-                        instance_id: this.instance_id,
+                        instance_id: taskId || this.instance_id,
                         node_id: id,
                         data: { callback: 'resume' }
                     }
@@ -1017,9 +1016,10 @@
                     componentData
                 }
             },
-            async onRetryClick (id) {
+            async onRetryClick (id, taskId) {
                 try {
-                    if (this.isChildTaskFlow) {
+                    this.subProcessTaskId = taskId
+                    if (this.isChildTaskFlow || taskId) {
                         const h = this.$createElement
                         this.$bkInfo({
                             subHeader: h('div', { class: 'custom-header' }, [
@@ -1041,10 +1041,13 @@
                         })
                         return
                     }
-                    const resp = await this.getInstanceRetryParams({ id: this.instance_id })
+                    const resp = await this.getInstanceRetryParams({ id: taskId || this.instance_id })
                     if (resp.data.enable) {
                         this.openNodeInfoPanel('retryNode', i18n.t('重试节点'))
-                        this.setNodeDetailConfig(id)
+                        // 子流程任务节点，不需要重新获取节点配置
+                        if (!taskId) {
+                            this.setNodeDetailConfig(id)
+                        }
                         if (this.nodeDetailConfig.component_code) {
                             await this.loadNodeInfo(id)
                         }
@@ -1068,7 +1071,17 @@
                             } else if (this.nodeDetailConfig.component_code === 'subprocess_plugin') { // 新版子流程任务节点输入参数处理
                                 const value = nodeInfo.data.inputs[key]
                                 if (key === 'subprocess') {
-                                    const nodeConfig = this.pipelineData.activities[id]
+                                    let pipelineData = this.nodeTreePipelineData
+                                    if (this.nodeDetailConfig.root_node) {
+                                        const parentIdList = this.nodeDetailConfig.root_node.split('-')
+                                        parentIdList.forEach(item => {
+                                            const nodeData = pipelineData.activities[item]
+                                            if (nodeData.pipeline) {
+                                                pipelineData = nodeData.pipeline
+                                            }
+                                        })
+                                    }
+                                    const nodeConfig = pipelineData.activities[id]
                                     const subprocess = nodeConfig.component.data.subprocess
                                     nodeInfo.data.inputs[key] = subprocess.value
                                     Object.keys(value.pipeline.constants).forEach(key => {
@@ -1116,7 +1129,7 @@
                     console.warn(e)
                 }
             },
-            onSkipClick (id) {
+            onSkipClick (id, taskId) {
                 const h = this.$createElement
                 this.$bkInfo({
                     subHeader: h('div', { class: 'custom-header' }, [
@@ -1138,19 +1151,21 @@
                     confirmLoading: true,
                     cancelText: this.$t('取消'),
                     confirmFn: async () => {
-                        await this.nodeTaskSkip(id)
+                        await this.nodeTaskSkip(id, taskId)
                     }
                 })
             },
             async nodeTaskRetry () {
                 try {
                     this.pending.retry = true
-                    this.setNodeDetailConfig(this.retryNodeId)
+                    if (!this.nodeDetailConfig.component_code) {
+                        this.setNodeDetailConfig(this.retryNodeId)
+                    }
                     await this.loadNodeInfo()
 
                     const { instance_id, component_code, node_id } = this.nodeDetailConfig
                     const data = {
-                        instance_id,
+                        instance_id: this.subProcessTaskId || instance_id,
                         component_code,
                         node_id
                     }
@@ -1162,7 +1177,7 @@
                         } else {
                             const inputs = tools.deepClone(this.nodeInputs)
                             // 当重试节点引用了变量时，对应的inputs值设置为变量
-                            const { constants } = this.pipelineData
+                            const { constants } = this.nodeTreePipelineData
                             for (const key in constants) {
                                 const values = constants[key]
                                 if (this.retryNodeId in values.source_info) {
@@ -1190,7 +1205,7 @@
                     this.pending.retry = false
                 }
             },
-            onForceFailClick (id) {
+            onForceFailClick (id, taskId) {
                 const h = this.$createElement
                 this.$bkInfo({
                     subHeader: h('div', { class: 'custom-header' }, [
@@ -1212,13 +1227,16 @@
                     confirmLoading: true,
                     cancelText: this.$t('取消'),
                     confirmFn: async () => {
-                        await this.nodeForceFail(id)
+                        await this.nodeForceFail(id, taskId)
                     }
                 })
             },
-            onModifyTimeClick (id) {
+            onModifyTimeClick (id, taskId) {
+                this.subProcessTaskId = taskId
                 this.openNodeInfoPanel('modifyTime', i18n.t('修改时间'))
-                this.setNodeDetailConfig(id)
+                if (!taskId) {
+                    this.setNodeDetailConfig(id)
+                }
             },
             onGatewaySelectionClick (id) {
                 const nodeGateway = this.pipelineData.gateways[id]
@@ -1243,14 +1261,14 @@
                 this.gatewayBranches = branches
                 this.isGatewaySelectDialogShow = true
             },
-            onTaskNodeResumeClick (id) {
+            onTaskNodeResumeClick (id, taskId) {
                 this.$bkInfo({
                     title: i18n.t('确定继续往后执行?'),
                     maskClose: false,
                     confirmLoading: true,
                     cancelText: this.$t('取消'),
                     confirmFn: async () => {
-                        await this.nodeResume(id)
+                        await this.nodeResume(id, taskId)
                     }
                 })
             },
@@ -1336,7 +1354,7 @@
                 const endNode = tools.deepClone(data.end_event)
                 const fstLine = startNode.outgoing
                 const nodeId = data.flows[fstLine].target
-                const { parentId, parentLevel, lastLevelStyle } = pipelineInfo
+                const { parentId, parentLevel, lastLevelStyle, taskId } = pipelineInfo
                 let marginLeft
                 if (lastLevelStyle) {
                     marginLeft = lastLevelStyle.match(/[0-9]+/g)[0]
@@ -1351,6 +1369,7 @@
                     nodeLevel: 1,
                     parentId,
                     expanded: false,
+                    taskId,
                     style: `margin-left: ${marginLeft}px`
                 })]
                 const endEvent = Object.assign({}, endNode, {
@@ -1359,11 +1378,12 @@
                     nodeLevel: 1,
                     parentId,
                     expanded: false,
+                    taskId,
                     style: `margin-left: ${marginLeft}px`
                 })
                 this.getNodeTargetMaps(data)
                 this.getNodeSourceMaps(data)
-                const nodeInfo = { id: nodeId, parentId, parentLevel, lastLevelStyle }
+                const nodeInfo = { id: nodeId, parentId, parentLevel, lastLevelStyle, taskId }
                 this.retrieveLines(data, nodeInfo, orderedData)
                 orderedData.push(endEvent)
                 // 过滤root最上层汇聚网关
@@ -1378,11 +1398,11 @@
              *
              */
             retrieveLines (data, nodeInfo, ordered, parentOrdered) {
-                const { id, gatewayId, branchId, nodeLevel = 1, parentId, parentLevel, lastLevelStyle, lastId } = nodeInfo
+                const { id, gatewayId, branchId, nodeLevel = 1, parentId, parentLevel, lastLevelStyle, lastId, taskId } = nodeInfo
                 const { activities, gateways, flows } = data
                 const nodeConfig = activities[id] || gateways[id]
                 if (this.nodeIds.includes(id)) {
-                    const isBack = this.judgeNodeBack(id, id)
+                    const isBack = this.judgeNodeBack(id, id, [])
                     if (isBack) { // 打回节点
                         const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
                         const existNode = this.getMatchOrderedNode(ordered, id, false)
@@ -1421,7 +1441,8 @@
                         type: nodeConfig.type,
                         parentId,
                         expanded: false,
-                        nodeLevel: parentLevel ? parentLevel + nodeLevel : nodeLevel
+                        nodeLevel: parentLevel ? parentLevel + nodeLevel : nodeLevel,
+                        taskId
                     }
                     let marginLeft = 0
                     if (treeItem.nodeLevel === 1) {
@@ -1511,11 +1532,11 @@
                             this.nodeIds.push(id)
                         }
                     } else { // 任务节点
-                        if (nodeConfig.type === 'SubProcess') {
+                        if (nodeConfig.type === 'SubProcess' || nodeConfig.component.code === 'subprocess_plugin') {
                             const parentInfo = {
                                 parentId: parentId ? parentId + '-' + id : id,
                                 parentLevel: nodeLevel,
-                                lastLevelStyle: treeItem.style
+                                lastLevelStyle: 'margin-left: 0px'
                             }
                             // 兼容旧数据
                             if (nodeConfig.pipeline) {
@@ -1523,15 +1544,9 @@
                                 this.getNodeSourceMaps(nodeConfig.pipeline)
                                 treeItem.children = this.getOrderedTree(nodeConfig.pipeline, parentInfo)
                             } else {
-                                let { data: componentData } = nodeConfig.component
-                                componentData = componentData && componentData.subprocess
-                                componentData = componentData && componentData.value
-                                componentData = componentData && componentData.pipeline
-                                if (componentData) {
-                                    this.getNodeTargetMaps(componentData)
-                                    this.getNodeSourceMaps(componentData)
-                                    treeItem.children = this.getOrderedTree(componentData, parentInfo)
-                                }
+                                treeItem.type = 'SubProcess'
+                                treeItem.dynamicLoad = true
+                                treeItem.children = []
                             }
                             treeItem.isSubProcess = true
                         }
@@ -1726,22 +1741,24 @@
                 }, {})
                 return maxNum
             },
-            judgeNodeBack (id, backId) {
+            judgeNodeBack (id, backId, checked) {
+                if (checked.includes(id)) return id === backId
                 const targetNodes = this.nodeTargetMaps[id]
                 if (!targetNodes) return false
+                checked.push(id)
                 if (targetNodes.length > 1) {
                     if (targetNodes.includes(backId)) {
                         return true
                     }
                     return targetNodes.some(targetId => {
-                        return this.judgeNodeBack(targetId, backId)
+                        return this.judgeNodeBack(targetId, backId, checked)
                     })
                 } else {
                     const targetId = targetNodes[0]
                     if (targetId === backId) {
                         return true
                     } else {
-                        return this.judgeNodeBack(targetId, backId)
+                        return this.judgeNodeBack(targetId, backId, checked)
                     }
                 }
             },
@@ -1881,13 +1898,16 @@
                 }
                 this.updateNodeActived(id, true)
                 // 如果为子流程节点则需要重置pipelineData的constants
-                this.nodePipelineData = { ...this.pipelineData }
+                this.nodePipelineData = { ...this.nodeTreePipelineData }
                 // 兼容旧版本子流程节点输出数据
                 const selectLocation = this.canvasData.locations.find(item => item.id === id)
                 if (selectLocation?.type === 'subflow') {
-                    const { constants } = this.pipelineData.activities[id].pipeline
+                    const { constants } = this.nodeTreePipelineData.activities[id].pipeline
                     this.nodePipelineData['constants'] = constants
                 }
+                this.convergeInfo = {}
+                this.nodeIds = []
+                this.nodeData = this.getOrderedTree(this.completePipelineData)
                 this.openNodeInfoPanel('executeInfo', i18n.t('节点详情'))
             },
             onOpenConditionEdit (data, isCondition = true) {
@@ -2010,12 +2030,12 @@
                 this.updateTaskStatus(id)
             },
             async onClickTreeNode (node) {
-                const { id, conditionType, parentId } = node
+                const { id, conditionType, parentId, taskId } = node
                 if (this.nodeDetailConfig.node_id) {
                     this.updateNodeActived(this.nodeDetailConfig.node_id, false)
                 }
                 this.updateNodeActived(id, true)
-                let pipelineData = this.pipelineData
+                let pipelineData = this.nodeTreePipelineData
                 if (parentId) {
                     const parentIdList = parentId.split('-')
                     parentIdList.forEach(item => {
@@ -2045,12 +2065,18 @@
                     this.isCondition = true
                     this.conditionData = { ...node }
                 }
-                const subprocessStack = parentId ? parentId.split('-') : []
+                let subprocessStack = parentId ? parentId.split('-') : []
+                let instance_id = this.instance_id
+                if (taskId) {
+                    subprocessStack = []
+                    instance_id = taskId
+                }
                 this.nodeDetailConfig = {
                     component_code: code,
                     version: version,
                     node_id: nodeId,
-                    instance_id: this.instance_id,
+                    instance_id,
+                    taskId,
                     root_node: parentId,
                     subprocess_stack: JSON.stringify(subprocessStack),
                     componentData
@@ -2254,6 +2280,7 @@
                 }
             },
             onHiddenSideslider () {
+                this.subProcessTaskId = null
                 this.nodeInfoType = ''
                 this.updateNodeActived(this.nodeDetailConfig.node_id, false)
             },
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
index 3219bda3f8..94f921e4d5 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
@@ -76,17 +76,10 @@
                 </bk-search-select>
             </bk-form-item> -->
             <bk-form-item>
-                <div slot="tip" class="bk-label slot-bk-label">
+                <div slot="tip" class="bk-label slot-bk-label error-handle-label">
                     <span v-bk-tooltips="errorHandleTipsConfig" class="form-item-tips">{{ $t('失败处理') }}</span>
                 </div>
                 <div class="error-handle">
-                    <bk-checkbox
-                        :value="formData.ignorable"
-                        :disabled="isViewMode || formData.autoRetry.enable || formData.timeoutConfig.enable"
-                        @change="onErrorHandlerChange($event, 'ignorable')">
-                        <span class="error-handle-icon"><span class="text">AS</span></span>
-                        <span class="error-handle-text" v-bk-overflow-tips>{{ $t('自动跳过') }}</span>
-                    </bk-checkbox>
                     <bk-checkbox
                         :value="formData.skippable"
                         :disabled="isViewMode || formData.ignorable"
@@ -94,6 +87,15 @@
                         <span class="error-handle-icon"><span class="text">MS</span></span>
                         <span class="error-handle-text" v-bk-overflow-tips>{{ $t('手动跳过') }}</span>
                     </bk-checkbox>
+                    <bk-checkbox
+                        :value="formData.ignorable"
+                        :disabled="isViewMode || formData.autoRetry.enable || formData.timeoutConfig.enable"
+                        @change="onErrorHandlerChange($event, 'ignorable')">
+                        <span class="error-handle-icon"><span class="text">AS</span></span>
+                        <span class="error-handle-text" v-bk-overflow-tips>{{ $t('自动跳过') }}</span>
+                    </bk-checkbox>
+                </div>
+                <div class="error-handle">
                     <bk-checkbox
                         :value="formData.retryable"
                         :disabled="isViewMode || formData.ignorable || formData.autoRetry.enable"
@@ -107,35 +109,37 @@
                         @change="onErrorHandlerChange($event, 'autoRetry')">
                         <span class="error-handle-icon"><span class="text">AR</span></span>
                         <span class="auto-retry-times" @click.stop>
-                            {{ $t('在') }}
-                            <div class="number-input" style="margin: 0 4px;">
+                            {{ $t('自动重试') }}
+                            <div class="number-input retry-times-input" style=" margin-left: 4px;">
                                 <bk-input
-                                    v-model.number="formData.autoRetry.interval"
+                                    v-model.number="formData.autoRetry.times"
                                     type="number"
-                                    style="width: 68px;"
                                     :placeholder="' '"
                                     :disabled="isViewMode || !formData.autoRetry.enable"
                                     :max="10"
-                                    :min="0"
+                                    :min="1"
                                     :precision="0"
                                     @change="updateData">
+                                    <template slot="append">
+                                        <div class="group-append-text">{{ $t('次') }}</div>
+                                    </template>
                                 </bk-input>
-                                <span class="unit">{{ $tc('秒', 0) }}</span>
                             </div>
-                            <span class="error-handle-text" v-bk-overflow-tips>{{ $t('后') }}{{ $t('，') }}{{ $t('自动重试') }}</span>
-                            <div class="number-input" style=" margin-left: 4px;">
+                            <span class="error-handle-text" v-bk-overflow-tips>{{ $t('，') }}{{ $t('间隔') }}</span>
+                            <div class="number-input interval-input" style="margin: 0 4px;">
                                 <bk-input
-                                    v-model.number="formData.autoRetry.times"
+                                    v-model.number="formData.autoRetry.interval"
                                     type="number"
-                                    style="width: 68px;"
                                     :placeholder="' '"
                                     :disabled="isViewMode || !formData.autoRetry.enable"
                                     :max="10"
-                                    :min="1"
+                                    :min="0"
                                     :precision="0"
                                     @change="updateData">
+                                    <template slot="append">
+                                        <div class="group-append-text">{{ $t('error_handle_秒') }}</div>
+                                    </template>
                                 </bk-input>
-                                <span class="unit">{{ $t('次') }}</span>
                             </div>
                         </span>
                     </bk-checkbox>
@@ -284,19 +288,12 @@
             </bk-form-item>
             <template v-if="isShowFailTimeoutHandle">
                 <bk-form-item>
-                    <div slot="tip" class="bk-label slot-bk-label">
+                    <div slot="tip" class="bk-label slot-bk-label error-handle-label">
                         <span v-bk-tooltips="errorHandleTipsConfig" class="form-item-tips">
                             {{ $t('失败处理') }}
                         </span>
                     </div>
                     <div class="error-handle">
-                        <bk-checkbox
-                            :value="formData.ignorable"
-                            :disabled="isViewMode || formData.autoRetry.enable || formData.timeoutConfig.enable"
-                            @change="onErrorHandlerChange($event, 'ignorable')">
-                            <span class="error-handle-icon"><span class="text">AS</span></span>
-                            <span class="error-handle-text" v-bk-overflow-tips>{{ $t('自动跳过') }}</span>
-                        </bk-checkbox>
                         <bk-checkbox
                             :value="formData.skippable"
                             :disabled="isViewMode || formData.ignorable"
@@ -304,6 +301,15 @@
                             <span class="error-handle-icon"><span class="text">MS</span></span>
                             <span class="error-handle-text" v-bk-overflow-tips>{{ $t('手动跳过') }}</span>
                         </bk-checkbox>
+                        <bk-checkbox
+                            :value="formData.ignorable"
+                            :disabled="isViewMode || formData.autoRetry.enable || formData.timeoutConfig.enable"
+                            @change="onErrorHandlerChange($event, 'ignorable')">
+                            <span class="error-handle-icon"><span class="text">AS</span></span>
+                            <span class="error-handle-text" v-bk-overflow-tips>{{ $t('自动跳过') }}</span>
+                        </bk-checkbox>
+                    </div>
+                    <div class="error-handle">
                         <bk-checkbox
                             :value="formData.retryable"
                             :disabled="isViewMode || formData.ignorable || formData.autoRetry.enable"
@@ -316,39 +322,41 @@
                             :disabled="isViewMode || formData.ignorable || formData.timeoutConfig.enable"
                             @change="onErrorHandlerChange($event, 'autoRetry')">
                             <span class="error-handle-icon"><span class="text">AR</span></span>
+                            <span class="auto-retry-times" @click.stop>
+                                {{ $t('自动重试') }}
+                                <div class="number-input retry-times-input" style=" margin-left: 4px;">
+                                    <bk-input
+                                        v-model.number="formData.autoRetry.times"
+                                        type="number"
+                                        :placeholder="' '"
+                                        :disabled="isViewMode || !formData.autoRetry.enable"
+                                        :max="10"
+                                        :min="1"
+                                        :precision="0"
+                                        @change="updateData">
+                                        <template slot="append">
+                                            <div class="group-append-text">{{ $t('次') }}</div>
+                                        </template>
+                                    </bk-input>
+                                </div>
+                                <span class="error-handle-text" v-bk-overflow-tips>{{ $t('，') }}{{ $t('间隔') }}</span>
+                                <div class="number-input interval-input" style="margin: 0 4px;">
+                                    <bk-input
+                                        v-model.number="formData.autoRetry.interval"
+                                        type="number"
+                                        :placeholder="' '"
+                                        :disabled="isViewMode || !formData.autoRetry.enable"
+                                        :max="10"
+                                        :min="0"
+                                        :precision="0"
+                                        @change="updateData">
+                                        <template slot="append">
+                                            <div class="group-append-text">{{ $t('error_handle_秒') }}</div>
+                                        </template>
+                                    </bk-input>
+                                </div>
+                            </span>
                         </bk-checkbox>
-                        <span class="auto-retry-times">
-                            {{ $t('在') }}
-                            <div class="number-input" style="margin: 0 4px;">
-                                <bk-input
-                                    v-model.number="formData.autoRetry.interval"
-                                    type="number"
-                                    style="width: 68px;"
-                                    :placeholder="' '"
-                                    :disabled="isViewMode || !formData.autoRetry.enable"
-                                    :max="10"
-                                    :min="0"
-                                    :precision="0"
-                                    @change="updateData">
-                                </bk-input>
-                                <span class="unit">{{ $tc('秒', 0) }}</span>
-                            </div>
-                            <span class="error-handle-text" v-bk-overflow-tips>{{ $t('后') }}{{ $t('，') }}{{ $t('自动重试') }}</span>
-                            <div class="number-input" style=" margin-left: 4px;">
-                                <bk-input
-                                    v-model.number="formData.autoRetry.times"
-                                    type="number"
-                                    style="width: 68px;"
-                                    :placeholder="' '"
-                                    :disabled="isViewMode || !formData.autoRetry.enable"
-                                    :max="10"
-                                    :min="1"
-                                    :precision="0"
-                                    @change="updateData">
-                                </bk-input>
-                                <span class="unit">{{ $t('次') }}</span>
-                            </div>
-                        </span>
                     </div>
                     <p
                         v-if="!formData.ignorable && !formData.skippable && !formData.retryable && !formData.autoRetry.enable"
@@ -900,17 +908,21 @@
             left: 0;
         }
     }
+    .error-handle-label {
+        top: -8px !important;
+    }
     .error-handle {
         display: flex;
         align-items: center;
-        justify-content: space-between;
         flex-wrap: wrap;
+        &:not(:first-of-type) {
+            margin-top: 20px;
+        }
         /deep/ .bk-form-checkbox {
             display: flex;
             align-items: center;
             &:not(:last-of-type) {
-                margin-right: 8px;
-                margin-bottom: 10px;
+                margin-right: 50px;
             }
             &.is-disabled .bk-checkbox-text {
                 color: #c4c6cc;
@@ -937,7 +949,6 @@
             }
         }
         .error-handle-text {
-            min-width: 49px;
             overflow: hidden;
             text-overflow: ellipsis;
             display: -webkit-box;
@@ -979,6 +990,42 @@
             background: transparent;
         }
     }
+    .retry-times-input,
+    .interval-input {
+        /deep/.bk-input-number {
+            width: 50px;
+            .bk-form-input {
+                padding-right: 5px !important;
+            }
+        }
+        /deep/.group-append {
+            align-items: center;
+            border: 1px solid #c4c6cc !important;
+            border-left: none !important;
+            background: #fff !important;
+            transition: border .2s linear;
+            .group-append-text {
+                font-size: 12px;
+                padding-right: 15px;
+            }
+        }
+        .control-active {
+            /deep/.group-append {
+                border-color: #3a84ff !important;
+            }
+        }
+        .control-disable {
+            /deep/.group-append {
+                background-color: #fafbfd !important;
+                border-color: #dcdee5 !important;
+            }
+        }
+    }
+    .retry-times-input {
+        /deep/.bk-input-number {
+            width: 45px;
+        }
+    }
     .auto-retry-times,
     .timeout-setting-wrap {
         /deep/ .bk-input-number .input-number-option {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
index d0d0b22e3f..527f870c8d 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
@@ -378,16 +378,7 @@
         .rf-group-name {
             display: none;
         }
-        .rf-tag-label {
-            width: 130px;
-            padding-right: 24px;
-            white-space: nowrap;
-            .required {
-                position: absolute;
-                top: 2px;
-                right: 15px;
-            }
-        }
+        
         .hide-render-icon {
             top: 0;
         }
@@ -400,6 +391,18 @@
             top: 0;
         }
     }
+    .rf-tag-label {
+        width: 130px;
+        padding-right: 24px;
+        .label {
+            white-space: initial;
+        }
+        .required {
+            position: absolute;
+            top: 2px;
+            right: 15px;
+        }
+    }
 }
 /deep/.subflow-form {
     .rf-form-group {
@@ -408,7 +411,9 @@
             width: 130px;
             padding-right: 24px;
             text-align: right;
-            font-size: 12px;
+            .scheme-name {
+                font-size: 12px;
+            }
         }
         .rf-has-hook {
             .rf-tag-label {
@@ -429,18 +434,26 @@
     }
     .form-item-group {
         padding: 16px;
-        margin-right: 64px;
+        margin-right: 45px;
         background: #f5f7fa;
         .rf-tag-form {
             margin-right: 0;
         }
         .rf-form-item {
             .rf-tag-label {
-                display: block;
+                display: flex;
                 text-align: left;
                 color: #63656e;
+                width: 100px;
                 line-height: 20px;
                 padding-right: 10px;
+                margin-top: 6px;
+                .label {
+                    white-space: initial;
+                }
+                .required {
+                    position: initial;
+                }
             }
             .rf-tag-form {
                 margin-left: 100px;
@@ -459,5 +472,10 @@
             padding: 0;
         }
     }
+    .show-render {
+        .form-item-group {
+            margin-right: 64px;
+        }
+    }
 }
 </style>
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index 2ab73b10fa..a0496f73d1 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -76,6 +76,7 @@
                                                 <i
                                                     :class="[props.row.source_type !== 'component_outputs' ? 'common-icon-show-left' : 'common-icon-show-right color-org']"
                                                     v-bk-tooltips="{
+                                                        allowHTML: false,
                                                         content: props.row.source_type !== 'component_outputs' ? $t('输入') : $t('输出'),
                                                         placements: ['bottom']
                                                     }">
@@ -83,6 +84,7 @@
                                                 <i
                                                     :class="[props.row.show_type === 'show' ? 'common-icon-eye-show' : 'common-icon-eye-hide color-org']"
                                                     v-bk-tooltips="{
+                                                        allowHTML: false,
                                                         content: props.row.show_type === 'show' ? $t('显示') : $t('隐藏'),
                                                         placements: ['bottom']
                                                     }">
@@ -1016,7 +1018,7 @@
                 await this.getPluginDetail()
                 if (Array.isArray(this.inputs)) {
                     this.inputsRenderConfig = this.inputs.reduce((acc, crt) => {
-                        acc[crt.tag_code] = true
+                        acc[crt.tag_code] = crt.type !== 'code_editor'
                         return acc
                     }, {})
                 }
@@ -1043,7 +1045,7 @@
                 await this.getPluginDetail()
                 if (Array.isArray(this.inputs)) {
                     this.inputsRenderConfig = this.inputs.reduce((acc, crt) => {
-                        acc[crt.tag_code] = true
+                        acc[crt.tag_code] = crt.type !== 'code_editor'
                         return acc
                     }, {})
                 }
diff --git a/frontend/desktop/src/store/modules/task.js b/frontend/desktop/src/store/modules/task.js
index 423478b4e8..679db993f4 100644
--- a/frontend/desktop/src/store/modules/task.js
+++ b/frontend/desktop/src/store/modules/task.js
@@ -281,6 +281,16 @@ const task = {
                 cancelToken
             }).then(response => response.data)
         },
+        /**
+         * 批量获取任务实例状态信息(包含子流程状态)
+         * @param {String} data 实例数据
+         */
+        getBatchInstanceStatus ({ commit }, data) {
+            const { task_ids, project_id, cancelToken } = data
+            return axios.post(`taskflow/api/batch_status/${project_id}/`, {
+                task_ids
+            }, { cancelToken }).then(response => response.data)
+        },
         /**
          * 开始执行任务实例
          * @param {String} instance_id 实例id

From d87ec81d21f1e7b4340f25aaf9d8ee3af823ccda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 17 Aug 2023 20:58:44 +0800
Subject: [PATCH 030/112] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A2=84=E8=A7=88=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#7000)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* minor: 节点预览修复

* minor: 解决子流程预览异常的问题
---
 gcloud/tasktmpl3/domains/constants.py | 38 ++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index 929fded589..c9b475c8e2 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -84,6 +84,16 @@ def preview_node_inputs(
 ):
     def get_need_render_context_keys():
         keys = set()
+        # 如果遇到子流程，到最后一层才会实际去解析需要渲染的变量
+        if subprocess_stack:
+            subprocess = subprocess_stack[0]
+            param_data = {key: info["value"] for key, info in pipeline["activities"][subprocess]["params"].items()}
+            for value in param_data.values():
+                if isinstance(value, str):
+                    for value in var_pattern.findall(value):
+                        keys.add("${" + value + "}")
+            return keys
+
         node_info = pipeline["activities"][node_id]
         for item in node_info.get("component").get("inputs").values():
 
@@ -100,15 +110,37 @@ def get_need_render_context_keys():
         for key, info in list(pipeline["data"].get("inputs", {}).items()) + list(parent_params.items())
         if key in need_render_context_keys
     ]
+
     context = Context(runtime, context_values, root_pipeline_data)
 
     if subprocess_stack:
+        # 如果子流程依赖了父流程的变量，那么需要把父流程的变量传递到下一层子流程中
         subprocess = subprocess_stack[0]
         child_pipeline = pipeline["activities"][subprocess]["pipeline"]
+        parent_hydrated_context = context.hydrate(deformat=True)
+        # 子流程需要有选择的渲染父流程的变量
         param_data = {key: info["value"] for key, info in pipeline["activities"][subprocess]["params"].items()}
-        hydrated_context = context.hydrate(deformat=True)
-        hydrated_param_data = Template(param_data).render(hydrated_context)
-        formatted_param_data = {key: {"value": value, "type": "plain"} for key, value in hydrated_param_data.items()}
+        # 获取子流程的参数
+        hydrated_param_data = Template(param_data).render(parent_hydrated_context)
+        child_inputs = child_pipeline.get("data").get("inputs")
+        # 需要提前渲染好子流程参数的值
+        subprocess_context_values = [
+            ContextValue(
+                key=key,
+                type=VAR_CONTEXT_MAPPING[child_inputs.get(key)["type"]],
+                value=value,
+                code=child_inputs.get(key).get("custom_type"),
+            )
+            for key, value in hydrated_param_data.items()
+        ]
+
+        subprocess_context = Context(runtime, subprocess_context_values, root_pipeline_data)
+        subprocess_hydrated_context = subprocess_context.hydrate(deformat=True)
+        # 此时已经准备好了子流程所有的输出，到下一层递归时，由于parent_params在inputs之后被处理，所以parent_params会更新最终的值
+        formatted_param_data = {
+            "${" + key + "}": {"value": value, "type": "plain"} for key, value in subprocess_hydrated_context.items()
+        }
+
         return preview_node_inputs(
             runtime=runtime,
             pipeline=child_pipeline,

From c77206a36b747d544e1882ece09c200bb3c2a45a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:47:07 +0800
Subject: [PATCH 031/112] =?UTF-8?q?optimization:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=96=B9=E6=A1=88=E6=96=B0=E5=A2=9E=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=A0=A1=E9=AA=8C=20(#7002)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* optimization: 删除执行方案新增相关的校验

* minor: code review
---
 .../apis/drf/viewsets/template_scheme.py      | 96 +++++++++++++++++--
 1 file changed, 86 insertions(+), 10 deletions(-)

diff --git a/gcloud/template_base/apis/drf/viewsets/template_scheme.py b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
index 15bca4836b..77444738cc 100644
--- a/gcloud/template_base/apis/drf/viewsets/template_scheme.py
+++ b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
@@ -10,6 +10,7 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+import json
 import logging
 from collections import Counter
 
@@ -24,8 +25,12 @@
 from rest_framework.response import Response
 
 from gcloud import err_code
+from gcloud.clocked_task.models import ClockedTask
 from gcloud.common_template.models import CommonTemplate
+from gcloud.constants import CLOCKED_TASK_NOT_STARTED
+from gcloud.contrib.appmaker.models import AppMaker
 from gcloud.core.apis.drf.viewsets.utils import ApiMixin
+from gcloud.periodictask.models import PeriodicTask
 from gcloud.tasktmpl3.models import TaskTemplate
 from gcloud.template_base.apis.drf.permission import SchemeEditPermission
 from gcloud.template_base.apis.drf.serilaziers.template_scheme import (
@@ -89,6 +94,74 @@ def get_scheme_quote_count_dict(template_id):
 
         return Counter(total_scheme_id_list)
 
+    @staticmethod
+    def get_app_maker_names_scheme_quote(template_id, remove_scheme_ids_set):
+        """
+        获取该模板作为轻应用时，各执行方案的引用数
+        @return:
+        """
+        app_maker_queryset = AppMaker.objects.filter(task_template__id=template_id, is_deleted=False)
+        return list(
+            {
+                app_maker.name
+                for app_maker in app_maker_queryset
+                if int(app_maker.template_scheme_id) in remove_scheme_ids_set
+            }
+        )
+
+    @staticmethod
+    def get_periodic_task_names_scheme_quote(template_id, remove_scheme_ids_set):
+        periodic_task_queryset = PeriodicTask.objects.filter(template_id=template_id)
+        periodic_names = []
+
+        for periodic_task in periodic_task_queryset:
+            template_scheme_ids = json.loads(periodic_task.template_scheme_ids)
+            if set(template_scheme_ids) & remove_scheme_ids_set:
+                periodic_names.append(periodic_task.name)
+
+        return periodic_names
+
+    @staticmethod
+    def get_clocked_task_names_scheme_quote(template_id, remove_scheme_ids_set):
+        clocked_task_queryset = ClockedTask.objects.filter(template_id=template_id, state=CLOCKED_TASK_NOT_STARTED)
+        clocked_task_names = []
+
+        for clocked_task in clocked_task_queryset:
+            template_scheme_ids = json.loads(clocked_task.task_params).get("template_schemes_id")
+            if set(template_scheme_ids) & remove_scheme_ids_set:
+                clocked_task_names.append(clocked_task.task_name)
+
+        return clocked_task_names
+
+    def validate_batch_delete_scheme(self, pipeline_template_template_id, template_id, remove_scheme_ids_set):
+
+        template_quote_scheme_ids_set = set(self.get_scheme_quote_count_dict(pipeline_template_template_id).keys())
+
+        if remove_scheme_ids_set & template_quote_scheme_ids_set:
+            message = _(f"执行方案删除失败: 待删除的[执行方案]已被引用[{template_quote_scheme_ids_set}], 请处理后重试 | batch_operate")
+            logger.error(message)
+            return message
+
+        app_maker_names = self.get_app_maker_names_scheme_quote(template_id, remove_scheme_ids_set)
+        if app_maker_names:
+            message = _(f"执行方案删除失败: 待删除的[执行方案]已被这些轻应用所引用{app_maker_names}, 请处理后重试 | batch_operate")
+            logger.error(message)
+            return message
+
+        periodic_names = self.get_periodic_task_names_scheme_quote(template_id, remove_scheme_ids_set)
+        if periodic_names:
+            message = _(f"执行方案删除失败: 待删除的[执行方案]已被这些周期任务所引用{periodic_names}, 请处理后重试 | batch_operate")
+            logger.error(message)
+            return message
+
+        clocked_names = self.get_clocked_task_names_scheme_quote(template_id, remove_scheme_ids_set)
+        if clocked_names:
+            message = _(f"执行方案删除失败: 待删除的[执行方案]已被这些计划任务所引用{clocked_names}, 请处理后重试 | batch_operate")
+            logger.error(message)
+            return message
+
+        return None
+
     def get_serializer_data(self, request):
         serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -130,6 +203,7 @@ def batch_operate(self, request, *args, **kwargs):
                 scheme_obj.unique_id = f'{template_id}-{scheme["name"]}'
                 scheme_obj.name = scheme["name"]
                 scheme_obj.data = scheme["data"]
+                scheme_obj.unique_id = "{}-{}".format(template_id, scheme["name"])
                 update_schemes.append(scheme_obj)
             else:
                 scheme.update(
@@ -139,14 +213,14 @@ def batch_operate(self, request, *args, **kwargs):
 
         remove_scheme_ids_set = set(scheme_mappings.keys()) - set(update_scheme_ids)
 
-        quote_scheme_ids_set = set(self.get_scheme_quote_count_dict(pipeline_template_template_id).keys())
-        if remove_scheme_ids_set & quote_scheme_ids_set:
-            message = _(f"执行方案删除失败: 待删除的[执行方案]已被引用[{quote_scheme_ids_set}], 请处理后重试 | batch_operate")
-            logger.error(message)
-            return Response({"detail": ErrorDetail(message, err_code.REQUEST_PARAM_INVALID.code)}, exception=True)
-
         remove_scheme_ids = list(remove_scheme_ids_set)
 
+        error_message = self.validate_batch_delete_scheme(
+            pipeline_template_template_id, template_id, remove_scheme_ids_set
+        )
+        if error_message:
+            return Response({"detail": ErrorDetail(error_message, err_code.REQUEST_PARAM_INVALID.code)}, exception=True)
+
         try:
             with transaction.atomic():
                 # 批量删除scheme
@@ -193,11 +267,13 @@ def create(self, request, *args, **kwargs):
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, *args, **kwargs):
-        scheme_quote_num = TemplateRelationship.objects.filter(templatescheme__id=kwargs["pk"]).count()
 
-        if scheme_quote_num != 0:
-            message = _(f"执行方案删除失败: 该执行方案被[{scheme_quote_num}]个子流程节点引用, 禁止删除. 请处理后重试 | destroy")
-            logger.error(message)
+        scheme = self.get_object()
+        # 获取流程所关联的模版id
+        template_id = scheme.unique_id.split("-")[0]
+        message = self.validate_batch_delete_scheme(scheme.template.template_id, template_id, {scheme.id})
+
+        if message:
             return Response({"detail": ErrorDetail(message, err_code.REQUEST_PARAM_INVALID.code)}, exception=True)
 
         return super(TemplateSchemeViewSet, self).destroy(request, *args, **kwargs)

From 1306eb7a30d0f8bf47fc4b3e00586515c297813b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Fri, 18 Aug 2023 15:55:51 +0800
Subject: [PATCH 032/112] =?UTF-8?q?feature:=20=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=94=AF=E6=8C=81=E8=BF=90=E8=A1=8C=E4=B8=AD/?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5/=E6=9A=82=E5=81=9C=20=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=20(#7004)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* minor: 同步任务状态过滤的代码

* bugfix: 修复引擎任务校验的问题

* 支持任务running状态过滤&补充单元测试 (#6891)

* minor: 支持任务running状态过滤&补充单元测试

* minor: 默认查询时间限制调整为180天&增加前端变量渲染

* bugfix: 执行中状态添加时间范围限制
---
 config/default.py                             |   5 +-
 env.py                                        |   4 +-
 gcloud/core/apis/drf/viewsets/taskflow.py     | 149 ++++++++++++++++--
 gcloud/core/context_processors.py             |   1 +
 .../drf/views_set/test_task_instance_view.py  | 135 ++++++++++++++++
 5 files changed, 276 insertions(+), 18 deletions(-)
 create mode 100644 gcloud/tests/core/apis/drf/views_set/test_task_instance_view.py

diff --git a/config/default.py b/config/default.py
index ff9eef01e0..de57d4b699 100644
--- a/config/default.py
+++ b/config/default.py
@@ -672,6 +672,7 @@ def monitor_report_config():
 
         from bk_monitor_report import MonitorReporter  # noqa
         from bk_monitor_report.contrib.celery import MonitorReportStep  # noqa
+
         from blueapps.core.celery import celery_app  # noqa
 
         reporter = MonitorReporter(
@@ -762,7 +763,6 @@ def monitor_report_config():
 MAX_EXPIRED_SESSION_CLEAN_NUM = env.MAX_EXPIRED_SESSION_CLEAN_NUM
 EXPIRED_SESSION_CLEAN_CRON = env.EXPIRED_SESSION_CLEAN_CRON
 
-
 # V2引擎任务清理配置
 ENABLE_CLEAN_EXPIRED_V2_TASK = env.ENABLE_CLEAN_EXPIRED_V2_TASK
 CLEAN_EXPIRED_V2_TASK_CRON = env.CLEAN_EXPIRED_V2_TASK_CRON
@@ -786,3 +786,6 @@ def check_engine_admin_permission(request, *args, **kwargs):
 
 
 PIPELINE_ENGINE_ADMIN_API_PERMISSION = "config.default.check_engine_admin_permission"
+
+# 任务列表过滤失败任务最大天数
+TASK_LIST_STATUS_FILTER_DAYS = env.BKPAAS_TASK_LIST_STATUS_FILTER_DAYS
diff --git a/env.py b/env.py
index 3b89e971f1..d4fcbcf4e4 100644
--- a/env.py
+++ b/env.py
@@ -99,7 +99,6 @@
 
 ENABLE_IPV6 = False if os.getenv("BKAPP_ENABLE_IPV6") is None else True
 
-
 # 流程最高嵌套层数
 TEMPLATE_MAX_RECURSIVE_NUMBER = int(os.getenv("BKAPP_TEMPLATE_MAX_RECURSIVE_NUMBER", 200))
 
@@ -108,3 +107,6 @@
 
 # 获取 PaaS 注入的蓝鲸域名
 BKPAAS_BK_DOMAIN = os.getenv("BKPAAS_BK_DOMAIN", "") or os.getenv("BK_DOMAIN", "")
+
+# 默认一个月
+BKPAAS_TASK_LIST_STATUS_FILTER_DAYS = int(os.getenv("BKPAAS_TASK_LIST_STATUS_FILTER_DAYS", 180))
diff --git a/gcloud/core/apis/drf/viewsets/taskflow.py b/gcloud/core/apis/drf/viewsets/taskflow.py
index 839b319f85..1101da7ca5 100644
--- a/gcloud/core/apis/drf/viewsets/taskflow.py
+++ b/gcloud/core/apis/drf/viewsets/taskflow.py
@@ -12,15 +12,18 @@
 """
 import logging
 import re
+from datetime import datetime, timedelta
 
+from bamboo_engine import states
 from django.conf import settings
 from django.db import transaction
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
 from django_filters import FilterSet
 from drf_yasg.utils import swagger_auto_schema
+from pipeline.eri.models import State
 from pipeline.exceptions import PipelineException
-from pipeline.models import Snapshot
+from pipeline.models import PipelineInstance, Snapshot
 from rest_framework import generics, permissions, status
 from rest_framework.decorators import action
 from rest_framework.exceptions import ErrorDetail
@@ -32,11 +35,7 @@
 from gcloud.constants import TASK_NAME_MAX_LENGTH, TaskCreateMethod
 from gcloud.contrib.appmaker.models import AppMaker
 from gcloud.contrib.function.models import FunctionTask
-from gcloud.contrib.operate_record.constants import (
-    OperateSource,
-    OperateType,
-    RecordType,
-)
+from gcloud.contrib.operate_record.constants import OperateSource, OperateType, RecordType
 from gcloud.contrib.operate_record.signal import operate_record_signal
 from gcloud.contrib.operate_record.utils import extract_extra_info
 from gcloud.core.apis.drf.exceptions import ValidationException
@@ -66,17 +65,9 @@
 from gcloud.core.models import EngineConfig
 from gcloud.iam_auth import IAMMeta, get_iam_client, res_factory
 from gcloud.iam_auth.conf import TASK_ACTIONS
-from gcloud.iam_auth.utils import (
-    get_common_flow_allowed_actions_for_user,
-    get_flow_allowed_actions_for_user,
-)
+from gcloud.iam_auth.utils import get_common_flow_allowed_actions_for_user, get_flow_allowed_actions_for_user
 from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
-from gcloud.taskflow3.models import (
-    TaskConfig,
-    TaskFlowInstance,
-    TaskFlowRelation,
-    TimeoutNodeConfig,
-)
+from gcloud.taskflow3.models import TaskConfig, TaskFlowInstance, TaskFlowRelation, TimeoutNodeConfig
 from gcloud.tasktmpl3.models import TaskTemplate
 from gcloud.utils.strings import standardize_name, standardize_pipeline_node_name
 
@@ -85,6 +76,112 @@
 iam = get_iam_client()
 
 
+class TaskFLowStatusFilterHandler:
+    FAILED = "failed"
+    PAUSE = "pause"
+    RUNNING = "running"
+
+    def __init__(self, status, queryset, start_time):
+        """
+        @param status: 状态
+        @param queryset: task_instance queryset
+        @param start_time: 查询开始时间
+        """
+        self.status = status
+        self.queryset = queryset
+        self.start_time = start_time
+
+    def get_queryset(self):
+        """
+        当前支持失败和暂停状态，获取目标queryset
+        @return:
+        """
+        if self.status == self.FAILED:
+            return self._filter_failed()
+        elif self.status == self.PAUSE:
+            return self._filter_pipeline_pause()
+        elif self.status == self.RUNNING:
+            return self._filter_running()
+        else:
+            return self.queryset
+
+    def _get_pipeline_id_list(self):
+        """
+        获取当前符合条件的 pipeline_id 列表
+        @return:
+        """
+        pipeline_instance_id_list = TaskFlowInstance.objects.filter(
+            pipeline_instance__start_time__gte=self.start_time
+        ).values_list("pipeline_instance_id", flat=True)
+
+        pipeline_id_list = PipelineInstance.objects.filter(id__in=pipeline_instance_id_list).values_list(
+            "instance_id", flat=True
+        )
+
+        return pipeline_id_list
+
+    def _filter_failed(self):
+        """
+        获取所有失败的任务，当任务失败时，任务的State的name会为Failed，去重可以获得当前存在失败节点的pipeline instance
+        @return:
+        """
+        pipeline_id_list = self._get_pipeline_id_list()
+        # 获取存在异常任务状态的pipline task
+        pipeline_failed_root_id_list = (
+            State.objects.filter(name=states.FAILED, root_id__in=pipeline_id_list).values("root_id").distinct()
+        )
+        failed_pipeline_instance_id_list = PipelineInstance.objects.filter(
+            instance_id__in=pipeline_failed_root_id_list
+        ).values_list("id", flat=True)
+        queryset = self.queryset.filter(pipeline_instance_id__in=failed_pipeline_instance_id_list)
+
+        return queryset
+
+    def _filter_pipeline_pause(self):
+        """
+        获取所有暂停的任务，当任务暂停时，pipeline 的状态会变成暂停，
+        return:
+        """
+        # 获取正在暂停的pipeline任务
+        pipeline_id_list = self._get_pipeline_id_list()
+        # 暂停是针对于流程的暂停
+        pipeline_pause_root_id_list = (
+            State.objects.filter(name=states.SUSPENDED, node_id__in=pipeline_id_list).values("root_id").distinct()
+        )
+        # 获取
+        pause_pipeline_instance_id_list = PipelineInstance.objects.filter(
+            instance_id__in=pipeline_pause_root_id_list
+        ).values_list("id", flat=True)
+
+        queryset = self.queryset.filter(pipeline_instance_id__in=pause_pipeline_instance_id_list)
+
+        return queryset
+
+    def _filter_running(self):
+        """
+        正在运行的流程等于未完成的任务 -（暂停 + 失败的任务)
+
+        @return:
+        """
+        pipeline_id_list = self._get_pipeline_id_list()
+
+        # 这里统一使用 root_id 进行查询，可以避免进行失败和暂停两次查询
+        pipeline_failed_and_pause_root_id_list = (
+            State.objects.filter(name__in=[states.SUSPENDED, states.FAILED], root_id__in=pipeline_id_list)
+            .values("root_id")
+            .distinct()
+        )
+        pipeline_failed_and_pause_id_list = PipelineInstance.objects.filter(
+            instance_id__in=pipeline_failed_and_pause_root_id_list
+        ).values_list("id", flat=True)
+
+        queryset = self.queryset.filter(pipeline_instance__start_time__gte=self.start_time).exclude(
+            pipeline_instance_id__in=pipeline_failed_and_pause_id_list
+        )
+
+        return queryset
+
+
 class TaskFlowFilterSet(FilterSet):
     class Meta:
         model = TaskFlowInstance
@@ -182,6 +279,25 @@ class TaskFlowInstanceViewSet(GcloudReadOnlyViewSet, generics.CreateAPIView, gen
 
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
+        start_time = datetime.now() - timedelta(days=settings.TASK_LIST_STATUS_FILTER_DAYS)
+
+        task_instance_status = request.query_params.get("task_instance_status")
+        if task_instance_status:
+            if queryset.filter(
+                engine_ver=EngineConfig.ENGINE_VER_V1, pipeline_instance__start_time__gte=start_time
+            ).exists():
+                return Response(
+                    {
+                        "detail": ErrorDetail(
+                            "最近{}天有v1引擎的任务, 不支持筛选".format(settings.TASK_LIST_STATUS_FILTER_DAYS),
+                            err_code.REQUEST_PARAM_INVALID.code,
+                        )
+                    },
+                    exception=True,
+                )
+            queryset = TaskFLowStatusFilterHandler(
+                status=task_instance_status, queryset=queryset, start_time=start_time
+            ).get_queryset()
 
         # [我的动态] 接口过滤
         if "creator_or_executor" in request.query_params:
@@ -200,6 +316,7 @@ def list(self, request, *args, **kwargs):
             page = list(queryset)
         else:
             page = self.paginate_queryset(queryset)
+
         serializer = self.get_serializer(page, many=True)
         # 注入权限
         data = self.injection_auth_actions(request, serializer.data, page)
diff --git a/gcloud/core/context_processors.py b/gcloud/core/context_processors.py
index c3d1720bc1..787175950f 100644
--- a/gcloud/core/context_processors.py
+++ b/gcloud/core/context_processors.py
@@ -109,6 +109,7 @@ def mysetting(request):
         "BK_PLUGIN_DEVELOP_URL": settings.BK_PLUGIN_DEVELOP_URL,
         "ENABLE_IPV6": settings.ENABLE_IPV6,
         "BK_DOMAIN": env.BKPAAS_BK_DOMAIN,
+        "TASK_LIST_STATUS_FILTER_DAYS": settings.TASK_LIST_STATUS_FILTER_DAYS,
     }
 
     # custom context config
diff --git a/gcloud/tests/core/apis/drf/views_set/test_task_instance_view.py b/gcloud/tests/core/apis/drf/views_set/test_task_instance_view.py
new file mode 100644
index 0000000000..f955962bfb
--- /dev/null
+++ b/gcloud/tests/core/apis/drf/views_set/test_task_instance_view.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+"""
+Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community
+Edition) available.
+Copyright (C) 2017-2022 THL A29 Limited, a Tencent company. All rights reserved.
+Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://opensource.org/licenses/MIT
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+"""
+import datetime
+
+import factory
+from bamboo_engine import states
+from django.db.models import signals
+from django_test_toolkit.mixins.account import SuperUserMixin
+from django_test_toolkit.mixins.blueking import LoginExemptMixin, StandardResponseAssertionMixin
+from django_test_toolkit.mixins.drf import DrfPermissionExemptMixin
+from django_test_toolkit.testcases import ToolkitApiTestCase
+from pipeline.eri.models import State
+from pipeline.models import PipelineInstance, PipelineTemplate, Snapshot
+
+from gcloud.core.models import Project
+from gcloud.taskflow3.models import TaskFlowInstance
+
+
+class TestTaskInstanceView(
+    ToolkitApiTestCase,
+    SuperUserMixin,
+    LoginExemptMixin,
+    DrfPermissionExemptMixin,
+    StandardResponseAssertionMixin,
+):
+    @factory.django.mute_signals(signals.pre_save, signals.post_save)
+    def setUp(self):
+        super(TestTaskInstanceView, self).setUp()
+        self.node_id = "node_id"
+        self.root_id = "root_id"
+        self.test_snapshot = Snapshot.objects.create_snapshot({})
+        self.pipeline_template = PipelineTemplate.objects.create(
+            template_id="template_id", creator="creator", snapshot=self.test_snapshot
+        )
+        self.pipeline_instance = PipelineInstance.objects.create(
+            instance_id=self.root_id,
+            creator="creator",
+            snapshot=self.test_snapshot,
+            template=self.pipeline_template,
+            is_finished=False,
+            is_started=True,
+            is_revoked=False,
+            start_time=datetime.datetime.now(),
+        )
+        self.test_project = Project.objects.create(
+            name="proj",
+            creator="creator",
+        )
+
+        self.task_url = "/api/v3/taskflow/"
+
+        self.state = State.objects.create(
+            node_id=self.node_id, root_id=self.root_id, name=states.RUNNING, version="version"
+        )
+
+        self.taskflow_instance = TaskFlowInstance.objects.create(
+            project=self.test_project,
+            pipeline_instance=self.pipeline_instance,
+            template_id=self.pipeline_template.id,
+            engine_ver=2,
+        )
+
+    def test_filter_failed_task_list(self):
+        query_params = {
+            "pipeline_instance__is_started": True,
+            "pipeline_instance__is_finished": False,
+            "pipeline_instance__is_revoked": False,
+            "project__id": self.test_project.id,
+            "task_instance_status": "failed",
+        }
+
+        self.taskflow_instance.engine_ver = 1
+        self.taskflow_instance.save()
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertFalse(resp.data["result"])
+        self.assertEqual(resp.data["message"], "最近180天有v1引擎的任务, 不支持筛选")
+
+        self.taskflow_instance.engine_ver = 2
+        self.taskflow_instance.save()
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertTrue(resp.data["result"])
+        self.assertEqual(resp.data["data"]["count"], 0)
+
+        self.state.name = states.FAILED
+        self.state.save()
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertTrue(resp.data["result"])
+        self.assertEqual(resp.data["data"]["count"], 1)
+
+    def test_filter_pause_task_list(self):
+        query_params = {
+            "pipeline_instance__is_started": True,
+            "pipeline_instance__is_finished": False,
+            "pipeline_instance__is_revoked": False,
+            "project__id": self.test_project.id,
+            "task_instance_status": "pause",
+        }
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertTrue(resp.data["result"])
+        self.assertEqual(resp.data["data"]["count"], 0)
+
+        self.state.node_id = self.root_id
+        self.state.name = states.SUSPENDED
+        self.state.save()
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertTrue(resp.data["result"])
+        self.assertEqual(resp.data["data"]["count"], 1)
+
+    def test_filter_running_task_list(self):
+        query_params = {
+            "pipeline_instance__is_started": True,
+            "pipeline_instance__is_finished": False,
+            "pipeline_instance__is_revoked": False,
+            "project__id": self.test_project.id,
+            "task_instance_status": "running",
+        }
+
+        resp = self.client.get(path=self.task_url, data=query_params)
+        self.assertTrue(resp.data["result"])
+        self.assertEqual(resp.data["data"]["count"], 1)

From c6a81521a94a07910a4ea5719112ec2d585ed7d3 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 18 Aug 2023 16:18:22 +0800
Subject: [PATCH 033/112] =?UTF-8?q?optimization:=20=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E6=90=9C=E7=B4=A2=E7=BB=86?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/TableRenderHeader.vue   |  17 ++-
 frontend/desktop/src/config/i18n/cn.js        |   3 +-
 frontend/desktop/src/config/i18n/en.js        |   3 +-
 .../desktop/src/pages/task/TaskList/index.vue | 101 +++++++++++++++---
 .../template/TemplateList/projectTplList.vue  |   3 +-
 5 files changed, 107 insertions(+), 20 deletions(-)

diff --git a/frontend/desktop/src/components/common/TableRenderHeader.vue b/frontend/desktop/src/components/common/TableRenderHeader.vue
index ffb93da2f1..2f249b445f 100644
--- a/frontend/desktop/src/components/common/TableRenderHeader.vue
+++ b/frontend/desktop/src/components/common/TableRenderHeader.vue
@@ -21,7 +21,7 @@
             trigger="click"
             :distance="6"
             :arrow="false"
-            ext-cls="table-header-filter-popover"
+            :ext-cls="`table-header-filter-popover ${filterConfig.extCls}`"
             :on-hide="() => isFilterOpen = false">
             <i
                 class="bk-table-column-filter-trigger bk-icon icon-funnel"
@@ -46,7 +46,7 @@
                             <i class="check-icon bk-icon icon-check-line"></i>
                         </li>
                     </ul>
-                    <p class="clear-checked" @click="handleClearFilter">{{ $t('清空筛选') }}</p>
+                    <p v-if="filterConfig.multiple" class="clear-checked" @click="handleClearFilter">{{ $t('清空筛选') }}</p>
                 </template>
                 <p v-else class="no-search-data">{{ $t('查询无数据') }}</p>
             </div>
@@ -108,7 +108,9 @@
                     return {
                         show: false,
                         list: [],
-                        values: []
+                        values: [],
+                        multiple: false,
+                        extCls: ''
                     }
                 }
             }
@@ -220,12 +222,16 @@
                 return this.filterConfig.values.find(item => item.id === data.id)
             },
             handleFilter (data) {
-                const values = this.filterConfig.values
+                let values = this.filterConfig.values
                 const index = values.findIndex(item => item.id === data.id)
                 if (index > -1) {
                     values.splice(index, 1)
                 } else {
-                    values.push(data)
+                    if (this.filterConfig.multiple) {
+                        values.push(data)
+                    } else {
+                        values = [data]
+                    }
                 }
                 this.$emit('filterChange', values)
             },
@@ -350,6 +356,7 @@
                 align-items: center;
                 justify-content: space-between;
                 padding: 0 15px;
+                color: #63656e;
                 cursor: pointer;
                 .label-name {
                     padding: 2px 6px;
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 748e14c05c..942681d59f 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1755,7 +1755,8 @@ const cn = {
     '执行结果': '执行结果',
     '最大化': '最大化',
     '间隔': '间隔',
-    'error_handle_秒': '秒'
+    'error_handle_秒': '秒',
+    '仅支持查询最近x天任务记录': '仅支持查询最近{x}天任务记录'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index f966fd3065..52ad008802 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1789,7 +1789,8 @@ const en = {
     '执行结果': 'Results',
     '最大化': 'Max',
     '间隔': 'with ',
-    'error_handle_秒': 'Sec Interval'
+    'error_handle_秒': 'Sec Interval',
+    '仅支持查询最近x天任务记录': 'You can only query the tasks for the last {x} days.'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskList/index.vue b/frontend/desktop/src/pages/task/TaskList/index.vue
index 74a767196e..4966722892 100644
--- a/frontend/desktop/src/pages/task/TaskList/index.vue
+++ b/frontend/desktop/src/pages/task/TaskList/index.vue
@@ -188,6 +188,15 @@
     import task from '@/mixins/task.js'
     import CancelRequest from '@/api/cancelRequest.js'
 
+    const TASK_STATUS_LIST = [
+        { id: 'nonExecution', name: i18n.t('未执行') },
+        { id: 'running', name: i18n.t('执行中') },
+        { id: 'failed', name: i18n.t('失败') },
+        { id: 'pause', name: i18n.t('暂停') },
+        { id: 'finished', name: i18n.t('完成') },
+        { id: 'revoked', name: i18n.t('终止') }
+    ]
+
     const SEARCH_LIST = [
         {
             id: 'task_id',
@@ -209,12 +218,7 @@
         {
             id: 'statusSync',
             name: i18n.t('状态'),
-            children: [
-                { id: 'nonExecution', name: i18n.t('未执行') },
-                { id: 'running', name: i18n.t('未完成') },
-                { id: 'revoked', name: i18n.t('终止') },
-                { id: 'finished', name: i18n.t('完成') }
-            ]
+            children: TASK_STATUS_LIST
         },
         {
             id: 'create_method',
@@ -322,6 +326,7 @@
                 create_method = '',
                 recorded_executor_proxy = ''
             } = this.$route.query
+            const dateInfo = { start_time, create_time, finish_time }
             const searchList = [
                 ...SEARCH_LIST,
                 { id: 'start_time', name: i18n.t('执行开始'), type: 'dateRange' },
@@ -333,8 +338,20 @@
                 if (values_text) {
                     let values = []
                     if (!cur.children) {
-                        values = cur.type === 'dateRange' ? values_text.split(',') : [values_text]
-                        acc.push({ ...cur, values })
+                        if (cur.type === 'dateRange') {
+                            // 判断时间是否超出
+                            const startDate = values_text.split(',')[0]
+                            const isExceed = this.judgeDateIsExceed(startDate)
+                            if (isExceed) {
+                                dateInfo[cur.id] = ''
+                            } else {
+                                values = values_text.split(',')
+                                acc.push({ ...cur, values })
+                            }
+                        } else {
+                            values = [values_text]
+                            acc.push({ ...cur, values })
+                        }
                     } else if (cur.children.length) {
                         const ids = values_text.split(',')
                         values = cur.children.filter(item => ids.includes(String(item.id)))
@@ -357,9 +374,9 @@
                 createInfo: create_info,
                 templateSource: template_source,
                 requestData: {
-                    start_time: start_time ? start_time.split(',') : ['', ''],
-                    create_time: create_time ? create_time.split(',') : ['', ''],
-                    finish_time: finish_time ? finish_time.split(',') : ['', ''],
+                    start_time: dateInfo.start_time ? dateInfo.start_time.split(',') : ['', ''],
+                    create_time: dateInfo.create_time ? dateInfo.create_time.split(',') : ['', ''],
+                    finish_time: dateInfo.finish_time ? dateInfo.finish_time.split(',') : ['', ''],
                     creator,
                     executor,
                     statusSync,
@@ -442,14 +459,18 @@
                     let pipeline_instance__is_started
                     let pipeline_instance__is_finished
                     let pipeline_instance__is_revoked
+                    let task_instance_status
                     switch (statusSync) {
                         case 'nonExecution':
                             pipeline_instance__is_started = false
                             break
+                        case 'failed':
+                        case 'pause':
                         case 'running':
                             pipeline_instance__is_started = true
                             pipeline_instance__is_finished = false
                             pipeline_instance__is_revoked = false
+                            task_instance_status = statusSync
                             break
                         case 'revoked':
                             pipeline_instance__is_revoked = true
@@ -475,7 +496,8 @@
                         id: task_id || undefined,
                         create_method: create_method || undefined,
                         recorded_executor_proxy: recorded_executor_proxy || undefined,
-                        is_child_taskflow: false
+                        is_child_taskflow: false,
+                        task_instance_status: task_instance_status || undefined
                     }
 
                     if (start_time && start_time[0] && start_time[1]) {
@@ -831,6 +853,23 @@
                         dateValue={ date }
                         onDateChange={ data => this.handleDateTimeFilter(data, id) }>
                     </TableRenderHeader>
+                } else if (column.property === 'task_status') {
+                    const data = this.searchSelectValue.find(item => item.id === 'statusSync')
+                    const filterConfig = {
+                        show: true,
+                        list: TASK_STATUS_LIST,
+                        values: data ? data.values : [],
+                        multiple: false,
+                        extCls: 'task-status-popover'
+                    }
+                    return <TableRenderHeader
+                        name={ column.label }
+                        property={ column.property }
+                        orderShow={ false }
+                        dateFilterShow={ false }
+                        filterConfig = { filterConfig }
+                        onFilterChange={ data => this.handleTaskStatusFilter(data) }>
+                    </TableRenderHeader>
                 } else {
                     return h('p', {
                         class: 'label-text',
@@ -842,7 +881,23 @@
                     ])
                 }
             },
+            handleTaskStatusFilter (data) {
+                const index = this.searchSelectValue.findIndex(item => item.id === 'statusSync')
+                if (data.length) {
+                    if (index > -1) {
+                        this.searchSelectValue[index].values = data
+                    } else {
+                        const form = this.searchList.find(item => item.id === 'statusSync')
+                        this.searchSelectValue.push({ ...form, values: data })
+                    }
+                } else if (index > -1) {
+                    this.searchSelectValue.splice(index, 1)
+                }
+            },
             handleDateTimeFilter (date = [], id) {
+                // 判断时间是否超出
+                const isExceed = this.judgeDateIsExceed(date[0])
+                if (isExceed) return
                 const index = this.searchSelectValue.findIndex(item => item.id === id)
                 if (date.length) {
                     if (index > -1) {
@@ -863,6 +918,21 @@
                     this.searchSelectValue.splice(index, 1)
                 }
             },
+            // 判断时间是否超出
+            judgeDateIsExceed (date) {
+                let startDate = moment(date).format('YYYY-MM-DD')
+                startDate = Number(startDate.split('-').join(''))
+                let nowDate = moment(new Date()).format('YYYY-MM-DD')
+                nowDate = Number(nowDate.split('-').join(''))
+                if (nowDate - startDate > 180) {
+                    this.$bkMessage({
+                        message: i18n.t('仅支持查询最近x天任务记录', { x: 180 }),
+                        theme: 'warning'
+                    })
+                    return true
+                }
+                return false
+            },
             getRowClassName ({ row }) {
                 return this.selectedTaskId === row.id ? 'selected-row' : row.is_child_taskflow ? 'expand-row' : ''
             },
@@ -1109,3 +1179,10 @@
     }
 }
 </style>
+<style lang="scss">
+.task-status-popover {
+    .option-list {
+        width: 100px;
+    }
+}
+</style>
diff --git a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue
index e3cf623203..965e31517c 100644
--- a/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue
+++ b/frontend/desktop/src/pages/template/TemplateList/projectTplList.vue
@@ -1408,7 +1408,8 @@
                     const filterConfig = {
                         show: true,
                         list,
-                        values: data ? data.values : []
+                        values: data ? data.values : [],
+                        multiple: true
                     }
                     return <TableRenderHeader
                         name={ column.label }

From 0dc1e90c92aa8e25d7dd2d91461240d46592a7f0 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 14 Jul 2023 11:25:55 +0800
Subject: [PATCH 034/112] =?UTF-8?q?minor:=20=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/assets/html/index.html                  | 1 +
 frontend/desktop/src/components/common/TableRenderHeader.vue | 1 +
 frontend/desktop/src/pages/task/TaskList/index.vue           | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/desktop/src/assets/html/index.html b/frontend/desktop/src/assets/html/index.html
index f0ef4bcb16..f3e246069e 100644
--- a/frontend/desktop/src/assets/html/index.html
+++ b/frontend/desktop/src/assets/html/index.html
@@ -48,6 +48,7 @@
         var MAX_NODE_EXECUTE_TIMEOUT = {{MAX_NODE_EXECUTE_TIMEOUT}};
         var BK_DOMAIN = '{{BK_DOMAIN}}';
         var BK_PAAS_ESB_HOST = '{{BK_PAAS_ESB_HOST}}'
+        var TASK_LIST_STATUS_FILTER_DAYS = {{TASK_LIST_STATUS_FILTER_DAYS}}
         function getCookie(name) {
             var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
             return (arr = document.cookie.match(reg)) ? unescape(arr[2]) : null;
diff --git a/frontend/desktop/src/components/common/TableRenderHeader.vue b/frontend/desktop/src/components/common/TableRenderHeader.vue
index 2f249b445f..d51b419dd1 100644
--- a/frontend/desktop/src/components/common/TableRenderHeader.vue
+++ b/frontend/desktop/src/components/common/TableRenderHeader.vue
@@ -350,6 +350,7 @@
             overflow: auto;
             @include scrollbar;
             margin-bottom: 15px;
+            background: #fff;
             .option-item {
                 height: 32px;
                 display: flex;
diff --git a/frontend/desktop/src/pages/task/TaskList/index.vue b/frontend/desktop/src/pages/task/TaskList/index.vue
index 4966722892..3fa2d6f78e 100644
--- a/frontend/desktop/src/pages/task/TaskList/index.vue
+++ b/frontend/desktop/src/pages/task/TaskList/index.vue
@@ -924,9 +924,9 @@
                 startDate = Number(startDate.split('-').join(''))
                 let nowDate = moment(new Date()).format('YYYY-MM-DD')
                 nowDate = Number(nowDate.split('-').join(''))
-                if (nowDate - startDate > 180) {
+                if (nowDate - startDate > window.TASK_LIST_STATUS_FILTER_DAYS) {
                     this.$bkMessage({
-                        message: i18n.t('仅支持查询最近x天任务记录', { x: 180 }),
+                        message: i18n.t('仅支持查询最近x天任务记录', { x: window.TASK_LIST_STATUS_FILTER_DAYS }),
                         theme: 'warning'
                     })
                     return true

From 5a41ce185dac82503318c2d28bc7b74e1e7eea76 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 21 Aug 2023 10:54:41 +0800
Subject: [PATCH 035/112] =?UTF-8?q?optimization:=20=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=A0=91=E7=8B=AC=E7=AB=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=BC=98=E5=8C=96&&=E5=85=8D=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/FormGroup.vue           |   2 +
 .../components/common/RenderForm/FormItem.vue |   5 +-
 .../RenderForm/IpSelector/DynamicGroup.vue    |  22 ++-
 .../RenderForm/IpSelector/DynamicIp.vue       |  38 +++-
 .../RenderForm/IpSelector/IpSelectorTable.vue |  30 ++-
 .../IpSelector/SingleIpSelector.vue           |  58 ------
 .../common/RenderForm/tags/TagCodeEditor.vue  | 125 ++++++------
 .../common/RenderForm/tags/TagIpSelector.vue  |  29 +--
 frontend/desktop/src/config/i18n/cn.js        |   6 +-
 frontend/desktop/src/config/i18n/en.js        |   6 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 187 ++++++++++++------
 .../ExecuteInfo/ExecuteInfoForm.vue           |   2 +-
 .../TaskExecute/ExecuteInfo/ExecuteRecord.vue |  10 +-
 .../TaskExecute/ExecuteInfo/InputParams.vue   |   2 +-
 .../ExecuteInfo/NodeOperationFlow.vue         |   5 +
 .../src/pages/task/TaskExecute/NodeTree.vue   |   2 +-
 .../pages/task/TaskExecute/NodeTreeItem.vue   |   2 +-
 .../pages/task/TaskExecute/TaskOperation.vue  |  43 +++-
 .../TemplateEdit/NodeConfig/BasicInfo.vue     |   2 +-
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |  95 ++++++++-
 20 files changed, 439 insertions(+), 232 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index a104cffa90..d1042da71b 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -268,12 +268,14 @@
                         if (isMatch) {
                             this.isShowRenderIcon = true
                         } else {
+                            this.showHook = false
                             this.$nextTick(() => {
                                 this.onRenderChange()
                             })
                         }
                     }
                 } else {
+                    this.showHook = false
                     if (!this.render) {
                         this.isShowRenderIcon = true
                     }
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 6847f626fc..0962868297 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -331,10 +331,13 @@
                         if (isMatch) {
                             this.isShowRenderIcon = true
                         } else {
+                            this.showHook = false
                             this.$nextTick(() => {
                                 this.onRenderChange()
                             })
                         }
+                    } else {
+                        this.showHook = false
                     }
                 } else {
                     if (!this.render) {
@@ -642,7 +645,7 @@
     }
     .rf-tag-hook {
         position: absolute;
-        top: 30px;
+        top: 0;
         right: 0;
         display: flex;
         align-items: center;
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
index 0b97fa3192..93d9a9bcd4 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
@@ -44,7 +44,8 @@
                         :class="['selected-item', { 'disabled': !editable }]"
                         v-for="item in selectedGroups"
                         :key="item.id">
-                        {{ item.name }}
+                        <div class="group-name" v-bk-overflow-tips>{{ item.name }}</div>
+                        <span class="invalid" v-if="item.diff">{{ $t('失效') }}</span>
                         <i v-if="editable" class="common-icon-dark-circle-close" @click="onGroupSelectChange(item)"></i>
                     </div>
                 </div>
@@ -179,6 +180,25 @@
         position: relative;
         padding: 0 28px 0 8px;
         line-height: 32px;
+        display: flex;
+        align-items: center;
+        .group-name {
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+        }
+        .invalid {
+            flex-shrink: 0;
+            height: 20px;
+            line-height: 15px;
+            padding: 2px 5px;
+            margin-left: 5px;
+            transform: scale(0.8);
+            color: #63656e;
+            background: #f0f1f5;
+            border: 1px solid #c4c6cc;
+            border-radius: 2px;
+        }
         &.disabled {
             color: #ccc;
             cursor: not-allowed;
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
index fca0b65c1e..31b4e91cb1 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
@@ -44,10 +44,10 @@
                     <div
                         :class="['ip-item', { 'disabled': !editable }]"
                         v-for="item in selectedIpsPath"
-                        v-bk-overflow-tips
                         :key="item.key">
-                        {{ item.namePath }}
-                        <i v-if="editable" class="common-icon-dark-circle-close" @click="onDeleteSelected(item.key)"></i>
+                        <div class="ip-path" v-bk-overflow-tips>{{ item.namePath }}</div>
+                        <span class="invalid" v-if="item.diff">{{ $t('失效') }}</span>
+                        <i v-if="editable" class="common-icon-dark-circle-close" @click="onDeleteSelected(item.key, item.diff)"></i>
                     </div>
                 </div>
             </div>
@@ -90,8 +90,12 @@
                         this.$refs.topoTree.setChecked(item, { checked: false })
                         this.getCheckedNodeInfo(this.topoList, item)
                         if (this.checkedNode) {
-                            this.checkedNode.id = this.checkedNode.uniqueId
-                            this.onNodeCheckClick(this.selectedIps, this.checkedNode, false)
+                            if (this.checkedNode.id !== this.checkedNode.uniqueId) {
+                                this.checkedNode.id = this.checkedNode.uniqueId
+                                this.onNodeCheckClick(this.selectedIps, this.checkedNode, false)
+                            } else {
+                                this.selectedNodeList.push(item)
+                            }
                         }
                     })
                 })
@@ -157,6 +161,8 @@
                             if (selectedNode) {
                                 const namePath = this.getNodeNamePath(selectedNode)
                                 selectedIpsPath.push({ key, namePath })
+                            } else {
+                                selectedIpsPath.push({ key, namePath: key.split('_').join('/'), diff: true })
                             }
                         })
                         this.selectedIpsPath = selectedIpsPath
@@ -333,9 +339,25 @@
         position: relative;
         padding: 0 28px 0 8px;
         line-height: 32px;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
+        display: flex;
+        align-items: center;
+        .ip-path {
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+        }
+        .invalid {
+            flex-shrink: 0;
+            height: 20px;
+            line-height: 15px;
+            padding: 2px 5px;
+            margin-left: 5px;
+            transform: scale(0.8);
+            color: #63656e;
+            background: #f0f1f5;
+            border: 1px solid #c4c6cc;
+            border-radius: 2px;
+        }
         &.disabled {
             color: #ccc;
             cursor: not-allowed;
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
index 42db940faa..1cc43be13e 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
@@ -21,11 +21,15 @@
                 :sortable="columnInfo.sortable"
                 :prop="columnInfo.id">
                 <template slot-scope="{ row }">
+                    <div v-if="columnInfo.id === 'bk_host_innerip'" class="host-inner-ip">
+                        <div class="inner-ip" v-bk-overflow-tips>{{ row.bk_host_innerip }}</div>
+                        <span class="invalid" v-if="row.diff">{{ $t('失效') }}</span>
+                    </div>
                     <div
-                        v-if="columnInfo.id === 'agent'"
+                        v-else-if="columnInfo.id === 'agent'"
                         v-bk-overflow-tips
-                        :class="!editable ? 'agent-disabled' : row.agent === 1 ? 'agent-normal' : 'agent-failed'">
-                        {{ row.agent === 1 ? $t('正常') : $t('异常') }}
+                        :class="!editable ? 'agent-disabled' : row.diff ? '' : row.agent === 1 ? 'agent-normal' : 'agent-failed'">
+                        {{ row.diff ? '--' : row.agent === 1 ? $t('正常') : $t('异常') }}
                     </div>
                     <div v-else-if="columnInfo.id === 'cloud'">
                         {{ row.cloud[0] && row.cloud[0].bk_inst_name }}
@@ -179,6 +183,7 @@
             }
         },
         created () {
+            console.log(this.listInPage)
             if (this.staticIpTableConfig.length) {
                 this.tableColumnList.forEach(item => {
                     item.checked = this.staticIpTableConfig.includes(item.id)
@@ -273,6 +278,25 @@
         text-overflow:ellipsis;
         white-space:nowrap;
     }
+    .host-inner-ip {
+        display: flex;
+        align-items: center;
+        .inner-ip {
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
+        }
+        .invalid {
+            flex-shrink: 0;
+            padding: 2px 5px;
+            margin-left: 5px;
+            transform: scale(0.8);
+            color: #63656e;
+            background: #f0f1f5;
+            border: 1px solid #c4c6cc;
+            border-radius: 2px;
+        }
+    }
     .agent-disabled {
         color: #ccc;
     }
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/SingleIpSelector.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/SingleIpSelector.vue
index ef855ccfc2..6ae7c3d615 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/SingleIpSelector.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/SingleIpSelector.vue
@@ -21,18 +21,6 @@
                 <span class="radio-text">{{selector.name}}</span>
             </div>
         </div>
-        <bk-alert
-            v-if="curSelectorTab.hasDiff"
-            ref="diffAlert"
-            type="warning"
-            style="margin-bottom: 10px;"
-            :class="{ 'alert-disabled': !editable }"
-            :show-icon="false">
-            <div class="diff-alert" slot="title">
-                <span>{{ $t('表单保存数据与最新的CMDB') + curSelectorTab.name.replace(/\s/, '') + $t('配置存在差异，是否更新变量数据？') }}</span>
-                <bk-link theme="primary" @click="updateDiffData">{{ $t('确认') }}</bk-link>
-            </div>
-        </bk-alert>
         <div class="selector-content">
             <static-ip
                 v-show="activeSelector === 'ip'"
@@ -129,36 +117,6 @@
                 this.curSelectorTab = selector
                 this.$emit('change', 'selectors', [selector.id])
             },
-            updateDiffData () {
-                if (!this.editable) return
-                const selectors = this.activeSelector
-                let selectList = selectors === 'ip' ? this.staticIps : selectors === 'topo' ? this.dynamicIps : this.dynamicGroups
-                selectList = selectList.filter((value, index) => {
-                    let result = true
-                    // 删除掉没匹配上的
-                    if (selectors === 'ip') {
-                        result = this.staticIpList.find(item => item.bk_host_id === value.bk_host_id)
-                    } else if (selectors === 'topo') {
-                        result = this.loopDynamicIpList(this.dynamicIpList, value.bk_obj_id, value.bk_inst_id)
-                    } else {
-                        result = this.dynamicGroupList.find(item => item.id === value.id)
-                    }
-                    return result
-                })
-                this.$emit('change', selectors, selectList)
-                this.curSelectorTab.hasDiff = false
-            },
-            loopDynamicIpList (list, objId, instId) {
-                return list.some(item => {
-                    if (item.bk_obj_id === objId && item.bk_inst_id === instId) {
-                        return true
-                    } else if (item.child && item.child.length) {
-                        return this.loopDynamicIpList(item.child, objId, instId)
-                    } else {
-                        return false
-                    }
-                })
-            },
             onStaticIpTableSettingChange (val) {
                 this.$emit('change', 'static_ip_table_config', val)
             },
@@ -227,20 +185,4 @@
         margin-right: 30px;
     }
 }
-.diff-alert {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    /deep/ .bk-link-text {
-        font-size: 12px;
-    }
-}
-.alert-disabled {
-    color: #ccc;
-    cursor: not-allowed;
-    /deep/ .bk-link-text {
-        color: #ccc;
-        cursor: not-allowed;
-    }
-}
 </style>
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
index eac702a8e3..520428a8f5 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
@@ -13,7 +13,11 @@
     <div class="tag-code-editor">
         <bk-alert type="warning" closable :close-text="$t('我知道了')" v-if="globalVarLength">
             <template slot="title">
-                <i18n tag="div" path="tagCodeEditorTips">
+                <i18n v-if="render" tag="div" path="tagRenderCodeEditorTips">
+                    <span class="strong">{{ $t('即将废弃') }}</span>
+                    <span class="strong num">{{ globalVarLength }}</span>
+                </i18n>
+                <i18n v-else tag="div" path="tagCodeEditorTips">
                     <span class="strong">{{ $t('不再支持') }}</span>
                     <span class="strong num">{{ globalVarLength }}</span>
                 </i18n>
@@ -154,72 +158,69 @@
             },
             // 变量tag设置
             setVariableTag (value, valueUpdate) {
-                // 不是变量免渲染则首先判断脚本内容是否包含全局变量
-                if (this.render) {
-                    const regex = /\${[a-zA-Z_]\w*}/
-                    const rows = value.split('\n')
-                    // 获取光标所在行
-                    const { monacoInstance } = this.$refs.tagCodeEditor?.$refs.codeEditor || {}
-                    const { lineNumber } = monacoInstance?.getPosition() || {}
-                    if (regex.test(value)) {
-                        const matchMap = rows.reduce((acc, cur, idx) => {
-                            const variables = cur.match(/\${[a-zA-Z_]\w*}/g) || []
-                            const matchList = variables.filter(item => this.constantArr.includes(item))
-                            if (matchList.length) {
-                                acc[idx + 1] = matchList
-                            }
-                            return acc
-                        }, {})
-                        // 脚本内容存在全局变量
-                        this.globalVarLength = Object.values(matchMap).flat().length
-                        // 数据更新处理逻辑
-                        if (valueUpdate) {
-                            // 清空本行所有变量色块
-                            if (this.decorationsMap[lineNumber]) {
-                                this.decorationsMap[lineNumber].forEach(decorations => {
-                                    monacoInstance.deltaDecorations(
-                                        [...decorations],
-                                        []
-                                    )
-                                })
-                                delete this.decorationsMap[lineNumber]
-                            }
-                            // 检查光标位置，如果光标没有定位在全局变量所在行，则不进行后续处理
-                            if (!matchMap[lineNumber]) return
+                const regex = /\${[a-zA-Z_]\w*}/
+                const rows = value.split('\n')
+                // 获取光标所在行
+                const { monacoInstance } = this.$refs.tagCodeEditor?.$refs.codeEditor || {}
+                const { lineNumber } = monacoInstance?.getPosition() || {}
+                if (regex.test(value)) {
+                    const matchMap = rows.reduce((acc, cur, idx) => {
+                        const variables = cur.match(/\${[a-zA-Z_]\w*}/g) || []
+                        const matchList = variables.filter(item => this.constantArr.includes(item))
+                        if (matchList.length) {
+                            acc[idx + 1] = matchList
                         }
-                        Object.keys(matchMap).forEach(idx => {
-                            let start = 0 // 兼容一行中有多个相同的变量
-                            matchMap[idx].forEach(variable => {
-                                const startNumber = rows[idx - 1].indexOf(variable, start) + 1
-                                const endNumber = startNumber + variable.length
-                                start = endNumber
-                                const decorations = monacoInstance.deltaDecorations(
-                                    [],
-                                    [
-                                        {
-                                            range: new monaco.Range(idx, startNumber, idx, endNumber),
-                                            options: {
-                                                inlineClassName: 'variable-tag'
-                                            }
-                                        }
-                                    ]
+                        return acc
+                    }, {})
+                    // 脚本内容存在全局变量
+                    this.globalVarLength = Object.values(matchMap).flat().length
+                    // 数据更新处理逻辑
+                    if (valueUpdate) {
+                        // 清空本行所有变量色块
+                        if (this.decorationsMap[lineNumber]) {
+                            this.decorationsMap[lineNumber].forEach(decorations => {
+                                monacoInstance.deltaDecorations(
+                                    [...decorations],
+                                    []
                                 )
-                                if (idx in this.decorationsMap) {
-                                    this.decorationsMap[idx].push(decorations)
-                                } else {
-                                    this.decorationsMap[idx] = [decorations]
-                                }
                             })
-                        })
-                    } else if (this.decorationsMap[lineNumber]) {
-                        this.decorationsMap[lineNumber].forEach(decorations => {
-                            monacoInstance.deltaDecorations(
-                                [...decorations],
-                                []
+                            delete this.decorationsMap[lineNumber]
+                        }
+                        // 检查光标位置，如果光标没有定位在全局变量所在行，则不进行后续处理
+                        if (!matchMap[lineNumber]) return
+                    }
+                    Object.keys(matchMap).forEach(idx => {
+                        let start = 0 // 兼容一行中有多个相同的变量
+                        matchMap[idx].forEach(variable => {
+                            const startNumber = rows[idx - 1].indexOf(variable, start) + 1
+                            const endNumber = startNumber + variable.length
+                            start = endNumber
+                            const decorations = monacoInstance.deltaDecorations(
+                                [],
+                                [
+                                    {
+                                        range: new monaco.Range(idx, startNumber, idx, endNumber),
+                                        options: {
+                                            inlineClassName: 'variable-tag'
+                                        }
+                                    }
+                                ]
                             )
+                            if (idx in this.decorationsMap) {
+                                this.decorationsMap[idx].push(decorations)
+                            } else {
+                                this.decorationsMap[idx] = [decorations]
+                            }
                         })
-                        this.decorationsMap = {}
-                    }
+                    })
+                } else if (this.decorationsMap[lineNumber]) {
+                    this.decorationsMap[lineNumber].forEach(decorations => {
+                        monacoInstance.deltaDecorations(
+                            [...decorations],
+                            []
+                        )
+                    })
+                    this.decorationsMap = {}
                 }
             },
             onLanguageChange () {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
index 821848eb43..bd994b6fc5 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
@@ -75,20 +75,17 @@
         {
             type: 'staticIp',
             id: 'ip',
-            name: i18n.t('静态 IP'),
-            hasDiff: false
+            name: i18n.t('静态 IP')
         },
         {
             type: 'dynamicIp',
             id: 'topo',
-            name: i18n.t('动态拓扑'),
-            hasDiff: false
+            name: i18n.t('动态拓扑')
         },
         {
             type: 'dynamicGroup',
             id: 'group',
-            name: i18n.t('动态分组'),
-            hasDiff: false
+            name: i18n.t('动态分组')
         },
         {
             type: 'manualInput',
@@ -176,27 +173,21 @@
                 ]).then(values => {
                     if (Array.isArray(values)) {
                         let hasDiff = false
-                        const value = tools.deepClone(this.value)
-                        const { ip, topo, group } = value
+                        const { ip, group } = this.value
                         values.forEach((v, index) => {
                             switch (index) {
                                 case 0:
                                     this.staticIpList = v.data
                                     if (!this.hook) { // 表单没有被勾选
-                                        hasDiff = ip.some(value => {
+                                        ip.forEach(value => {
                                             // 拿到新的静态ip列表后替换对应的已保存ip属性，如果已保存ip在新列表中不存在，则提示用户手动更新
-                                            return this.staticIpList.every(item => item.bk_host_id !== value.bk_host_id)
+                                            hasDiff = this.staticIpList.every(item => item.bk_host_id !== value.bk_host_id)
+                                            this.$set(value, 'diff', hasDiff)
                                         })
-                                        this.selectorTabs[0].hasDiff = hasDiff
                                     }
                                     break
                                 case 1:
                                     this.dynamicIpList = v.data
-                                    // 判断动态IP数据与最新的CMDB动态IP配置是否存在差异
-                                    hasDiff = topo.every(item => {
-                                        return this.loopDynamicIpList(this.dynamicIpList, item.bk_obj_id, item.bk_inst_id)
-                                    })
-                                    this.selectorTabs[1].hasDiff = !hasDiff
                                     break
                                 case 2:
                                     this.topoModelList = v.data
@@ -205,10 +196,10 @@
                                     this.dynamicGroupList = v.data.info
                                     // 判断动态分组数据与最新的CMDB动态分组配置是否存在差异
                                     const dynamicGroups = group || []
-                                    hasDiff = dynamicGroups.some(value => {
-                                        return this.dynamicGroupList.every(item => item.id !== value.id)
+                                    dynamicGroups.some(value => {
+                                        hasDiff = this.dynamicGroupList.every(item => item.id !== value.id)
+                                        this.$set(value, 'diff', hasDiff)
                                     })
-                                    this.selectorTabs[2].hasDiff = hasDiff
                                     break
                             }
                         })
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 942681d59f..41be15dce9 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1750,13 +1750,15 @@ const cn = {
     '取消默认方案成功': '取消默认方案成功',
     '确认删除执行方案【n】?': '确认删除执行方案【{n}】？',
     '取消设为默认方案': '取消设为默认方案',
-    'tagCodeEditorTips': '脚本内容{0}全局变量。检测到疑似 {1} 处引用，建议使用脚本参数传入。',
+    'tagRenderCodeEditorTips': '检测到疑似 {1} 处引用全局变量，此用法{0}，建议使用脚本参数传入。',
+    'tagCodeEditorTips': '脚本内容{0}全局变量。检测到疑似 {1} 处引用，请使用脚本参数传入。',
     '不再支持': '不再支持',
     '执行结果': '执行结果',
     '最大化': '最大化',
     '间隔': '间隔',
     'error_handle_秒': '秒',
-    '仅支持查询最近x天任务记录': '仅支持查询最近{x}天任务记录'
+    '仅支持查询最近x天任务记录': '仅支持查询最近{x}天任务记录',
+    '失效': '失效'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 52ad008802..ee64d036c8 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1783,14 +1783,16 @@ const en = {
     '取消默认方案成功': 'Default Node-Group Cancelled',
     '确认删除执行方案【n】?': 'Confirm to delete node-group [ {n} ] ?',
     '取消设为默认方案': 'Unset as Default',
-    'tagCodeEditorTips': 'Script content {0} global variable. A suspected reference to {1} was detected, and it is recommended to use script parameters to pass in.',
+    'tagRenderCodeEditorTips': 'A suspected reference to {1} was detected global variable. This usage is about to be discarded, it is recommended to use script parameters to pass in.',
+    'tagCodeEditorTips': 'Script content {0} global variable. A suspected reference to {1} was detected, and please use script parameters to pass in.',
     '不再支持': 'no supported',
     '添加收藏': 'Collection',
     '执行结果': 'Results',
     '最大化': 'Max',
     '间隔': 'with ',
     'error_handle_秒': 'Sec Interval',
-    '仅支持查询最近x天任务记录': 'You can only query the tasks for the last {x} days.'
+    '仅支持查询最近x天任务记录': 'You can only query the tasks for the last {x} days.',
+    '失效': 'Invalid'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index d9556bcc77..e85fac8064 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -129,6 +129,7 @@
                                     :node-activity="nodeActivity"
                                     :execute-info="executeRecord"
                                     :node-detail-config="nodeDetailConfig"
+                                    :not-performed-sub-node="notPerformedSubNode"
                                     :is-sub-process-node="isSubProcessNode">
                                 </ExecuteRecord>
                                 <ExecuteInfoForm
@@ -139,10 +140,15 @@
                                     :constants="pipelineData.constants"
                                     :is-third-party-node="isThirdPartyNode"
                                     :third-party-node-code="thirdPartyNodeCode"
+                                    :not-performed-sub-node="notPerformedSubNode"
                                     :is-sub-process-node="isSubProcessNode">
                                 </ExecuteInfoForm>
                                 <section class="info-section" data-test-id="taskExcute_form_operatFlow" v-else-if="curActiveTab === 'history'">
-                                    <NodeOperationFlow :locations="pipelineData.location" :node-id="executeInfo.id"></NodeOperationFlow>
+                                    <NodeOperationFlow
+                                        :locations="pipelineData.location"
+                                        :node-id="executeInfo.id"
+                                        :not-performed-sub-node="notPerformedSubNode">
+                                    </NodeOperationFlow>
                                 </section>
                                 <NodeLog
                                     v-else-if="curActiveTab === 'log'"
@@ -318,7 +324,9 @@
                 timer: null,
                 subprocessLoading: true,
                 subprocessTasks: [],
-                subprocessNodeStatus: {}
+                subprocessNodeStatus: {},
+                subNodesExpanded: [], // 节点树展开的独立子流程节点
+                notPerformedSubNode: false // 是否为未执行的独立子流程节点
             }
         },
         computed: {
@@ -468,7 +476,17 @@
             nodeDetailConfig: {
                 handler (val) {
                     if (val.node_id !== undefined) {
-                        this.loadNodeInfo()
+                        this.loop = 1
+                        this.theExecuteTime = undefined
+                        this.curActiveTab = 'record'
+                        // 未执行的独立子流程节点
+                        if (this.notPerformedSubNode) {
+                            this.loading = false
+                            this.subprocessLoading = false
+                            this.randomKey = new Date().getTime()
+                        } else {
+                            this.loadNodeInfo()
+                        }
                     }
                     if (val.component_code === 'subprocess_plugin') {
                         this.subCanvasData = val.componentData.subprocess.value.pipeline
@@ -542,21 +560,26 @@
                     this.executeInfo = respData
                     // 独立子流程任务特殊处理
                     if (this.isSubProcessNode) {
-                        const taskId = respData.outputsInfo[0].value
+                        const taskInfo = respData.outputsInfo.find(item => item.key === 'task_id') || {}
+                        const taskId = taskInfo.value
                         const { root_node, node_id } = this.nodeDetailConfig
                         this.subprocessLoading = true
-                        // 获取子流程任务详情
-                        await this.getSubprocessData({
-                            taskId,
-                            root_node,
-                            node_id
-                        })
-                        this.subprocessTasks[taskId] = {
-                            root_node,
-                            node_id
+                        const nodeInfo = this.getNodeInfo(this.nodeData, root_node, node_id)
+                        if (taskId) { // 子流程任务已执行才可以查详情和状态
+                            // 获取子流程任务详情
+                            await this.getSubprocessData(taskId, nodeInfo)
+                            this.subprocessTasks[taskId] = {
+                                root_node,
+                                node_id
+                            }
+                            // 获取独立子流程任务状态
+                            this.loadSubprocessStatus()
+                        } else {
+                            nodeInfo.dynamicLoad = false
+                            this.subprocessLoading = false
+                            // 记录子流程展开收起
+                            this.setSubNodeExpanded(nodeInfo)
                         }
-                        // 获取独立子流程任务状态
-                        this.loadSubprocessStatus()
                     } else if (this.subProcessPipeline) {
                         this.subprocessLoading = false
                     }
@@ -751,6 +774,8 @@
                     }
                     if (res.result) {
                         return res.data
+                    } else {
+                        this.subprocessLoading = false
                     }
                 } catch (e) {
                     console.log(e)
@@ -947,6 +972,16 @@
             },
             onSelectNode (node) {
                 this.loading = true
+                // 如果子节点的父流程为独立任务且未执行时不调接口，默认数据为空
+                this.notPerformedSubNode = false
+                if (node.parentId && !node.state) {
+                    const ids = node.parentId.split('-')
+                    const rootId = ids.slice(0, -1).join('-')
+                    const parentInfo = this.getNodeInfo(this.nodeData, rootId, ids.pop())
+                    if (parentInfo && !parentInfo.state && 'dynamicLoad' in parentInfo) {
+                        this.notPerformedSubNode = true
+                    }
+                }
                 if (this.subProcessPipeline) {
                     this.toggleNodeActive(this.nodeDetailConfig.node_id, false)
                 }
@@ -1006,6 +1041,17 @@
                     if (!states[id]) return
                     const nodeState = states[id].skip ? 'SKIP' : states[id].state
                     this.$set(node, 'state', nodeState)
+                    if (this.subNodesExpanded.includes(node.id)) {
+                        const index = this.subNodesExpanded.findIndex(item => item === node.id)
+                        if (index > -1) {
+                            this.subNodesExpanded.splice(index, 1)
+                        }
+                        this.handleDynamicLoad(node, true)
+                    }
+                    if (this.nodeDetailConfig.node_id === id && !this.executeRecord.finish_time) {
+                        this.executeRecord.finish_time = states[id].finish_time
+                        this.executeRecord.elapsed_time = states[id].elapsed_time
+                    }
                     if (children) {
                         const newStates = isSubProcess ? Object.assign({}, states, states[id].children) : states
                         this.nodeAddStatus(children, newStates)
@@ -1069,10 +1115,22 @@
                 this.$refs.subProcessCanvas && this.$refs.subProcessCanvas.onUpdateNodeInfo(id, info)
             },
             // 只点击子流程展开/收起
-            async handleDynamicLoad (node) {
+            async handleDynamicLoad (node, updateState) {
                 try {
-                    // 子节点动态加载
-                    if (!node.dynamicLoad || !node.expanded) return
+                    if (!updateState) {
+                        // 独立子流程任务节点
+                        if (!node.dynamicLoad) return
+                        // 记录子流程展开收起
+                        this.setSubNodeExpanded(node)
+                        // 节点收起
+                        if (!node.expanded) return
+                        // 子流程任务未执行时，节点树从父流程取
+                        if (!node.state) {
+                            node.dynamicLoad = false
+                            this.subprocessLoading = false
+                            return
+                        }
+                    }
                     const { id, parentId } = node
                     const { instance_id } = this.$route.query
                     // 该独立子流程节点的父流程也可能为独立子流程
@@ -1080,18 +1138,17 @@
                     const nodeConfig = await this.getTaskNodeDetail(nodeDetailConfig)
                     if (!nodeConfig) return
                     // 获取子流程任务id
-                    const taskId = nodeConfig.outputs[0].value
+                    const taskInfo = nodeConfig.outputs.find(item => item.key === 'task_id') || {}
+                    const taskId = taskInfo.value
                     this.subprocessLoading = false
-                    await this.getSubprocessData({
-                        taskId,
-                        root_node: parentId,
-                        node_id: id
-                    })
-                    this.subprocessTasks[taskId] = {
-                        root_node: parentId,
-                        node_id: id
+                    if (taskId) { // 子流程任务已执行才可以查详情和状态
+                        await this.getSubprocessData(taskId, node, updateState)
+                        this.subprocessTasks[taskId] = {
+                            root_node: parentId,
+                            node_id: id
+                        }
+                        this.loadSubprocessStatus()
                     }
-                    this.loadSubprocessStatus()
                 } catch (error) {
                     console.warn(error)
                 }
@@ -1135,21 +1192,10 @@
                 }
             },
             // 获取独立子流程节点详情
-            async getSubprocessData (taskInfo) {
+            async getSubprocessData (taskId, nodeInfo, updateState) {
                 try {
-                    const { taskId, root_node, node_id } = taskInfo
-                    let nodes = this.nodeData
-                    const parentId = root_node?.split('-') || []
-                    parentId.forEach(id => {
-                        nodes.some(item => {
-                            if (item.id === id) {
-                                nodes = item.children
-                                return true
-                            }
-                        })
-                    })
-                    const nodeInfo = nodes.find(item => item.id === node_id)
-                    if (nodeInfo?.dynamicLoad) {
+                    const parentId = nodeInfo.parentId?.split('-') || []
+                    if (nodeInfo.dynamicLoad || updateState) {
                         const resp = await this.getTaskInstanceData(taskId)
                         const pipelineTree = JSON.parse(resp.pipeline_tree)
                         const parentInfo = {
@@ -1178,7 +1224,7 @@
                                 }
                             })
                         }
-                        const nodeActivity = pipelineData.activities[node_id]
+                        const nodeActivity = pipelineData.activities[nodeInfo.id]
                         this.$set(nodeActivity, 'pipeline', { ...pipelineTree, taskId })
                         this.canvasRandomKey = new Date().getTime()
                         this.$nextTick(() => {
@@ -1190,6 +1236,46 @@
                     this.subprocessLoading = false
                 }
             },
+            // 记录独立子流程展开收起
+            setSubNodeExpanded (node) {
+                // 子任务展开收起
+                if (node.expanded) { // 记录展开的子流程id
+                    if (!this.subNodesExpanded.includes(node.id)) {
+                        this.subNodesExpanded.push(node.id)
+                    }
+                } else {
+                    const index = this.subNodesExpanded.findIndex(item => item === node.id)
+                    if (index > -1) {
+                        this.subNodesExpanded.splice(index, 1)
+                    }
+                }
+            },
+            getNodeInfo (data, rootId, nodeId) {
+                let nodes = data
+                if (rootId) {
+                    const parentId = rootId.split('-') || []
+                    parentId.forEach(id => {
+                        nodes.some(item => {
+                            if (item.id === id) {
+                                nodes = item.children
+                                return true
+                            }
+                        })
+                    })
+                }
+                let nodeInfo
+                nodes.some(item => {
+                    const { id, isGateway, conditionType, children } = item
+                    if (id === nodeId) {
+                        nodeInfo = item
+                        return true
+                    } else if ((isGateway || conditionType) && children.length) {
+                        nodeInfo = this.getNodeInfo(item.children, '', nodeId)
+                        return !!nodeInfo
+                    }
+                })
+                return nodeInfo
+            },
             async loadSubprocessStatus () {
                 try {
                     if (source) {
@@ -1209,17 +1295,7 @@
                     Object.assign(this.subprocessNodeStatus, resp.data)
                     for (const [key, value] of Object.entries(resp.data)) {
                         const { root_node, node_id } = this.subprocessTasks[key]
-                        let nodes = this.nodeData
-                        const parentId = root_node?.split('-') || []
-                        parentId.forEach(id => {
-                            nodes.some(item => {
-                                if (item.id === id) {
-                                    nodes = item.children
-                                    return true
-                                }
-                            })
-                        })
-                        const nodeInfo = nodes.find(item => item.id === node_id)
+                        const nodeInfo = this.getNodeInfo(this.nodeData, root_node, node_id)
                         this.nodeAddStatus(nodeInfo.children, value.data.children)
                         this.updateNodeInfo(value.data.children)
                         if (!['CREATED', 'RUNNING'].includes(value.data.state)) {
@@ -1297,9 +1373,6 @@
     }
     .bk-resize-layout-border {
         border: none;
-        .bk-resize-layout-aside {
-            width: 280;
-        }
     }
     .action-wrapper {
         width: 100%;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 80aeb626c0..0b42a18063 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -269,7 +269,7 @@
             async initData () {
                 try {
                     // 获取对应模板配置
-                    const tplConfig = await this.getNodeSnapshotConfig(this.nodeDetailConfig)
+                    const tplConfig = this.getNodeSnapshotConfig ? {} : await this.getNodeSnapshotConfig(this.nodeDetailConfig)
                     this.templateConfig = tplConfig.data || { ...this.nodeActivity, isOldData: true } || {}
                     if (this.isSubProcessNode || this.nodeActivity.type === 'SubProcess') { // 子流程任务节点
                         // tplConfig.data为null为该功能之前的旧数据，没有original_template_id字段的，不调接口
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
index f96af19ef4..84b06c52aa 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="execute-record">
-        <template v-if="Object.keys(executeInfo).length">
+        <template v-if="Object.keys(executeInfo).length && !notPerformedSubNode">
             <section class="info-section abnormal-section" data-test-id="taskExecute_form_exceptionInfo" v-if="executeInfo.ex_data">
                 <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
                 <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
@@ -22,7 +22,7 @@
                     </li>
                     <li>
                         <p class="th">{{ $t('耗时') }}</p>
-                        <p class="td">{{ getLastTime(executeInfo.elapsed_time) || '--' }}</p>
+                        <p class="td">{{ executeInfo.finish_time && getLastTime(executeInfo.elapsed_time) || '--' }}</p>
                     </li>
                 </ul>
                 <NoData v-else :message="$t('暂无执行信息')"></NoData>
@@ -89,6 +89,10 @@
                 type: Object,
                 default: () => ({})
             },
+            notPerformedSubNode: {
+                type: Boolean,
+                default: false
+            },
             isSubProcessNode: {
                 type: Boolean,
                 default: false
@@ -128,7 +132,6 @@
     /deep/.abnormal-section {
         position: relative;
         font-size: 12px;
-        padding: 8px 16px;
         margin-bottom: 8px !important;
         color: #313238;
         background: #fff3e1;
@@ -258,6 +261,7 @@
         margin-bottom: 32px;
     }
     .no-data-wrapper {
+        height: 150px;
         margin-top: 32px;
     }
 }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
index ec1d27b8d6..db05f487c5 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
@@ -24,7 +24,7 @@
                 </template>
                 <template v-else>
                     <jsonschema-form
-                        v-if="renderConfig.properties && Object.keys(renderConfig.properties).length > 0"
+                        v-if="renderConfig?.properties && Object.keys(renderConfig.properties).length > 0"
                         :schema="renderConfig"
                         :value="inputRenderDate">
                     </jsonschema-form>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
index 30179b50da..a39c25b8d1 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
@@ -27,6 +27,10 @@
             nodeId: {
                 type: String,
                 default: ''
+            },
+            notPerformedSubNode: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
@@ -50,6 +54,7 @@
             async getOperationTaskData () {
                 const { params, query } = this.$route
                 try {
+                    if (this.notPerformedSubNode) return
                     this.isFlowLoading = true
                     if (!this.nodeId) { // 未执行的任务节点操作历史为空
                         this.operateFlowData = []
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
index a1350c291e..f854ce9827 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
@@ -52,7 +52,7 @@
         },
         methods: {
             handleClickNode (node) {
-                this.activeId = node.id
+                this.activeId = node.parentId ? node.id + '-' + node.parentId : node.id
                 this.$emit('onSelectNode', node)
             },
             setDefaultActiveId (treeData = [], id) {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
index 6872e223c9..7631d35953 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -14,7 +14,7 @@
                 }
             ]">
             <div
-                :class="['tree-node-item', { 'node-active': node.id === activeId }]"
+                :class="['tree-node-item', { 'node-active': (node.parentId ? `${node.id}-${node.parentId}` : node.id) === activeId }]"
                 @click="handleClickNode(node)">
                 <!-- 左侧图标 -->
                 <div :class="['node-flex-start', { expanded: node.expanded }]">
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 72938fd5d6..e1f93f4300 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -381,7 +381,7 @@
                 isExecRecordOpen: false,
                 nodeExecRecordInfo: {},
                 isInjectVarDialogShow: false,
-                nodeIds: [],
+                nodeIds: {},
                 nodeDisplayStatus: {},
                 showNodeList: [0, 1, 2],
                 converNodeList: [],
@@ -1384,24 +1384,25 @@
                 this.getNodeTargetMaps(data)
                 this.getNodeSourceMaps(data)
                 const nodeInfo = { id: nodeId, parentId, parentLevel, lastLevelStyle, taskId }
-                this.retrieveLines(data, nodeInfo, orderedData)
+                this.retrieveLines(data.id, data, nodeInfo, orderedData)
                 orderedData.push(endEvent)
                 // 过滤root最上层汇聚网关
                 return orderedData
             },
             /**
              * 根据节点连线遍历任务节点，返回按广度优先排序的节点数据
+             * @param {String} flowId 画布id
              * @param {Object} data 画布数据
              * @param {Object} nodeInfo 节点属性
              * @param {Array} ordered 排序后的节点数据
              * @param {Array} parentOrdered 父级排序
              *
              */
-            retrieveLines (data, nodeInfo, ordered, parentOrdered) {
+            retrieveLines (flowId, data, nodeInfo, ordered, parentOrdered) {
                 const { id, gatewayId, branchId, nodeLevel = 1, parentId, parentLevel, lastLevelStyle, lastId, taskId } = nodeInfo
                 const { activities, gateways, flows } = data
                 const nodeConfig = activities[id] || gateways[id]
-                if (this.nodeIds.includes(id)) {
+                if (this.nodeIds[flowId] && this.nodeIds[flowId].includes(id)) {
                     const isBack = this.judgeNodeBack(id, id, [])
                     if (isBack) { // 打回节点
                         const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
@@ -1432,8 +1433,9 @@
                             }
                         }
                     }
+                    return
                 }
-                if (nodeConfig && !this.nodeIds.includes(id)) {
+                if (nodeConfig) {
                     const targetNodes = this.nodeTargetMaps[id]
                     const taskAndGwNodeMap = Object.assign({}, activities, gateways)
                     const treeItem = {
@@ -1472,7 +1474,7 @@
                             const loopList = [] // 需要打回的node的incoming
                             targetNodes.forEach(item => {
                                 const curNode = taskAndGwNodeMap[item]
-                                if (curNode && this.nodeIds.find(ite => ite === curNode.id)) {
+                                if (curNode && this.nodeIds[flowId]?.find(ite => ite === curNode.id)) {
                                     loopList.push(...curNode.incoming)
                                 }
                             })
@@ -1529,7 +1531,11 @@
                                     children: []
                                 }
                             })
-                            this.nodeIds.push(id)
+                            if (this.nodeIds[flowId]) {
+                                this.nodeIds[flowId].push(id)
+                            } else {
+                                this.nodeIds[flowId] = [id]
+                            }
                         }
                     } else { // 任务节点
                         if (nodeConfig.type === 'SubProcess' || nodeConfig.component.code === 'subprocess_plugin') {
@@ -1544,9 +1550,20 @@
                                 this.getNodeSourceMaps(nodeConfig.pipeline)
                                 treeItem.children = this.getOrderedTree(nodeConfig.pipeline, parentInfo)
                             } else {
+                                let { data: componentData } = nodeConfig.component
+                                componentData = componentData && componentData.subprocess
+                                componentData = componentData && componentData.value
+                                componentData = componentData && componentData.pipeline
+                                if (componentData) {
+                                    this.getNodeTargetMaps(componentData)
+                                    this.getNodeSourceMaps(componentData)
+                                    if (this.nodeIds[componentData.id]) {
+                                        delete this.nodeIds[componentData.id]
+                                    }
+                                    treeItem.children = this.getOrderedTree(componentData, parentInfo)
+                                }
                                 treeItem.type = 'SubProcess'
                                 treeItem.dynamicLoad = true
-                                treeItem.children = []
                             }
                             treeItem.isSubProcess = true
                         }
@@ -1554,7 +1571,11 @@
                         treeItem.name = nodeConfig.name
                         treeItem.title = nodeConfig.name
                     }
-                    this.nodeIds.push(id)
+                    if (this.nodeIds[flowId]) {
+                        this.nodeIds[flowId].push(id)
+                    } else {
+                        this.nodeIds[flowId] = [id]
+                    }
                     const nextNodeInfo = { ...nodeInfo }
                     let newOrdered = parentOrdered
                     if (parentOrdered) {
@@ -1598,6 +1619,7 @@
                             item.style = `margin-left: ${marginLeft + 33}px`
                             treeItem.children.push(item)
                             this.retrieveLines(
+                                flowId,
                                 data,
                                 {
                                     id: item.target,
@@ -1614,6 +1636,7 @@
                     } else {
                         targetNodes.forEach(node => {
                             this.retrieveLines(
+                                flowId,
                                 data,
                                 {
                                     ...nextNodeInfo,
@@ -1906,7 +1929,7 @@
                     this.nodePipelineData['constants'] = constants
                 }
                 this.convergeInfo = {}
-                this.nodeIds = []
+                this.nodeIds = {}
                 this.nodeData = this.getOrderedTree(this.completePipelineData)
                 this.openNodeInfoPanel('executeInfo', i18n.t('节点详情'))
             },
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
index 94f921e4d5..7c2985fd3c 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/BasicInfo.vue
@@ -1006,7 +1006,7 @@
             transition: border .2s linear;
             .group-append-text {
                 font-size: 12px;
-                padding-right: 15px;
+                padding-right: 5px;
             }
         }
         .control-active {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index a0496f73d1..9a87c49356 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -14,7 +14,7 @@
         <bk-sideslider
             ref="nodeConfigPanel"
             ext-cls="node-config-panel"
-            :width="800"
+            :width="sideWidth"
             :is-show="isShow"
             :quick-close="true"
             :before-close="beforeClose">
@@ -121,6 +121,9 @@
                 </template>
             </div>
             <template slot="content">
+                <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
+                <i :class="['resize-proxy', 'left']" ref="resizeProxy"></i>
+                <div class="resize-mask" ref="resizeMask"></div>
                 <!-- 插件/插件版本不存在面板 -->
                 <bk-exception v-if="isNotExistAtomOrVersion" class="exception-wrap" type="500">
                     <span>{{ $t('未找到可用的插件或插件版本') }}</span>
@@ -349,6 +352,7 @@
         },
         data () {
             return {
+                sideWidth: 800, // 侧栏宽度
                 subflowUpdated: false, // 子流程是否更新
                 taskNodeLoading: false, // 普通任务节点数据加载
                 subflowLoading: false, // 子流程任务节点数据加载
@@ -477,12 +481,16 @@
             this.localConstants = tools.deepClone(this.constants)
         },
         async mounted () {
+            document.addEventListener('mouseup', this.handleMouseUp)
             const defaultData = await this.initDefaultData()
             for (const [key, val] of Object.entries(defaultData)) {
                 this[key] = val
             }
             this.initData()
         },
+        destroyed () {
+            document.removeEventListener('mouseup', this.handleMouseUp)
+        },
         methods: {
             ...mapActions('atomForm/', [
                 'loadAtomConfig',
@@ -1629,6 +1637,35 @@
             onClosePanel (openVariablePanel) {
                 this.$emit('updateNodeInfo', this.nodeId, { isActived: false })
                 this.$emit('close', openVariablePanel)
+            },
+            handleMousedown (event) {
+                this.updateResizeMaskStyle()
+                this.updateResizeProxyStyle()
+                document.addEventListener('mousemove', this.handleMouseMove)
+            },
+            handleMouseMove (event) {
+                let width = window.innerWidth - event.clientX
+                width = width > 800 ? width : 800
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.right = `${width}px`
+            },
+            updateResizeMaskStyle () {
+                const resizeMask = this.$refs.resizeMask
+                resizeMask.style.display = 'block'
+                resizeMask.style.cursor = 'col-resize'
+            },
+            updateResizeProxyStyle () {
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'visible'
+                resizeProxy.style.right = `${this.sideWidth}px`
+            },
+            handleMouseUp () {
+                const resizeMask = this.$refs.resizeMask
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'hidden'
+                resizeMask.style.display = 'none'
+                this.sideWidth = resizeProxy.style.right
+                document.removeEventListener('mousemove', this.handleMouseMove)
             }
         }
     }
@@ -1732,9 +1769,65 @@
             }
         }
     }
+    .bk-sideslider-wrapper {
+        overflow: initial;
+    }
     .bk-sideslider-content {
         overflow: initial;
     }
+    .resize-trigger {
+        width: 5px;
+        height: calc(100vh - 109px);
+        position: absolute;
+        left: 0;
+        top: 60px;
+        cursor: col-resize;
+        z-index: 3;
+        &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            bottom: 0;
+            width: 1px;
+            background-color: #dcdee5;
+        }
+        &::after {
+            content: "";
+            position: absolute;
+            top: 50%;
+            right: -1px;
+            width: 2px;
+            height: 2px;
+            color: #979ba5;
+            transform: translate3d(0,-50%,0);
+            background: currentColor;
+            box-shadow: 0 4px 0 0 currentColor,0 8px 0 0 currentColor,0 -4px 0 0 currentColor,0 -8px 0 0 currentColor;
+        }
+        &:hover::before {
+            background-color: #3a84ff;
+        }
+    }
+    .resize-proxy {
+        visibility: hidden;
+        position: absolute;
+        pointer-events: none;
+        z-index: 9999;
+        &.left {
+            top: 0;
+            height: 100%;
+            border-left: 1px dashed #3a84ff;
+        }
+    }
+    .resize-mask {
+        display: none;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 9999;
+    }
     .variable-edit-panel {
         height: calc(100vh - 60px);
         overflow: hidden;

From 5cd7a9b47d1a6942cf16066d99b0456f8eada4c9 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 21 Aug 2023 15:11:16 +0800
Subject: [PATCH 036/112] =?UTF-8?q?optimization:=20ip=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E5=A4=B1=E6=95=88tag=E6=B7=BB=E5=8A=A0disabled?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/IpSelector/DynamicGroup.vue  |  5 +++++
 .../common/RenderForm/IpSelector/DynamicIp.vue     |  5 +++++
 .../RenderForm/IpSelector/IpSelectorTable.vue      |  7 ++++++-
 .../TemplateEdit/NodeConfig/NodeConfig.vue         | 14 +++++++-------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
index 93d9a9bcd4..ac7b02848a 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicGroup.vue
@@ -208,6 +208,11 @@
                     color: #dcdee6;
                 }
             }
+            .invalid {
+                color: #ccc;
+                background-color: #fafbfd;
+                border-color: #dcdee5;
+            }
         }
     }
     .common-icon-dark-circle-close {
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
index 31b4e91cb1..9a47fd2859 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/DynamicIp.vue
@@ -367,6 +367,11 @@
                     color: #dcdee6;
                 }
             }
+            .invalid {
+                color: #ccc;
+                background-color: #fafbfd;
+                border-color: #dcdee5;
+            }
         }
     }
     .common-icon-dark-circle-close {
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
index 1cc43be13e..cbec0e0ab0 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
@@ -23,7 +23,7 @@
                 <template slot-scope="{ row }">
                     <div v-if="columnInfo.id === 'bk_host_innerip'" class="host-inner-ip">
                         <div class="inner-ip" v-bk-overflow-tips>{{ row.bk_host_innerip }}</div>
-                        <span class="invalid" v-if="row.diff">{{ $t('失效') }}</span>
+                        <span class="invalid" :class="{ 'disabled': !editable }" v-if="row.diff">{{ $t('失效') }}</span>
                     </div>
                     <div
                         v-else-if="columnInfo.id === 'agent'"
@@ -295,6 +295,11 @@
             background: #f0f1f5;
             border: 1px solid #c4c6cc;
             border-radius: 2px;
+            &.disabled {
+                color: #ccc;
+                background-color: #fafbfd;
+                border-color: #dcdee5;
+            }
         }
     }
     .agent-disabled {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index 9a87c49356..12133e4733 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -121,9 +121,6 @@
                 </template>
             </div>
             <template slot="content">
-                <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
-                <i :class="['resize-proxy', 'left']" ref="resizeProxy"></i>
-                <div class="resize-mask" ref="resizeMask"></div>
                 <!-- 插件/插件版本不存在面板 -->
                 <bk-exception v-if="isNotExistAtomOrVersion" class="exception-wrap" type="500">
                     <span>{{ $t('未找到可用的插件或插件版本') }}</span>
@@ -156,6 +153,11 @@
                 </div>
                 <!-- 插件/子流程表单面板 -->
                 <template v-else>
+                    <!--可拖拽-->
+                    <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
+                    <i :class="['resize-proxy', 'left']" ref="resizeProxy"></i>
+                    <div class="resize-mask" ref="resizeMask"></div>
+
                     <div class="node-config" v-bkloading="{ isLoading: isSubflow && subflowListLoading, opacity: 1 }">
                         <template v-if="!isSubflow || !subflowListLoading">
                             <div class="config-form">
@@ -481,16 +483,12 @@
             this.localConstants = tools.deepClone(this.constants)
         },
         async mounted () {
-            document.addEventListener('mouseup', this.handleMouseUp)
             const defaultData = await this.initDefaultData()
             for (const [key, val] of Object.entries(defaultData)) {
                 this[key] = val
             }
             this.initData()
         },
-        destroyed () {
-            document.removeEventListener('mouseup', this.handleMouseUp)
-        },
         methods: {
             ...mapActions('atomForm/', [
                 'loadAtomConfig',
@@ -1642,6 +1640,7 @@
                 this.updateResizeMaskStyle()
                 this.updateResizeProxyStyle()
                 document.addEventListener('mousemove', this.handleMouseMove)
+                document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
                 let width = window.innerWidth - event.clientX
@@ -1666,6 +1665,7 @@
                 resizeMask.style.display = 'none'
                 this.sideWidth = resizeProxy.style.right
                 document.removeEventListener('mousemove', this.handleMouseMove)
+                document.removeEventListener('mouseup', this.handleMouseUp)
             }
         }
     }

From 1a31461ce41d6778bb30e638f58517ae0c6d2d5a Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Mon, 21 Aug 2023 16:56:14 +0800
Subject: [PATCH 037/112] =?UTF-8?q?minor:=20=E5=8D=95=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=8D=95=E6=8D=AE=E7=AD=9B=E9=80=89=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.py                                    |  2 +-
 gcloud/core/apis/drf/viewsets/taskflow.py | 32 +++++------------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/env.py b/env.py
index d4fcbcf4e4..59a977e857 100644
--- a/env.py
+++ b/env.py
@@ -108,5 +108,5 @@
 # 获取 PaaS 注入的蓝鲸域名
 BKPAAS_BK_DOMAIN = os.getenv("BKPAAS_BK_DOMAIN", "") or os.getenv("BK_DOMAIN", "")
 
-# 默认一个月
+# 默认六个月
 BKPAAS_TASK_LIST_STATUS_FILTER_DAYS = int(os.getenv("BKPAAS_TASK_LIST_STATUS_FILTER_DAYS", 180))
diff --git a/gcloud/core/apis/drf/viewsets/taskflow.py b/gcloud/core/apis/drf/viewsets/taskflow.py
index 1101da7ca5..26f395ea48 100644
--- a/gcloud/core/apis/drf/viewsets/taskflow.py
+++ b/gcloud/core/apis/drf/viewsets/taskflow.py
@@ -81,15 +81,15 @@ class TaskFLowStatusFilterHandler:
     PAUSE = "pause"
     RUNNING = "running"
 
-    def __init__(self, status, queryset, start_time):
+    def __init__(self, status, queryset):
         """
         @param status: 状态
         @param queryset: task_instance queryset
         @param start_time: 查询开始时间
         """
         self.status = status
-        self.queryset = queryset
-        self.start_time = start_time
+        # 只会查询v2的数据
+        self.queryset = queryset.filter(engine_ver=EngineConfig.ENGINE_VER_V2)
 
     def get_queryset(self):
         """
@@ -110,9 +110,7 @@ def _get_pipeline_id_list(self):
         获取当前符合条件的 pipeline_id 列表
         @return:
         """
-        pipeline_instance_id_list = TaskFlowInstance.objects.filter(
-            pipeline_instance__start_time__gte=self.start_time
-        ).values_list("pipeline_instance_id", flat=True)
+        pipeline_instance_id_list = self.queryset.values_list("pipeline_instance_id", flat=True)
 
         pipeline_id_list = PipelineInstance.objects.filter(id__in=pipeline_instance_id_list).values_list(
             "instance_id", flat=True
@@ -175,9 +173,7 @@ def _filter_running(self):
             instance_id__in=pipeline_failed_and_pause_root_id_list
         ).values_list("id", flat=True)
 
-        queryset = self.queryset.filter(pipeline_instance__start_time__gte=self.start_time).exclude(
-            pipeline_instance_id__in=pipeline_failed_and_pause_id_list
-        )
+        queryset = self.queryset.exclude(pipeline_instance_id__in=pipeline_failed_and_pause_id_list)
 
         return queryset
 
@@ -280,24 +276,10 @@ class TaskFlowInstanceViewSet(GcloudReadOnlyViewSet, generics.CreateAPIView, gen
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
         start_time = datetime.now() - timedelta(days=settings.TASK_LIST_STATUS_FILTER_DAYS)
-
+        queryset = queryset.filter(pipeline_instance__start_time__gte=start_time)
         task_instance_status = request.query_params.get("task_instance_status")
         if task_instance_status:
-            if queryset.filter(
-                engine_ver=EngineConfig.ENGINE_VER_V1, pipeline_instance__start_time__gte=start_time
-            ).exists():
-                return Response(
-                    {
-                        "detail": ErrorDetail(
-                            "最近{}天有v1引擎的任务, 不支持筛选".format(settings.TASK_LIST_STATUS_FILTER_DAYS),
-                            err_code.REQUEST_PARAM_INVALID.code,
-                        )
-                    },
-                    exception=True,
-                )
-            queryset = TaskFLowStatusFilterHandler(
-                status=task_instance_status, queryset=queryset, start_time=start_time
-            ).get_queryset()
+            queryset = TaskFLowStatusFilterHandler(status=task_instance_status, queryset=queryset).get_queryset()
 
         # [我的动态] 接口过滤
         if "creator_or_executor" in request.query_params:

From e242b76f43f9009899a29fcd27b9f4c09441df42 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Mon, 21 Aug 2023 18:07:08 +0800
Subject: [PATCH 038/112] =?UTF-8?q?minor:=20=E4=BF=AE=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/apis/drf/viewsets/taskflow.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcloud/core/apis/drf/viewsets/taskflow.py b/gcloud/core/apis/drf/viewsets/taskflow.py
index 26f395ea48..87ad55db6e 100644
--- a/gcloud/core/apis/drf/viewsets/taskflow.py
+++ b/gcloud/core/apis/drf/viewsets/taskflow.py
@@ -89,7 +89,7 @@ def __init__(self, status, queryset):
         """
         self.status = status
         # 只会查询v2的数据
-        self.queryset = queryset.filter(engine_ver=EngineConfig.ENGINE_VER_V2)
+        self.queryset = queryset
 
     def get_queryset(self):
         """
@@ -276,9 +276,13 @@ class TaskFlowInstanceViewSet(GcloudReadOnlyViewSet, generics.CreateAPIView, gen
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
         start_time = datetime.now() - timedelta(days=settings.TASK_LIST_STATUS_FILTER_DAYS)
-        queryset = queryset.filter(pipeline_instance__start_time__gte=start_time)
+        queryset = queryset.filter(pipeline_instance__create_time__gte=start_time)
         task_instance_status = request.query_params.get("task_instance_status")
         if task_instance_status:
+            # 状态查询的范围为最近TASK_LIST_STATUS_FILTER_DAYS天内，已经开始的v2引擎的任务
+            queryset = queryset.filter(
+                pipeline_instance__start_time__gte=start_time, engine_ver=EngineConfig.ENGINE_VER_V2
+            )
             queryset = TaskFLowStatusFilterHandler(status=task_instance_status, queryset=queryset).get_queryset()
 
         # [我的动态] 接口过滤

From 34e24535b407f6f263d71dceed49758f81430ed1 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Mon, 21 Aug 2023 18:49:16 +0800
Subject: [PATCH 039/112] =?UTF-8?q?minor:=20=E4=BF=AE=E5=A4=8D=E9=9D=9E?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E6=9C=AC=E8=BA=AB?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/domains/dispatchers/node.py |  2 +-
 gcloud/tasktmpl3/domains/constants.py        | 25 +++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/gcloud/taskflow3/domains/dispatchers/node.py b/gcloud/taskflow3/domains/dispatchers/node.py
index 393acb2a9d..b310dc3777 100644
--- a/gcloud/taskflow3/domains/dispatchers/node.py
+++ b/gcloud/taskflow3/domains/dispatchers/node.py
@@ -565,7 +565,7 @@ def get_node_data_v2(
                     )
                 except Exception as e:
                     message = _(f"节点数据请求失败: 请重试, 如多次失败可联系管理员处理. {e} | get_node_data_v2")
-                    logger.error(message)
+                    logger.exception(message)
                     return {
                         "result": False,
                         "data": {},
diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index c9b475c8e2..ea70952d2f 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -95,14 +95,23 @@ def get_need_render_context_keys():
             return keys
 
         node_info = pipeline["activities"][node_id]
-        for item in node_info.get("component").get("inputs").values():
-
-            if not item["need_render"]:
-                continue
-            if isinstance(item["value"], str):
-                for value in var_pattern.findall(item["value"]):
-                    keys.add("${" + value + "}")
-        return keys
+
+        if node_info["type"] == "SubProcess":
+            inputs_values = node_info.get("pipeline", {}).get("data", {}).get("inputs").values()
+            for item in inputs_values:
+                if isinstance(item["value"], str):
+                    for value in var_pattern.findall(item["value"]):
+                        keys.add("${" + value + "}")
+            return keys
+        else:
+            inputs_values = node_info.get("component", {}).get("inputs", {}).values()
+            for item in inputs_values:
+                if not item["need_render"]:
+                    continue
+                if isinstance(item["value"], str):
+                    for value in var_pattern.findall(item["value"]):
+                        keys.add("${" + value + "}")
+            return keys
 
     need_render_context_keys = get_need_render_context_keys()
     context_values = [

From 6504e49af4131d2bc991cdc01aa70296da11a06e Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Tue, 22 Aug 2023 16:30:18 +0800
Subject: [PATCH 040/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E8=BD=BB?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8template=5Fscheme=5Fid=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/template_base/apis/drf/viewsets/template_scheme.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcloud/template_base/apis/drf/viewsets/template_scheme.py b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
index 77444738cc..ef16b5ff2e 100644
--- a/gcloud/template_base/apis/drf/viewsets/template_scheme.py
+++ b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
@@ -101,11 +101,12 @@ def get_app_maker_names_scheme_quote(template_id, remove_scheme_ids_set):
         @return:
         """
         app_maker_queryset = AppMaker.objects.filter(task_template__id=template_id, is_deleted=False)
+
         return list(
             {
                 app_maker.name
                 for app_maker in app_maker_queryset
-                if int(app_maker.template_scheme_id) in remove_scheme_ids_set
+                if app_maker.template_scheme_id and int(app_maker.template_scheme_id) in remove_scheme_ids_set
             }
         )
 
@@ -127,7 +128,7 @@ def get_clocked_task_names_scheme_quote(template_id, remove_scheme_ids_set):
         clocked_task_names = []
 
         for clocked_task in clocked_task_queryset:
-            template_scheme_ids = json.loads(clocked_task.task_params).get("template_schemes_id")
+            template_scheme_ids = json.loads(clocked_task.task_params).get("template_schemes_id", [])
             if set(template_scheme_ids) & remove_scheme_ids_set:
                 clocked_task_names.append(clocked_task.task_name)
 

From 444a104b1277dad57c94bf9feb11640fa81e0236 Mon Sep 17 00:00:00 2001
From: normal-wls <1158341873@qq.com>
Date: Tue, 22 Aug 2023 17:30:05 +0800
Subject: [PATCH 041/112] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=AD=90=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=8A=82=E7=82=B9=E9=87=8D=E8=AF=95=E6=88=96=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87=E6=97=B6=E6=9B=B4=E6=96=B0=E7=88=B6=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=20(#7012?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* optimization: 独立子任务节点重试或跳过时更新父流程对应节点状态

* optimization: 独立子任务节点自动重试时更新父流程对应节点状态
---
 gcloud/taskflow3/admin.py            |  6 +++++
 gcloud/taskflow3/celery/tasks.py     | 24 ++++++++++++------
 gcloud/taskflow3/domains/callback.py |  6 +++--
 gcloud/taskflow3/models.py           | 38 +++++++++++++++++++++++++---
 4 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/gcloud/taskflow3/admin.py b/gcloud/taskflow3/admin.py
index a5db3006d0..4b4fd9066a 100644
--- a/gcloud/taskflow3/admin.py
+++ b/gcloud/taskflow3/admin.py
@@ -73,3 +73,9 @@ class TaskCallBackRecordAdmin(admin.ModelAdmin):
 class TaskConfigAdmin(admin.ModelAdmin):
     list_display = ["id", "scope_id", "scope", "config_type", "config_value"]
     search_fields = ["scope", "scope_id"]
+
+
+@admin.register(models.TaskFlowRelation)
+class TaskFlowRelationAdmin(admin.ModelAdmin):
+    list_display = ["id", "task_id", "parent_task_id", "root_task_id", "create_time"]
+    search_fields = ["task_id", "parent_task_id", "root_task_id"]
diff --git a/gcloud/taskflow3/celery/tasks.py b/gcloud/taskflow3/celery/tasks.py
index d5f21cea67..4c70bdaa74 100644
--- a/gcloud/taskflow3/celery/tasks.py
+++ b/gcloud/taskflow3/celery/tasks.py
@@ -10,32 +10,31 @@
 specific language governing permissions and limitations under the License.
 """
 import json
-import time
-import socket
 import logging
+import socket
+import time
 
 from celery import task
 from django.conf import settings
 from django.utils import timezone
-
+from django.utils.translation import ugettext_lazy as _
 from pipeline.engine.models import PipelineProcess
-from pipeline.eri.models import State, Process
+from pipeline.eri.models import Process, State
 from pipeline.eri.runtime import BambooDjangoRuntime
 
 import metrics
 from gcloud.constants import CallbackStatus
+from gcloud.shortcuts.message import send_task_flow_message
 from gcloud.taskflow3.domains.callback import TaskCallBacker
+from gcloud.taskflow3.domains.dispatchers.node import NodeCommandDispatcher
 from gcloud.taskflow3.domains.node_timeout_strategy import node_timeout_handler
 from gcloud.taskflow3.models import (
-    TaskFlowInstance,
     AutoRetryNodeStrategy,
     EngineConfig,
+    TaskFlowInstance,
     TimeoutNodeConfig,
     TimeoutNodesRecord,
 )
-from gcloud.taskflow3.domains.dispatchers.node import NodeCommandDispatcher
-from gcloud.shortcuts.message import send_task_flow_message
-from django.utils.translation import ugettext_lazy as _
 
 logger = logging.getLogger("celery")
 
@@ -105,6 +104,15 @@ def auto_retry_node(taskflow_id, root_pipeline_id, node_id, retry_times, engine_
         logger.warning("[auto_retry_node] task(%s) node(%s) ensure_node_can_retry timeout" % (taskflow_id, node_id))
         return
 
+    # 如果是独立子任务，自动重试时更新父任务节点状态
+    if engine_ver == EngineConfig.ENGINE_VER_V2:
+        try:
+            task_instance = TaskFlowInstance.objects.get(id=taskflow_id)
+            task_instance.change_parent_task_node_state_to_running()
+        except TaskFlowInstance.DoesNotExist:
+            logger.exception("[auto_retry_node] get task for (task_id={}) fail.".format(taskflow_id))
+            pass
+
     dispatcher = NodeCommandDispatcher(engine_ver=engine_ver, node_id=node_id, taskflow_id=taskflow_id)
 
     result = dispatcher.dispatch(command="retry", operator="system", inputs={})
diff --git a/gcloud/taskflow3/domains/callback.py b/gcloud/taskflow3/domains/callback.py
index 107d348e95..043b829669 100644
--- a/gcloud/taskflow3/domains/callback.py
+++ b/gcloud/taskflow3/domains/callback.py
@@ -62,12 +62,12 @@ def _subprocess_callback(self):
                     # 如果对应节点已经在回调，则直接忽略本次回调
                     logger.error(f"[TaskCallBacker _subprocess_callback] get lock error: {err}")
                     return None
-                parent_task_id = TaskFlowRelation.objects.filter(task_id=self.task_id).first().parent_task_id
-                dispatcher = NodeCommandDispatcher(engine_ver=engine_ver, node_id=node_id, taskflow_id=parent_task_id)
                 runtime = BambooDjangoRuntime()
                 node_state = runtime.get_state(node_id)
                 if node_state.name not in [states.RUNNING, states.FAILED]:
                     raise ValidationError(f"node state is not running or failed, but {node_state.name}")
+                if node_state.version != version:
+                    raise ValidationError(f"node version is not {version}, but {node_state.version}")
                 if node_state.name == states.FAILED:
                     if self.extra_info["task_success"] is False:
                         logger.info(
@@ -79,6 +79,8 @@ def _subprocess_callback(self):
                     # FAILED 状态需要转换为 READY 之后才能转换为 RUNNING
                     runtime.set_state(node_id=node_id, version=version, to_state=states.READY)
                     runtime.set_state(node_id=node_id, version=version, to_state=states.RUNNING)
+                parent_task_id = TaskFlowRelation.objects.filter(task_id=self.task_id).first().parent_task_id
+                dispatcher = NodeCommandDispatcher(engine_ver=engine_ver, node_id=node_id, taskflow_id=parent_task_id)
                 dispatcher.dispatch(command="callback", operator="", version=version, data=self.extra_info)
         except Exception as e:
             message = f"[TaskCallBacker _subprocess_callback] error: {e}, with data {self.record.extra_info}"
diff --git a/gcloud/taskflow3/models.py b/gcloud/taskflow3/models.py
index 49b30991a8..8cfe5199d0 100644
--- a/gcloud/taskflow3/models.py
+++ b/gcloud/taskflow3/models.py
@@ -23,6 +23,8 @@
 from pipeline.component_framework.models import ComponentModel
 from pipeline.core.constants import PE
 from pipeline.engine import states
+from pipeline.eri.models import Schedule as DBSchedule
+from pipeline.eri.runtime import BambooDjangoRuntime
 from pipeline.models import PipelineInstance
 
 from gcloud import err_code
@@ -1016,6 +1018,32 @@ def _get_task_celery_queue(self, engine_ver):
             queue = settings.API_TASK_QUEUE_NAME_V2
         return queue
 
+    def change_parent_task_node_state_to_running(self):
+        if not self.is_child_taskflow:
+            logger.info("taskflow[id=%s] is not child taskflow, cannot change parent task node state to running")
+            return
+
+        with transaction.atomic():
+            record = TaskCallBackRecord.objects.filter(task_id=self.id).first()
+            if not record:
+                return
+            info = json.loads(record.extra_info)
+            parent_node_id, parent_node_version = info["node_id"], info["node_version"]
+            runtime = BambooDjangoRuntime()
+            node_state = runtime.get_state(parent_node_id)
+            if node_state.name != states.FAILED or node_state.version != parent_node_version:
+                return
+            schedule = runtime.get_schedule_with_node_and_version(parent_node_id, parent_node_version)
+            DBSchedule.objects.filter(id=schedule.id).update(expired=False)
+            # FAILED 状态需要转换为 READY 之后才能转换为 RUNNING
+            runtime.set_state(node_id=parent_node_id, version=parent_node_version, to_state=states.READY)
+            runtime.set_state(node_id=parent_node_id, version=parent_node_version, to_state=states.RUNNING)
+
+            # 仅当父流程的节点状态为失败时，才需要唤醒父流程的节点
+            parent_task_id = TaskFlowRelation.objects.filter(task_id=self.id).first().parent_task_id
+            parent_task = TaskFlowInstance.objects.get(id=parent_task_id)
+            parent_task.change_parent_task_node_state_to_running()
+
     def task_action(self, action, username):
         if self.current_flow != "execute_task":
             return {
@@ -1046,10 +1074,14 @@ def nodes_action(self, action, node_id, username, **kwargs):
             logger.error(message)
             return {"result": False, "message": message, "code": err_code.REQUEST_PARAM_INVALID.code}
 
-        dispatcher = NodeCommandDispatcher(engine_ver=self.engine_ver, node_id=node_id, taskflow_id=self.id)
-
         try:
-            return dispatcher.dispatch(action, username, **kwargs)
+            with transaction.atomic():
+                # 如果当前节点属于独立子任务，则先唤醒父任务
+                if self.is_child_taskflow and action in ["skip", "retry"]:
+                    self.change_parent_task_node_state_to_running()
+
+                dispatcher = NodeCommandDispatcher(engine_ver=self.engine_ver, node_id=node_id, taskflow_id=self.id)
+                return dispatcher.dispatch(action, username, **kwargs)
         except Exception as e:
             logger.exception(traceback.format_exc())
             message = _(f"节点操作失败: 节点[ID: {node_id}], 任务[ID: {self.id}]操作失败: {e}, 请重试. 如持续失败可联系管理员处理 | nodes_action")

From e537233fa7e71357a5fb3097e30dee73a80962b0 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Tue, 22 Aug 2023 17:02:43 +0800
Subject: [PATCH 042/112] =?UTF-8?q?minor:=20apigw=E6=96=87=E6=A1=A3descrip?=
 =?UTF-8?q?tion=E6=8F=8F=E8=BF=B0=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/apigw/management/commands/data/api-definition.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcloud/apigw/management/commands/data/api-definition.yml b/gcloud/apigw/management/commands/data/api-definition.yml
index d209073834..ca78bc0805 100644
--- a/gcloud/apigw/management/commands/data/api-definition.yml
+++ b/gcloud/apigw/management/commands/data/api-definition.yml
@@ -1,5 +1,6 @@
 apigateway:
-  description: {{ settings.BK_APP_CODE }} apigw
+  description: 标准运维（{{ settings.BK_APP_CODE }}）API 网关，包含了项目、流程、任务等资源的查询和操作接口
+  description_en: {{ settings.BK_APP_CODE }} API Gateway, including query and operation interface of project, flow, task and other resources
   is_public: true
   maintainers:
     {% for member in settings.BK_APIGW_MANAGER_MAINTAINERS %}

From 043a14350267e07d805bf5451caf125626c265ec Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Tue, 22 Aug 2023 18:26:36 +0800
Subject: [PATCH 043/112] =?UTF-8?q?feature:=20=E6=96=87=E6=9C=AC=E6=A1=86?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=81=94=E6=83=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       |  18 +-
 .../common/RenderForm/tags/TagTextarea.vue    | 448 ++++++++++++++++--
 2 files changed, 425 insertions(+), 41 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index 1f9e17380d..a384cf878d 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -42,7 +42,7 @@
                 <transition>
                     <div
                         class="rf-select-list"
-                        :style="`right: ${varListPositionRight}px`"
+                        :style="varListPosition"
                         v-show="showVarList && isListOpen">
                         <ul class="rf-select-content">
                             <li
@@ -111,7 +111,7 @@
                     focus: false
                 },
                 varList: [],
-                varListPositionRight: 0,
+                varListPosition: '',
                 hoverKey: '',
                 selection: {}
             }
@@ -171,6 +171,7 @@
             const divInputDom = this.$el.querySelector('.div-input')
             if (divInputDom) {
                 divInputDom.innerHTML = this.value
+                this.handleInputBlur()
             }
         },
         beforeDestroy () {
@@ -262,6 +263,8 @@
                         return false
                     })
                     selection.collapse(textNode, startToVarTextLength + varTextOffset)
+                } else if (this.input.value) {
+                    this.handleInputChange(e)
                 }
             },
             // 文本框获取焦点
@@ -278,7 +281,7 @@
                     const { nodeName, lastChild } = selection.focusNode
                     if (nodeName === 'DIV') {
                         focusSelection = {
-                            anchorOffset: lastChild.data.length,
+                            anchorOffset: lastChild.textContent.length,
                             focusNode: lastChild
                         }
                     } else if (nodeName === '#text') {
@@ -320,7 +323,7 @@
                     // 计算变量下拉列表的left
                     this.isListOpen = false
                     if (this.varList.length) {
-                        const { width: inputWidth } = this.$el.querySelector('.rf-form-wrap').getBoundingClientRect()
+                        const { width: inputWidth, top: inputTop } = this.$el.querySelector('.rf-form-wrap').getBoundingClientRect()
                         let previousDomWidth = 0
                         let previousDomLeft = 0
                         const { previousElementSibling } = focusNode
@@ -341,6 +344,11 @@
                         let right = inputWidth - 238 - previousDomLeft - previousDomWidth - focusValueWidth
                         right = right > 0 ? right : 0
                         this.varListPositionRight = right
+                        this.$nextTick(() => {
+                            const { height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            const top = window.innerHeight < inputTop + 30 + varListHeight + 50 ? -95 : 30
+                            this.varListPosition = `right: ${right}px; top: ${top}px`
+                        })
                     }
                 } else {
                     this.varList = []
@@ -430,7 +438,7 @@
         position: relative;
         .rf-select-list {
             position: absolute;
-            top: 40px;
+            top: 30px;
             right: 0;
             width: 238px;
             background: #ffffff;
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 7b4d78c197..25b96d4425 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -11,22 +11,50 @@
 */
 <template>
     <div class="tag-textarea">
-        <el-input
-            ref="tagTextarea"
-            type="textarea"
-            v-model="textareaValue"
-            :class="{ 'rf-view-textarea-value': !formMode }"
-            :disabled="!editable || !formMode || disabled"
-            :autosize="formMode ? { minRows: 2 } : true"
-            resize="none"
-            :placeholder="placeholder">
-        </el-input>
+        <div class="rf-form-wrapper">
+            <div class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled }">
+                <div
+                    ref="input"
+                    class="div-input"
+                    :class="{
+                        'input-before': !input.value
+                    }"
+                    :contenteditable="!isDisabled"
+                    :data-placeholder="placeholder"
+                    v-bk-clickoutside="handleClickOutSide"
+                    @mouseup="handleInputMouseUp"
+                    @focus="handleInputFocus"
+                    @keydown="handleInputKeyDown"
+                    @input="handleInputChange">
+                </div>
+            </div>
+            <transition>
+                <div
+                    class="rf-select-list"
+                    :style="`${varListPosition}`"
+                    v-show="showVarList && isListOpen">
+                    <ul class="rf-select-content">
+                        <li
+                            class="rf-select-item"
+                            v-for="item in varList"
+                            v-bk-overflow-tips
+                            :key="item"
+                            :class="{ 'is-hover': hoverKey === item }"
+                            @click.stop="onSelectVal(item)">
+                            {{ item }}
+                        </li>
+                    </ul>
+                </div>
+            </transition>
+        </div>
         <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
     </div>
 </template>
 <script>
     import '@/utils/i18n.js'
     import i18n from '@/config/i18n/index.js'
+    import { mapState } from 'vuex'
+    import dom from '@/utils/dom.js'
     import { getFormMixins } from '../formMixins.js'
 
     export const attrs = {
@@ -46,12 +74,49 @@
             required: false,
             default: '',
             desc: 'placeholder'
+        },
+        showVarList: {
+            type: Boolean,
+            default: false,
+            inner: true
         }
     }
     export default {
         name: 'TagTextarea',
         mixins: [getFormMixins(attrs)],
+        data () {
+            return {
+                isListOpen: false,
+                input: {
+                    value: this.value,
+                    focus: false
+                },
+                varList: [],
+                varListPosition: 0,
+                hoverKey: '',
+                selection: {},
+                lastEditRange: null
+            }
+        },
         computed: {
+            ...mapState({
+                'internalVariable': state => state.template.internalVariable
+            }),
+            constantArr: {
+                get () {
+                    let KeyList = []
+                    if (this.constants) {
+                        KeyList = [...Object.keys(this.constants)]
+                    }
+                    if (this.internalVariable) {
+                        KeyList = [...KeyList, ...Object.keys(this.internalVariable)]
+                    }
+                    return KeyList
+                },
+                set (val) {
+                    this.varList = val
+                }
+            },
             textareaValue: {
                 get () {
                     if (!this.formMode && ['', undefined].includes(this.value)) {
@@ -62,43 +127,354 @@
                 set (val) {
                     this.updateForm(val)
                 }
+            },
+            isDisabled () {
+                return !this.editable || !this.formMode || this.disable
             }
         },
         watch: {
-            formMode () {
-                /**
-                 * 重新计算 textarea 高度，解决 disabled 下有滚动条和空白问题
-                 * resizeTextarea 为非官方暴露 api，后续需关注 element textarea 组件该问题修复后删除
-                 */
-                this.$nextTick(() => {
-                    this.$refs.tagTextarea.resizeTextarea()
+            isListOpen (val) {
+                if (!val) {
+                    this.hoverKey = ''
+                    const selectDom = this.$el.querySelector('.rf-select-content')
+                    selectDom.scrollTo({ top: 0 })
+                }
+            }
+        },
+        created () {
+            window.addEventListener('click', this.handleListShow, false)
+        },
+        mounted () {
+            const divInputDom = this.$el.querySelector('.div-input')
+            if (divInputDom) {
+                divInputDom.innerText = this.value
+                this.handleInputBlur()
+            }
+        },
+        beforeDestroy () {
+            window.removeEventListener('click', this.handleListShow, false)
+        },
+        methods: {
+            handleListShow (e) {
+                if (!this.isListOpen) {
+                    return
+                }
+                const parent = e.target.offsetParent
+                let classList = parent ? parent.classList : null
+                classList = classList && Array.from(classList.values())
+                const listPanel = this.$el.querySelector('.rf-select-list')
+                if (listPanel && !dom.nodeContains(listPanel, e.target) && classList[0] !== 'rf-form-wrapper') {
+                    this.isListOpen = false
+                }
+            },
+            onSelectVal (val) {
+                // 获取选定对象
+                const selection = getSelection()
+                // 如果保存的有上次的光标对象
+                if (this.lastEditRange) {
+                    // 清除所有选区
+                    selection.removeAllRanges()
+                    // 添加最后光标还原之前的状态
+                    selection.addRange(this.lastEditRange)
+                }
+                const range = selection.getRangeAt(0)
+                const textNode = range.startContainer
+                const rangeStartOffset = range.startOffset
+                // 匹配光标前内容最后面变量部分
+                const previousText = textNode.textContent.slice(0, rangeStartOffset)
+                const matchText = previousText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
+                // 需要补全的变量
+                const addText = val.replace(matchText, '')
+                textNode.insertData(rangeStartOffset, addText)
+                range.setStart(textNode, rangeStartOffset + addText.length)
+
+                // 将选区折叠为一个光标
+                range.collapse(true)
+                selection.removeAllRanges()
+                selection.addRange(range)
+                // 更新表单
+                const divInputDom = this.$el.querySelector('.div-input')
+                this.input.value = divInputDom.innerText
+                this.updateForm(divInputDom.innerText)
+                // 清空/关闭
+                this.isListOpen = false
+                this.hoverKey = ''
+                this.input.focus = true
+            },
+            // 文本框点击
+            handleInputMouseUp (e) {
+                // 判断是否点到变量节点上
+                let isVarTagDom = false
+                const varTagDoms = this.$el.querySelectorAll('.var-tag')
+                if (varTagDoms && varTagDoms.length) {
+                    isVarTagDom = Array.from(varTagDoms).some(item => dom.nodeContains(item, e.target))
+                }
+                if (isVarTagDom) {
+                    const varText = e.target.innerText
+                    const divInputDom = this.$el.querySelector('.div-input')
+                    const varTextNode = document.createTextNode(varText)
+                    // 替换内容
+                    Array.from(divInputDom.childNodes).some(node => {
+                        return Array.from(node.childNodes).some(child => {
+                            if (child.id === e.target.id) {
+                                node.replaceChild(varTextNode, child)
+                                return true
+                            }
+                        })
+                    })
+                    const selection = window.getSelection()
+                    const range = document.createRange()
+                    range.selectNodeContents(varTextNode)
+                    range.setStart(varTextNode, varTextNode.length)
+                    range.collapse(true)
+                    selection.removeAllRanges()
+                    selection.addRange(range)
+                } else if (this.input.value) {
+                    this.handleInputChange(e, false)
+                }
+            },
+            // 文本框获取焦点
+            handleInputFocus (e) {
+                this.input.focus = true
+            },
+            // 文本框输入
+            handleInputChange (e, updateForm = true) {
+                if (updateForm) {
+                    const { innerText } = e.target
+                    this.input.value = innerText
+                    this.updateForm(innerText)
+                }
+                const range = window.getSelection().getRangeAt(0)
+                this.lastEditRange = range
+                const { startContainer: textNode, startOffset } = range
+                const textValue = textNode.textContent
+                // 如果光标所在元素没有内容则不进行后续操作
+                if (!textValue) return
+                let previousText
+                if (textNode.nodeName === '#text') {
+                    previousText = textValue.slice(0, startOffset)
+                } else if (textNode.nodeName === 'DIV') {
+                    const lastNode = textNode.childNodes[startOffset - 1]
+                    previousText = lastNode.textContent
+                }
+                const matchText = previousText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
+                // 如果是完整全局变量则不进行手续操作
+                if (/^\$\{\w+\}$/.test(matchText)) {
+                    this.isListOpen = false
+                    return
+                }
+                // 判断是否为变量格式
+                if (matchText === '$' || /^\${[a-zA-Z_]*[\w|.]*/.test(matchText)) {
+                    const regStr = matchText.replace(/[\$\{\}]/g, '\\$&')
+                    const inputReg = new RegExp(regStr)
+                    this.varList = this.constantArr.filter(item => {
+                        return inputReg.test(item)
+                    })
+                    // 计算变量下拉列表的坐标
+                    this.isListOpen = false
+                    if (this.varList.length) {
+                        const { top: textNodeTop, width } = textNode.parentNode.getBoundingClientRect()
+                        const { width: inputWidth, top: inputTop } = this.$el.querySelector('.rf-form-wrap').getBoundingClientRect()
+                        let previousDomWidth = 0
+                        let previousDomLeft = 0
+                        const { previousSibling, previousElementSibling } = textNode
+                        if (previousSibling) {
+                            if (previousSibling.nodeName === '#text') {
+                                previousText = previousSibling.textContent + previousText
+                                if (previousElementSibling && previousElementSibling.nodeName !== '#text') {
+                                    previousDomWidth = previousElementSibling.offsetWidth || 0
+                                    previousDomLeft = previousElementSibling.offsetLeft || 0
+                                }
+                            } else {
+                                previousDomWidth = previousElementSibling.offsetWidth || 0
+                                previousDomLeft = previousElementSibling.offsetLeft || 0
+                            }
+                        }
+                        const newDom = document.createElement('span')
+                        newDom.style.maxWidth = `${width}px`
+                        newDom.style.lineHeight = '18px'
+                        newDom.style.display = 'inline-block'
+                        newDom.innerHTML = previousText
+                        this.$el.appendChild(newDom)
+                        const focusValueWidth = newDom.offsetWidth || 0
+                        const focusValueHeight = newDom.offsetHeight || 0
+                        this.$el.removeChild(newDom)
+                        let popLeft = previousDomLeft + previousDomWidth + focusValueWidth
+                        if (popLeft > inputWidth - 238) {
+                            popLeft = inputWidth - 238
+                        }
+                        let popTop = textNodeTop - inputTop + focusValueHeight + 2 // 2px是为了使光标和联想列表隔开
+                        this.$nextTick(() => {
+                            const { height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            if (window.innerHeight < textNodeTop + focusValueHeight + varListHeight + 50) {
+                                popTop = textNodeTop - inputTop - varListHeight - 2
+                            }
+                            this.varListPosition = `left: ${popLeft}px; top: ${popTop}px`
+                        })
+                    }
+                } else {
+                    this.varList = []
+                }
+                this.isListOpen = !!this.varList.length
+            },
+            // 点击到input外面
+            handleClickOutSide (e) {
+                if (!this.input.focus) return
+                const parent = e.target.offsetParent
+                const classList = parent ? parent.classList : null
+                const unFocus = !parent || (classList && !Array.from(classList.values()).some(key => {
+                    return ['tag-textarea', 'tippy-tooltip', 'tippy-content', 'rf-select-list'].includes(key)
+                }))
+                if (unFocus && e.target.className !== 'var-tag') {
+                    this.handleInputBlur()
+                }
+            },
+            // 文本框失焦
+            handleInputBlur  (e) {
+                this.$emit('blur')
+                this.input.focus = false
+                // 支持所有变量（系统变量，内置变量，自定义变量）
+                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
+                const divInputDom = this.$el.querySelector('.div-input')
+                divInputDom.childNodes.forEach(dom => {
+                    const domValue = dom.textContent
+                    const innerHtml = domValue.replace(varRegexp, (match) => {
+                        if (this.constantArr.includes(match)) {
+                            // 两边留空格保持间距
+                            const randomId = Math.random().toString().slice(-6)
+                            return `<span class="var-tag" contenteditable="false" id="tag_${randomId}">${match}</span>`
+                        }
+                        return match
+                    })
+                    if (dom.nodeName === '#text') {
+                        const newDom = document.createElement('div')
+                        newDom.innerHTML = innerHtml
+                        divInputDom.replaceChild(newDom, dom)
+                    } else if (dom.nodeName === 'DIV') {
+                        dom.innerHTML = innerHtml
+                    } else {
+                        const newDom = document.createElement('text')
+                        divInputDom.replaceChild(newDom, dom)
+                    }
                 })
+            },
+            // 文本框按键事件
+            handleInputKeyDown (e) {
+                switch (e.code) {
+                    case 'Enter':
+                    case 'NumpadEnter':
+                        if (this.isListOpen) {
+                            e.preventDefault()
+                            this.handleKeyEnter()
+                        }
+                        break
+                    case 'ArrowDown':
+                    case 'ArrowUp':
+                        if (this.isListOpen) {
+                            e.preventDefault()
+                            this.handleDocumentKeydown(e)
+                        }
+                        break
+                    default:
+                        return false
+                }
+            },
+            handleKeyEnter () {
+                if (!this.hoverKey) return
+                this.onSelectVal(this.hoverKey)
+            },
+            handleDocumentKeydown (event) {
+                const len = this.varList.length
+                if (len) {
+                    event.preventDefault()
+                    event.stopPropagation()
+                    let curIndex = this.varList.findIndex(item => item === this.hoverKey)
+                    curIndex = event.code === 'ArrowDown' ? curIndex + 1 : curIndex - 1
+                    curIndex = curIndex > len - 1 ? 0 : (curIndex < 0 ? len - 1 : curIndex)
+                    const option = this.varList[curIndex]
+                    if (option) {
+                        this.hoverKey = option
+                        const selectDom = this.$el.querySelector('.rf-select-content')
+                        const hoverItemDom = selectDom.querySelector('.is-hover')
+                        if (hoverItemDom) {
+                            selectDom.scrollTo({
+                                top: 32 * (curIndex < 3 ? 0 : curIndex - 2)
+                            })
+                        }
+                    }
+                }
             }
         }
     }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 @import '@/scss/mixins/scrollbar.scss';
 .tag-textarea {
-    .el-textarea__inner {
-        padding-left: 10px;
-        padding-right: 10px;
-        font-size: 12px;
-        word-break: break-all;
-        @include scrollbar;
+    .rf-form-wrapper {
+        position: relative;
+        .rf-select-list {
+            position: absolute;
+            top: 40px;
+            right: 0;
+            width: 238px;
+            background: #ffffff;
+            border-radius: 2px;
+            box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
+            overflow-y: hidden;
+            z-index: 100;
+        }
+        .rf-select-content {
+            max-height: 100px;
+            padding: 2px 0;
+            overflow: auto;
+            @include scrollbar;
+        }
+        .rf-select-item {
+            padding: 0 10px;
+            line-height: 32px;
+            font-size: 12px;
+            cursor: pointer;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            &.is-hover,
+            &:hover {
+                background: #f5f7fa;
+            }
+        }
     }
-}
-.rf-view-textarea-value {
-    .el-textarea__inner {
-        padding: 6px 0;
-        line-height: 24px;
-        color: #333333;
-        border: none;
-        resize: none;
-        &[disabled = "disabled"] {
-            background: inherit;
-            color: inherit;
-            cursor: text;
+    .rf-form-wrap {
+        padding: 5px 10px;
+        border: 1px solid #c4c6cc;
+        border-radius: 2px;
+        &.input-focus {
+            border-color: #3a84ff;
+        }
+        &.input-disable {
+            cursor: not-allowed;
+            background-color: #fafbfd;
+            border-color: #dcdee5;
+        }
+    }
+    .div-input {
+        min-height: 36px;
+        line-height: 18px;
+        color: #63656e;
+        outline: 0;
+        word-wrap: break-word;
+        overflow-x: hidden;
+        overflow-y: auto;
+        /deep/.var-tag {
+            padding: 0px 4px;
+            background: #f0f1f5;
+            cursor: pointer;
+            white-space: nowrap;
+            &:hover {
+                background: #eaebf0;
+            }
+        }
+        &.input-before::before {
+            content: attr(data-placeholder);
+            color: #c4c6cc;
         }
     }
 }

From 090325c8615de3c1b4fb21cde7dc090bd017202b Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Tue, 22 Aug 2023 19:51:03 +0800
Subject: [PATCH 044/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=88=91=E7=9A=84=E5=8A=A8=E6=80=81=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?&=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=90=86=E4=BA=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/apis/drf/serilaziers/taskflow_instance.py | 1 +
 gcloud/core/apis/drf/viewsets/taskflow.py             | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gcloud/core/apis/drf/serilaziers/taskflow_instance.py b/gcloud/core/apis/drf/serilaziers/taskflow_instance.py
index 3737451b3b..d5410edb63 100644
--- a/gcloud/core/apis/drf/serilaziers/taskflow_instance.py
+++ b/gcloud/core/apis/drf/serilaziers/taskflow_instance.py
@@ -82,6 +82,7 @@ class Meta:
             "current_flow",
             "engine_ver",
             "flow_type",
+            "recorded_executor_proxy",
         ]
 
 
diff --git a/gcloud/core/apis/drf/viewsets/taskflow.py b/gcloud/core/apis/drf/viewsets/taskflow.py
index 87ad55db6e..62cccd03a1 100644
--- a/gcloud/core/apis/drf/viewsets/taskflow.py
+++ b/gcloud/core/apis/drf/viewsets/taskflow.py
@@ -296,9 +296,11 @@ def list(self, request, *args, **kwargs):
             self.paginator.offset = self.paginator.get_offset(request)
             self.paginator.count = -1
             create_method = request.query_params.get("create_method")
+
             queryset = self._optimized_my_dynamic_query(
                 queryset, request.user.username, self.paginator.limit, self.paginator.offset, create_method
             )
+
             page = list(queryset)
         else:
             page = self.paginate_queryset(queryset)
@@ -465,7 +467,7 @@ def _optimized_my_dynamic_query(queryset, username, limit, offset, create_method
         """
         优化我的动态接口查询速度
         """
-        original_query = str(queryset.query)
+        original_query, params = queryset.query.sql_with_params()
         new_query = re.sub(
             "FROM (.*?) ON",
             "FROM `pipeline_pipelineinstance` STRAIGHT_JOIN `taskflow3_taskflowinstance` ON",
@@ -476,7 +478,7 @@ def _optimized_my_dynamic_query(queryset, username, limit, offset, create_method
         if create_method:
             new_query = new_query.replace(create_method, f"'{create_method}'")
         new_query += f" LIMIT {limit} OFFSET {offset}"
-        return TaskFlowInstance.objects.raw(new_query)
+        return TaskFlowInstance.objects.raw(original_query, params)
 
     @swagger_auto_schema(
         method="GET",

From e963827321408acbd7cc68134e190e04fc467b75 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Thu, 24 Aug 2023 10:22:37 +0800
Subject: [PATCH 045/112] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=B5=8B=E8=AF=95=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20(#7020)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RenderForm/IpSelector/IpSelectorTable.vue |   5 +-
 .../TemplateCanvas/NodeTemplate/Subflow.vue   |  30 ++-
 frontend/desktop/src/config/i18n/cn.js        |   3 +-
 frontend/desktop/src/config/i18n/en.js        |   5 +-
 .../pages/task/TaskCreate/EditTaskScheme.vue  |   3 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 200 +++++++++++++-----
 .../TaskExecute/ExecuteInfo/ExecuteLog.vue    |   2 +-
 .../TaskExecute/ExecuteInfo/ExecuteRecord.vue |  40 +++-
 .../TaskExecute/ExecuteInfo/InputParams.vue   |  25 ++-
 .../task/TaskExecute/ExecuteInfo/NodeLog.vue  |   6 -
 .../ExecuteInfo/NodeOperationFlow.vue         |   5 +-
 .../TaskExecute/ExecuteInfo/OutputParams.vue  |  26 ++-
 .../src/pages/task/TaskExecute/NodeTree.vue   |  12 +-
 .../pages/task/TaskExecute/NodeTreeItem.vue   |  91 +++++---
 .../pages/task/TaskExecute/TaskOperation.vue  | 100 +++++----
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |   8 +-
 .../template/TemplateEdit/TemplateHeader.vue  |   1 +
 .../TabGlobalVariables/VariableItem.vue       |   2 +-
 frontend/desktop/src/store/modules/task.js    |   2 +-
 19 files changed, 377 insertions(+), 189 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
index cbec0e0ab0..f433b6446d 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/IpSelectorTable.vue
@@ -118,7 +118,7 @@
                     {
                         name: 'IP',
                         id: 'bk_host_innerip',
-                        width: 120,
+                        width: 180,
                         fixed: true,
                         sortable: true,
                         checked: true
@@ -128,7 +128,7 @@
                         id: 'bk_host_innerip_v6',
                         width: 120,
                         fixed: true,
-                        checked: true
+                        checked: false
                     },
                     {
                         name: this.$t('管控区域'),
@@ -183,7 +183,6 @@
             }
         },
         created () {
-            console.log(this.listInPage)
             if (this.staticIpTableConfig.length) {
                 this.tableColumnList.forEach(item => {
                     item.checked = this.staticIpTableConfig.includes(item.id)
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
index 3ddc4a0d86..f51555150e 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
@@ -25,7 +25,6 @@
         </div>
         <div class="node-name" :title="node.name">
             <div class="name-text">{{ node.name }}</div>
-            <div class="subflow-mark"></div>
         </div>
         <div class="node-options-icon">
             <template v-if="node.optional">
@@ -133,23 +132,18 @@
     }
 </script>
 <style lang="scss" scoped>
-    .node-name {
-        position: relative;
-        .subflow-mark {
-            &::before {
-                content: '';
-                position: absolute;
-                bottom: -1px;
-                right: -1px;
-                background: linear-gradient(to left top,
-                    #a2a5ad, #9fa3aa 40%, #82848a 50%, #ffffff 60%, #ffffff) 100% 0 no-repeat;
-                width: 11px;
-                height: 11px;
-                border-top: 1px solid #e5e5e5;
-                border-left: 1px solid #e5e5e5;
-                border-bottom-right-radius: 4px;
-                box-shadow: -1px -1px 2px -2px rgba(0, 0, 0, .5);
-            }
+    .task-node {
+        &::before {
+            content: '';
+            position: absolute;
+            bottom: -6px;
+            right: -6px;
+            width: 100%;
+            height: 100%;
+            background: #b5c0d599;
+            border: 1px solid #B5C0D5;
+            border-radius: 4px;
+            z-index: -1;
         }
     }
     .updated-dot {
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 41be15dce9..594d451288 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -732,7 +732,6 @@ const cn = {
     '输出参数': '输出参数',
     '输出表单': '输出表单',
     '参数名': '参数名',
-    '执行记录': '执行记录',
     '节点日志': '节点日志',
     '日志': '日志',
     '第': '第',
@@ -1464,7 +1463,7 @@ const cn = {
     '请求异常（外部系统错误或非法操作）': '请求异常（外部系统错误或非法操作）',
     '请求异常（内部系统发生未知错误）': '请求异常（内部系统发生未知错误）',
     '节点基础信息': '节点基础信息',
-    '节点执行记录': '节点执行记录',
+    '节点执行详情': '节点执行详情',
     '节点操作记录': '节点操作记录',
     '参数Key': '参数Key',
     '详情': '详情',
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index ee64d036c8..b27594ca85 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -177,7 +177,7 @@ const en = {
     // 节点详情
     '节点详情': 'Task Detail',
     '查看节点详情': 'Task Detail',
-    '执行记录': 'Running Detail',
+    '执行详情': 'Running Detail',
     '配置快照': 'Setting Snapshot',
     '操作历史': 'Operation Logs',
     '调用日志': 'Call Logs',
@@ -1015,7 +1015,6 @@ const en = {
     '输入值不满足校验规则': 'Input does not match validation',
     '请求失败，点击重新加载': 'Request failed, click to reload',
     '没有更多了': 'No more',
-    '执行详情': 'Execution Detail',
     '查看子流程': 'View Subflow',
     '跳过失败': 'Skip Failed',
     '开始执行任务失败': 'Execution task failed',
@@ -1502,7 +1501,7 @@ const en = {
     '请求异常（外部系统错误或非法操作）': 'Request Exception (external system error or illegal operation)',
     '请求异常（内部系统发生未知错误）': 'Request Exception (an unknown error occurred in the internal system)',
     '节点基础信息': 'Node basic information',
-    '节点执行记录': 'Node execution record',
+    '节点执行详情': 'Node execution Detail',
     '节点操作记录': 'Node operation record',
     '参数Key': 'Parameter Key',
     '详情': 'Detail',
diff --git a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
index b18ad2a8b4..2e8f6cbe4c 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
@@ -644,10 +644,11 @@
                         scheme.isDefault = false
                         await this.onSaveDefaultExecuteScheme()
                     }
-                    await this.deleteTaskScheme({
+                    const resp = await this.deleteTaskScheme({
                         isCommon: this.isCommonProcess,
                         id: scheme.id
                     })
+                    if (!resp.result) return
                     const index = this.schemeList.findIndex(item => item.id === scheme.id)
                     this.schemeList.splice(index, 1)
                     // 删除方案后，画布按编辑前选中的方案来勾选节点
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index e85fac8064..3fd82869e2 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -40,7 +40,8 @@
                             :show-palette="false"
                             :show-tool="false"
                             :editable="false"
-                            :canvas-data="canvasData">
+                            :canvas-data="canvasData"
+                            @onNodeClick="onNodeClick">
                         </TemplateCanvas>
                         <div class="flow-option">
                             <i
@@ -70,7 +71,7 @@
                             type="unborder-card"
                             ext-cls="execute-info-tab"
                             @tab-change="onTabChange">
-                            <bk-tab-panel name="record" v-if="!isCondition" :label="$t('执行记录')"></bk-tab-panel>
+                            <bk-tab-panel name="record" v-if="!isCondition" :label="$t('执行详情')"></bk-tab-panel>
                             <bk-tab-panel name="config" v-if="isCondition || (!loading && ['tasknode', 'subflow'].includes(location.type))" :label="$t('配置快照')"></bk-tab-panel>
                             <bk-tab-panel name="history" v-if="!isCondition" :label="$t('操作历史')"></bk-tab-panel>
                             <bk-tab-panel name="log" v-if="!isCondition" :label="$t('调用日志')"></bk-tab-panel>
@@ -143,10 +144,11 @@
                                     :not-performed-sub-node="notPerformedSubNode"
                                     :is-sub-process-node="isSubProcessNode">
                                 </ExecuteInfoForm>
-                                <section class="info-section" data-test-id="taskExcute_form_operatFlow" v-else-if="curActiveTab === 'history'">
+                                <section class="info-section" data-test-id="taskExecute_form_operatFlow" v-else-if="curActiveTab === 'history'">
                                     <NodeOperationFlow
                                         :locations="pipelineData.location"
                                         :node-id="executeInfo.id"
+                                        :sub-process-task-id="subProcessTaskId"
                                         :not-performed-sub-node="notPerformedSubNode">
                                     </NodeOperationFlow>
                                 </section>
@@ -161,48 +163,60 @@
                                 </NodeLog>
                             </template>
                         </div>
-                        <div class="action-wrapper" v-if="isShowActionWrap">
-                            <template v-if="executeInfo.state === 'RUNNING' && !isSubProcessNode">
-                                <bk-button
-                                    v-if="nodeDetailConfig.component_code === 'pause_node'"
-                                    theme="primary"
-                                    data-test-id="taskExcute_form_resumeBtn"
-                                    @click="onResumeClick">
-                                    {{ $t('继续执行') }}
-                                </bk-button>
-                                <bk-button
-                                    v-else-if="nodeDetailConfig.component_code === 'bk_approve'"
-                                    theme="primary"
-                                    data-test-id="taskExcute_form_approvalBtn"
-                                    @click="$emit('onApprovalClick', nodeDetailConfig.node_id)">
-                                    {{ $t('审批') }}
-                                </bk-button>
-                                <bk-button
-                                    v-else
-                                    data-test-id="taskExcute_form_mandatoryFailBtn"
-                                    @click="mandatoryFailure">
-                                    {{ $t('强制终止') }}
-                                </bk-button>
-                            </template>
-                            <template v-if="isShowRetryBtn || isShowSkipBtn">
-                                <bk-button
-                                    theme="primary"
-                                    v-if="isShowRetryBtn"
-                                    data-test-id="taskExcute_form_retryBtn"
-                                    @click="onRetryClick">
-                                    {{ $t('重试') }}
-                                </bk-button>
-                                <bk-button
-                                    theme="default"
-                                    v-if="isShowSkipBtn"
-                                    data-test-id="taskExcute_form_skipBtn"
-                                    @click="onSkipClick">
-                                    {{ $t('跳过') }}
-                                </bk-button>
-                            </template>
-                        </div>
                     </div>
                 </div>
+                <div class="action-wrapper" v-if="isShowActionWrap">
+                    <template v-if="executeInfo.state === 'RUNNING' && !isSubProcessNode">
+                        <bk-button
+                            v-if="nodeDetailConfig.component_code === 'pause_node'"
+                            theme="primary"
+                            data-test-id="taskExecute_form_resumeBtn"
+                            @click="onResumeClick">
+                            {{ $t('继续执行') }}
+                        </bk-button>
+                        <bk-button
+                            v-else-if="nodeDetailConfig.component_code === 'bk_approve'"
+                            theme="primary"
+                            data-test-id="taskExecute_form_approvalBtn"
+                            @click="$emit('onApprovalClick', nodeDetailConfig.node_id)">
+                            {{ $t('审批') }}
+                        </bk-button>
+                        <bk-button
+                            v-else-if="!isLegacySubProcess"
+                            data-test-id="taskExecute_form_mandatoryFailBtn"
+                            @click="mandatoryFailure">
+                            {{ $t('强制终止') }}
+                        </bk-button>
+                        <bk-button
+                            v-if="isLegacySubProcess"
+                            data-test-id="taskExecute_form_pauseBtn"
+                            @click="onPauseClick">
+                            {{ $t('暂停') }}
+                        </bk-button>
+                    </template>
+                    <template v-if="isShowRetryBtn || isShowSkipBtn">
+                        <bk-button
+                            theme="primary"
+                            v-if="isShowRetryBtn"
+                            data-test-id="taskExecute_form_retryBtn"
+                            @click="onRetryClick">
+                            {{ $t('重试') }}
+                        </bk-button>
+                        <bk-button
+                            theme="default"
+                            v-if="isShowSkipBtn"
+                            data-test-id="taskExecute_form_skipBtn"
+                            @click="onSkipClick">
+                            {{ $t('跳过') }}
+                        </bk-button>
+                    </template>
+                    <bk-button
+                        v-if="isShowContinueBtn"
+                        data-test-id="taskExecute_form_continueBtn"
+                        @click="onContinueClick">
+                        {{ $t('继续') }}
+                    </bk-button>
+                </div>
             </div>
         </bk-resize-layout>
     </div>
@@ -421,9 +435,16 @@
             isExecuteTimeShow () {
                 return ['record', 'log'].includes(this.curActiveTab) && (this.loop > 1 || this.historyInfo.length > 1)
             },
+            isShowContinueBtn () {
+                return this.isLegacySubProcess && this.executeInfo.state === 'SUSPENDED'
+            },
             isShowActionWrap () {
                 // 任务终止时禁止节点操作
-                return this.state !== 'REVOKED' && ((this.realTimeState.state === 'RUNNING' && !this.isSubProcessNode) || this.isShowRetryBtn || this.isShowSkipBtn)
+                if (this.state === 'REVOKED') return false
+                return (this.realTimeState.state === 'RUNNING' && !this.isSubProcessNode)
+                    || this.isShowRetryBtn
+                    || this.isShowSkipBtn
+                    || this.isShowContinueBtn
             },
             isLegacySubProcess () { // 是否为旧版子流程
                 return !this.isSubProcessNode && this.nodeActivity && this.nodeActivity.type === 'SubProcess'
@@ -948,6 +969,14 @@
                 }
                 this.randomKey = new Date().getTime()
             },
+            onNodeClick (node) {
+                const nodeInfo = this.getNodeInfo(this.nodeData, '', node)
+                if (nodeInfo) {
+                    nodeInfo && this.onSelectNode(nodeInfo)
+                    const parentInstance = this.$parent.$parent
+                    parentInstance.defaultActiveId = node + '-' + nodeInfo.parentId
+                }
+            },
             onZoomOut () {
                 const flowDom = this.$el.querySelector('.sub-flow')
                 const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
@@ -964,10 +993,12 @@
                     this.onSelectExecuteRecord(this.theExecuteRecord)
                 }
                 if (this.canvasExpand) {
-                    const scrollBoxDom = document.querySelector('.scroll-box')
-                    const subProcessCanvasDom = document.querySelector('.sub-process')
-                    const { height = 0 } = subProcessCanvasDom.getBoundingClientRect()
-                    scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
+                    // 操作历史数据是动态加载的，需要延时才能准确的滚动到最底部
+                    const time = name === 'history' ? 300 : 0
+                    setTimeout(() => {
+                        const scrollBoxDom = document.querySelector('.scroll-box')
+                        scrollBoxDom.scrollTo({ top: scrollBoxDom.scrollHeight, behavior: 'smooth' })
+                    }, time)
                 }
             },
             onSelectNode (node) {
@@ -985,7 +1016,8 @@
                 if (this.subProcessPipeline) {
                     this.toggleNodeActive(this.nodeDetailConfig.node_id, false)
                 }
-                const updateCanvas = node.parentId && (!this.subProcessPipeline || !this.subProcessPipeline.activities[node.id])
+                // 如果点击的是子流程节点或者是不属于当前所选中节点树的节点，需要重新刷新子流程画布
+                const updateCanvas = node.parentId && (!this.subProcessPipeline || !this.subProcessPipeline.location.find(item => item.id === node.id))
                 if (node.isSubProcess || updateCanvas) {
                     this.canvasRandomKey = new Date().getTime()
                     this.$nextTick(() => {
@@ -1003,6 +1035,9 @@
                         nodeStatus = nodeStatus.data.children
                     }
                     this.updateNodeInfo(nodeStatus)
+                    if (node.parentId) { // 只有子流程下的节点在画布上才能找到
+                        this.moveNodeToView(node.id)
+                    }
                 })
             },
             setSubprocessCanvasZoom () {
@@ -1018,6 +1053,32 @@
                 const { y } = firstNodeDom.getBoundingClientRect()
                 jsFlowInstance.setCanvasPosition(0, 180 - y)
             },
+            // 移动画布，将节点放到画布中央
+            moveNodeToView (id) {
+                // 判断dom是否存在当前视图中
+                const nodeEl = document.querySelector(`#${id} .canvas-node-item`)
+                const isInViewPort = this.judgeInViewPort(nodeEl)
+                // 如果不存在需要将节点挪到画布中间
+                if (!isInViewPort) {
+                    const { width, height } = this.$el.querySelector('#canvasContainer').getBoundingClientRect()
+                    const { x, y } = this.canvasData.locations.find(item => item.id === id)
+                    const { width: nodeWidth, height: nodeHeight } = nodeEl.getBoundingClientRect()
+                    let jsFlowInstance = this.$refs.subProcessCanvas
+                    jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                    let offsetX = (width - nodeWidth) / 2 - x
+                    offsetX = offsetX * jsFlowInstance.zoom
+                    let offsetY = (height - nodeHeight) / 2 - y
+                    offsetY = offsetY * jsFlowInstance.zoom
+                    jsFlowInstance.setCanvasPosition(offsetX, offsetY, true)
+                }
+            },
+            // dom是否存在当前视图中
+            judgeInViewPort (element) {
+                if (!element) return false
+                const { width, height, top: canvasTop, left: canvasLeft } = this.$el.querySelector('.sub-flow').getBoundingClientRect()
+                const { top, left } = element.getBoundingClientRect()
+                return top > canvasTop && top < canvasTop + height && left > canvasLeft && left < canvasLeft + width
+            },
             
             toggleNodeActive (id, isActive) {
                 const node = document.getElementById(id)
@@ -1048,6 +1109,10 @@
                         }
                         this.handleDynamicLoad(node, true)
                     }
+                    // 实时更新执行详情中的状态
+                    if (this.executeRecord.id === node.id) {
+                        this.executeRecord.state = nodeState
+                    }
                     if (this.nodeDetailConfig.node_id === id && !this.executeRecord.finish_time) {
                         this.executeRecord.finish_time = states[id].finish_time
                         this.executeRecord.elapsed_time = states[id].elapsed_time
@@ -1205,6 +1270,7 @@
                             taskId
                         }
                         const parentInstance = this.$parent.$parent
+                        parentInstance.nodeIds[pipelineTree.id] = []
                         nodeInfo.children = parentInstance.getOrderedTree(pipelineTree, parentInfo)
                         nodeInfo.dynamicLoad = false
                         nodeInfo.expanded = true
@@ -1265,11 +1331,11 @@
                 }
                 let nodeInfo
                 nodes.some(item => {
-                    const { id, isGateway, conditionType, children } = item
+                    const { id, children } = item
                     if (id === nodeId) {
                         nodeInfo = item
                         return true
-                    } else if ((isGateway || conditionType) && children.length) {
+                    } else if (children && children.length) {
                         nodeInfo = this.getNodeInfo(item.children, '', nodeId)
                         return !!nodeInfo
                     }
@@ -1338,6 +1404,12 @@
             },
             mandatoryFailure () {
                 this.$emit('onForceFail', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+            },
+            onPauseClick () {
+                this.$emit('onPauseClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+            },
+            onContinueClick () {
+                this.$emit('onContinueClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             }
         }
     }
@@ -1376,8 +1448,6 @@
     }
     .action-wrapper {
         width: 100%;
-        position: fixed;
-        bottom: 0;
         padding-left: 20px;
         height: 48px;
         line-height: 48px;
@@ -1475,6 +1545,21 @@
                         border-radius: 2px;
                     }
                 }
+                .state-icon {
+                    display: none;
+                }
+                .task-node {
+                    box-shadow: none !important;
+                    &.actived {
+                        .node-name {
+                            border-color: #b4becd !important;
+                            background-color: #fff !important;
+                        }
+                    }
+                }
+            }
+            /deep/.node-tips-content {
+                display: none;
             }
         }
         .flow-option {
@@ -1506,7 +1591,12 @@
             }
         }
         &.canvas-expand {
-            height: calc(100% - 125px);
+            height: calc(100% - 85px);
+            & + div {
+                .log-section {
+                    height: 858px;
+                }
+            }
         }
     }
     .execute-info {
@@ -1538,7 +1628,7 @@
             display: flex;
             flex-direction: column;
             overflow-y: auto;
-            padding: 16px 24px 66px 15px;
+            padding: 16px 24px 18px 15px;
             @include scrollbar;
         }
         .execute-time-section {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteLog.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteLog.vue
index e70a149040..629719f040 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteLog.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteLog.vue
@@ -1,6 +1,6 @@
 <template>
     <section class="info-section" data-test-id="taskExecute_form_executeLog">
-        <h4 class="common-section-title">{{ $t('节点执行记录') }}</h4>
+        <h4 class="common-section-title">{{ $t('节点执行详情') }}</h4>
         <div class="excute-time" v-if="loop && loop > 1">
             <span>{{$t('第')}}</span>
             <bk-select
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
index 84b06c52aa..efd7f45b99 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
@@ -53,6 +53,7 @@
     import InputParams from './InputParams.vue'
     import OutputParams from './OutputParams.vue'
     import NoData from '@/components/common/base/NoData.vue'
+    import { TASK_STATE_DICT } from '@/constants/index.js'
     export default {
         name: 'executeRecord',
         components: {
@@ -77,10 +78,6 @@
                 type: Boolean,
                 default: false
             },
-            nodeState: {
-                type: String,
-                default: ''
-            },
             executeInfo: {
                 type: Object,
                 default: () => ({})
@@ -104,6 +101,16 @@
                 isExpandTextShow: false
             }
         },
+        computed: {
+            nodeState () {
+                const { state, skip, error_ignored } = this.executeInfo
+                // 如果整体任务未执行的话不展示描述
+                if (state === 'CREATED') return this.$t('未执行')
+                // 如果整体任务执行完毕但有的节点没执行的话不展示描述
+                if (['FAILED', 'FINISHED'].includes(state) && state === 'READY') return this.$t('未执行')
+                return skip || error_ignored ? this.$t.t('失败后跳过') : state && TASK_STATE_DICT[state]
+            }
+        },
         mounted () {
             const showDom = document.querySelector('.show-html-text')
             const hideDom = document.querySelector('.hide-html-text')
@@ -264,5 +271,30 @@
         height: 150px;
         margin-top: 32px;
     }
+    /deep/.section-title-wrap {
+        display: flex;
+        align-items: center;
+        position: relative;
+        color: #313238;
+        height: 24px;
+        font-weight: 600;
+        line-height: 18px;
+        padding: 0 8px;
+        background: #eaebf0;
+        .trigger {
+            margin-right: 10px;
+            color: #979ba5;
+            translate: all .2s;
+            cursor: pointer;
+        }
+        .is-expand {
+            transform: rotate(90deg);
+        }
+        .origin-value {
+            font-weight: normal;
+            top: 2px !important;
+            right: 12px !important;
+        }
+    }
 }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
index db05f487c5..7b62bf863d 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
@@ -1,11 +1,17 @@
 <template>
     <section class="info-section input-section" data-test-id="taskExecute_form_inputParams">
-        <h4 class="common-section-title">{{ $t('输入参数') }}</h4>
-        <div class="origin-value" v-if="!adminView">
-            <bk-switcher size="small" @change="inputSwitcher" v-model="isShowInputOrigin"></bk-switcher>
-            {{ 'Code' }}
+        <div class="section-title-wrap">
+            <i
+                class="trigger common-icon-next-triangle-shape"
+                :class="{ 'is-expand': isExpand }"
+                @click="isExpand = !isExpand"></i>
+            {{ $t('输入参数') }}
+            <div class="origin-value" v-if="!adminView">
+                <bk-switcher size="small" @change="inputSwitcher" v-model="isShowInputOrigin"></bk-switcher>
+                {{ 'Code' }}
+            </div>
         </div>
-        <template v-if="!adminView">
+        <template v-if="!adminView && isExpand">
             <div class="input-table" v-if="!isShowInputOrigin">
                 <div class="table-header">
                     <span class="input-name">{{ $t('参数名') }}</span>
@@ -24,7 +30,7 @@
                 </template>
                 <template v-else>
                     <jsonschema-form
-                        v-if="renderConfig?.properties && Object.keys(renderConfig.properties).length > 0"
+                        v-if="renderConfig && renderConfig.properties && Object.keys(renderConfig.properties).length > 0"
                         :schema="renderConfig"
                         :value="inputRenderDate">
                     </jsonschema-form>
@@ -33,7 +39,7 @@
             </div>
             <full-code-editor v-else :value="inputsInfo"></full-code-editor>
         </template>
-        <div class="code-block-wrap" v-else>
+        <div class="code-block-wrap" v-else-if="isExpand">
             <VueJsonPretty :data="inputsInfo"></VueJsonPretty>
         </div>
     </section>
@@ -93,7 +99,8 @@
                 },
                 renderKey: null,
                 inputConstants: {},
-                inputRenderDate: {}
+                inputRenderDate: {},
+                isExpand: true
             }
         },
         computed: {
@@ -177,6 +184,7 @@
         border: 1px solid #dcdee5;
         border-bottom: none;
         border-radius: 2px;
+        margin: 13px 12px 0;
         .table-header {
             display: flex;
             align-items: center;
@@ -268,5 +276,6 @@
     }
     .input-section .full-code-editor {
         height: 400px;
+        margin: 13px 12px 0;
     }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeLog.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeLog.vue
index de5a953e67..55f3260efe 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeLog.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeLog.vue
@@ -85,12 +85,6 @@
                 if (val === 'third_party_plugin' || this.nodeLogPageInfo) {
                     this.watchEditorScroll()
                 }
-            },
-            executeInfo: {
-                handler (val) {
-                    this.initLog()
-                },
-                deep: true
             }
         },
         beforeDestroy () {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
index a39c25b8d1..4c6d5ab977 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/NodeOperationFlow.vue
@@ -31,6 +31,9 @@
             notPerformedSubNode: {
                 type: Boolean,
                 default: false
+            },
+            subProcessTaskId: {
+                type: [String, Number]
             }
         },
         data () {
@@ -62,7 +65,7 @@
                     }
                     const resp = await this.getOperationRecordTask({
                         project_id: params.project_id,
-                        instance_id: query.instance_id,
+                        instance_id: this.subProcessTaskId || query.instance_id,
                         node_id: this.nodeId || undefined
                     })
                     this.operateFlowData = resp.data.map(item => {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/OutputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/OutputParams.vue
index 05a86282f9..ae00c116af 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/OutputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/OutputParams.vue
@@ -1,12 +1,18 @@
 <template>
     <section class="info-section outputs-section" data-test-id="taskExecute_form_outputParams">
-        <h4 class="common-section-title">{{ $t('输出参数') }}</h4>
-        <div class="origin-value" v-if="isReadyStatus && !adminView">
-            <bk-switcher size="small" @change="outputSwitcher" v-model="isShowOutputOrigin"></bk-switcher>
-            {{ 'Code' }}
+        <div class="section-title-wrap">
+            <i
+                class="trigger common-icon-next-triangle-shape"
+                :class="{ 'is-expand': isExpand }"
+                @click="isExpand = !isExpand"></i>
+            {{ $t('输出参数') }}
+            <div class="origin-value" v-if="isReadyStatus && !adminView">
+                <bk-switcher size="small" @change="outputSwitcher" v-model="isShowOutputOrigin"></bk-switcher>
+                {{ 'Code' }}
+            </div>
         </div>
-        <NoData v-if="!isReadyStatus" :message="$t('暂无输出')"></NoData>
-        <template v-else-if="!adminView">
+        <NoData v-if="!isReadyStatus && isExpand" :message="$t('暂无输出')"></NoData>
+        <template v-else-if="!adminView && isExpand">
             <table class="operation-table outputs-table" v-if="!isShowOutputOrigin">
                 <thead>
                     <tr>
@@ -34,7 +40,7 @@
             </table>
             <full-code-editor v-else :value="outputsInfo"></full-code-editor>
         </template>
-        <div class="code-block-wrap" v-else>
+        <div class="code-block-wrap" v-else-if="isExpand">
             <VueJsonPretty :data="outputsInfo" v-if="outputsInfo"></VueJsonPretty>
             <NoData v-else></NoData>
         </div>
@@ -74,7 +80,8 @@
         data () {
             return {
                 isShowOutputOrigin: false,
-                outputsInfo: null
+                outputsInfo: null,
+                isExpand: true
             }
         },
         watch: {
@@ -132,6 +139,8 @@
     .outputs-section .operation-table {
         flex: 1;
         table-layout: fixed;
+        width: calc(100% - 24px);
+        margin: 13px 12px 0;
         th, td {
             width: 30%;
             padding: 16px 13px;
@@ -155,6 +164,7 @@
     }
     .outputs-section .full-code-editor {
         height: 400px;
+        margin: 13px 12px 0;
     }
     .no-data-wrapper {
         margin-top: 32px;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
index f854ce9827..46d6fd8eb2 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
@@ -45,9 +45,15 @@
                 activeId: this.defaultActiveId
             }
         },
-        mounted () {
-            if (this.defaultActiveId) {
-                this.setDefaultActiveId(this.treeData, this.defaultActiveId)
+        watch: {
+            defaultActiveId: {
+                handler (val) {
+                    this.activeId = val
+                    const nodeId = val.split('-')[0]
+                    this.setDefaultActiveId(this.treeData, nodeId)
+                },
+                deep: true,
+                immediate: true
             }
         },
         methods: {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
index 7631d35953..93542cbd28 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -10,7 +10,9 @@
                     'branch-condition-container': node.conditionType,
                     'parallel-gateway-container': node.type === 'ParallelGateway',
                     'gateway-border-line': node.isGateway && node.expanded && node.type !== 'ConvergeGateway',
-                    'subprocess-border-line': node.isSubProcess && node.expanded
+                    'has-converge-gateway': node.hasConvergeGW,
+                    'subprocess-border-line': node.isSubProcess && node.expanded,
+                    'condition-or-level-up': node.conditionType || node.isLevelUp
                 }
             ]">
             <div
@@ -41,7 +43,7 @@
                         <i v-if="node.children && node.children.length" class="common-icon-next-triangle-shape"></i>
                     </span>
                     <!--空的占位符-->
-                    <span v-else-if="node.isCallback ? false : !node.parentId" class="empty-div"></span>
+                    <span v-else-if="node.isCallback || node.isLevelUp ? false : !node.parentId" class="empty-div"></span>
                     <!--网关图标-->
                     <span
                         v-if="nodeType[node.type]"
@@ -273,37 +275,67 @@
         }
     }
     .gateway-border-line {
-        &::before {
-            content: '';
-            display: block;
-            height: calc(100% - 20px);
-            position: absolute;
-            top: 28px;
-            left: 25.5px;
-            width: 1px;
-            border-left: 1px solid #dcdee5;
-        }
         >.node-tree {
-            >.branch-condition-container::before {
-                content: '';
-                display: block;
-                position: absolute;
-                top: 15.5px;
-                left: -7px;
-                width: 7px;
-                height: 1px;
-                border-top: 1px solid #dcdee5;
+            >.tree-node-container {
+                &:not(:last-child)::before {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    top: -6px;
+                    left: -8px;
+                    width: 1px;
+                    height: 100%;
+                    border-left: 1px solid #dcdee5;
+                }
+                &.branch-condition-container::after {
+                    content: '';
+                    display: block;
+                    position: absolute;
+                    top: 15.5px;
+                    left: -8px;
+                    width: 8px;
+                    height: 1px;
+                    border-top: 1px solid #dcdee5;
+                }
+                &:last-child {
+                    >.tree-node-item::before {
+                        content: '';
+                        display: block;
+                        position: absolute;
+                        top: -6px;
+                        left: -6px;
+                        width: 1px;
+                        height: calc(100% - 10px);
+                        border-left: 1px solid #dcdee5;
+                    }
+                }
             }
         }
-        &.parallel-gateway-container::before {
-            height: calc(100% - 44px);
+        &.has-converge-gateway {
+            >.node-tree {
+                >.tree-node-container:last-child {
+                    &::before {
+                        content: '';
+                        display: block;
+                        position: absolute;
+                        top: 5px;
+                        left: -8px;
+                        width: 1px;
+                        height: 100%;
+                        border-left: 1px solid #dcdee5;
+                    }
+                    >.tree-node-item::before {
+                        content: '';
+                    }
+                }
+            }
         }
     }
     .subprocess-border-line {
         &::before {
             content: '';
             display: block;
-            height: calc(100% - 20px);
+            height: calc(100% - 23px);
             position: absolute;
             top: 28px;
             left: 25.5px;
@@ -311,6 +343,17 @@
             border-left: 1px dashed #dcdee5;
         }
     }
+    .condition-or-level-up {
+        >.tree-node-item {
+            padding: 2px;
+            margin-left: -2px;
+        }
+        >.node-tree {
+            >.branch-condition-container {
+                margin-left: 15px !important;
+            }
+        }
+    }
     .dynamic-load {
         margin-left: 42px;
         height: 40px;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index e1f93f4300..41493d6cfa 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -34,13 +34,6 @@
             @onTaskParamsClick="onTaskParamsClick"
             @onInjectGlobalVariable="onInjectGlobalVariable">
         </task-operation-header>
-        <bk-alert v-if="isFailedSubproceeNodeInfo" type="error" class="subprocess-failed-tips">
-            <template slot="title">
-                <span>{{ $t('存在子流程节点执行失败，可从节点执行记录去往子任务处理，并及时') }}</span>
-                <bk-link theme="primary" @click="handleRefreshTaskStatus">{{ $t('刷新任务状态') }}</bk-link>
-                {{ $t('。') }}
-            </template>
-        </bk-alert>
         <div class="task-container">
             <div class="pipeline-nodes">
                 <TemplateCanvas
@@ -80,7 +73,7 @@
                 <div class="header">
                     <span>{{sideSliderTitle}}</span>
                     <div class="sub-title" v-if="nodeInfoType === 'modifyParams' && retryNodeId">
-                        {{ nodePipelineData.activities[retryNodeId] && nodePipelineData.activities[retryNodeId].name }}
+                        {{ nodeTreePipelineData.activities[retryNodeId] && nodeTreePipelineData.activities[retryNodeId].name }}
                     </div>
                 </div>
             </div>
@@ -118,6 +111,8 @@
                     @onRetryClick="onRetryClick"
                     @onSkipClick="onSkipClick"
                     @onTaskNodeResumeClick="onTaskNodeResumeClick"
+                    @onPauseClick="onPauseClick"
+                    @onContinueClick="onContinueClick"
                     @onModifyTimeClick="onModifyTimeClick"
                     @onForceFail="onForceFailClick"
                     @onApprovalClick="onApprovalClick"
@@ -375,7 +370,6 @@
                     }
                 },
                 nodePipelineData: {},
-                isFailedSubproceeNodeInfo: null,
                 nodeInfo: {},
                 nodeInputs: {},
                 isExecRecordOpen: false,
@@ -614,9 +608,6 @@
                             this.setRunningNode(instanceStatus.data.children)
                         }
                         this.updateNodeInfo()
-                        this.isFailedSubproceeNodeInfo = this.canvasData.locations.find(item => {
-                            return item.code === 'subprocess_plugin' && item.status === 'FAILED'
-                        })
                     } else {
                         // 查询流程状态接口返回失败后再请求一次
                         this.pollErrorTimes += 1
@@ -748,12 +739,12 @@
                     this.pending.task = false
                 }
             },
-            async taskPause (subflowPause, nodeId) {
+            async taskPause (subflowPause, nodeId, taskId) {
                 let res, state, message
                 try {
                     if (!this.isTopTask || subflowPause) { // 子流程画布暂停或子流程节点暂停
                         const data = {
-                            instance_id: this.instance_id,
+                            instance_id: taskId || this.instance_id,
                             node_id: nodeId || this.taskId
                         }
                         res = await this.subInstancePause(data)
@@ -780,12 +771,12 @@
                     this.pending.task = false
                 }
             },
-            async taskResume (subflowResume, nodeId) {
+            async taskResume (subflowResume, nodeId, taskId) {
                 let res, message
                 try {
                     if (!this.isTopTask || subflowResume) {
                         const data = {
-                            instance_id: this.instance_id,
+                            instance_id: taskId || this.instance_id,
                             node_id: nodeId || this.taskId
                         }
                         res = await this.subInstanceResume(data)
@@ -836,7 +827,6 @@
                 }
 
                 this.pending.skip = true
-                this.isFailedSubproceeNodeInfo = null
                 try {
                     const data = {
                         instance_id: taskId || this.instance_id,
@@ -1196,7 +1186,6 @@
                     this.isNodeInfoPanelShow = false
                     this.retryNodeId = undefined
                     // 重新轮询任务状态
-                    this.isFailedSubproceeNodeInfo = null
                     this.setTaskStatusTimer()
                     this.updateNodeActived(this.nodeDetailConfig.id, false)
                 } catch (error) {
@@ -1319,6 +1308,22 @@
                 this.approval.message = ''
                 this.approval.dialogShow = false
             },
+            onPauseClick (id, taskId) {
+                this.taskPause(true, id, taskId)
+                this.isNodeInfoPanelShow = false
+                this.nodeInfoType = ''
+                setTimeout(() => {
+                    this.setTaskStatusTimer()
+                }, 1000)
+            },
+            onContinueClick (id, taskId) {
+                this.taskResume(true, id, taskId)
+                this.isNodeInfoPanelShow = false
+                this.nodeInfoType = ''
+                setTimeout(() => {
+                    this.setTaskStatusTimer()
+                }, 1000)
+            },
             onCloseConfigPanel () {
                 this.isShowConditionEdit = false
             },
@@ -1399,7 +1404,19 @@
              *
              */
             retrieveLines (flowId, data, nodeInfo, ordered, parentOrdered) {
-                const { id, gatewayId, branchId, nodeLevel = 1, parentId, parentLevel, lastLevelStyle, lastId, taskId } = nodeInfo
+                const {
+                    id,
+                    gatewayId,
+                    branchId,
+                    nodeLevel = 1,
+                    parentId,
+                    parentLevel,
+                    lastLevelStyle,
+                    lastId,
+                    taskId,
+                    isLevelUp,
+                    style
+                } = nodeInfo
                 const { activities, gateways, flows } = data
                 const nodeConfig = activities[id] || gateways[id]
                 if (this.nodeIds[flowId] && this.nodeIds[flowId].includes(id)) {
@@ -1426,8 +1443,11 @@
                                 const branchInfo = gatewayOrdered.children.splice(branchIndex, 1)
                                 gatewayOrdered.children.splice(convergeIndex, 0, branchInfo[0])
                             } else if (existNode) { // 跨层级汇聚
+                                const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
                                 parentOrdered.push({
                                     ...existNode,
+                                    isLevelUp: lastNode.isLevelUp,
+                                    style: lastNode.style,
                                     isDifferLevelConverge: true
                                 })
                             }
@@ -1444,6 +1464,7 @@
                         parentId,
                         expanded: false,
                         nodeLevel: parentLevel ? parentLevel + nodeLevel : nodeLevel,
+                        isLevelUp,
                         taskId
                     }
                     let marginLeft = 0
@@ -1458,7 +1479,7 @@
                             marginLeft = marginLeft + 33
                         }
                     }
-                    treeItem.style = `margin-left: ${marginLeft}px`
+                    treeItem.style = style || `margin-left: ${marginLeft}px`
                     let conditions = []
 
                     if (id in gateways) { // 网关节点
@@ -1584,26 +1605,39 @@
                             const convergeNode = Object.values(this.convergeInfo).find(item => item.convergeNode === id)
                             if (convergeNode) {
                                 result = this.getMatchOrderedNode(ordered, convergeNode.id, true)
+                                const gatewayInfo = this.getMatchOrderedNode(ordered, convergeNode.id, false)
                                 const { gatewayId, nodeLevel } = result[0]
                                 treeItem.nodeLevel = nodeLevel
+                                treeItem.style = gatewayInfo.style
+                                treeItem.isLevelUp = gatewayInfo.isLevelUp
+                                // 添加同级的汇聚网关标识
+                                if (gateways[id]?.type === 'ConvergeGateway') {
+                                    gatewayInfo.hasConvergeGW = true
+                                }
                                 result.push(treeItem)
                                 newOrdered = result
                                 nextNodeInfo.gatewayId = gatewayId
                                 nextNodeInfo.nodeLevel = nodeLevel
+                                nextNodeInfo.isLevelUp = treeItem.isLevelUp
+                                nextNodeInfo.style = treeItem.style
                             } else {
                                 result = this.getMatchOrderedNode(ordered, gatewayId, false)
                                 if (result) {
                                     treeItem.nodeLevel = result.children[0].nodeLevel
+                                    treeItem.style = result.children[0].style
+                                    treeItem.isLevelUp = true
                                     result.children.push(treeItem)
                                     newOrdered = result.children
                                     nextNodeInfo.gatewayId = result.gatewayId
                                     nextNodeInfo.nodeLevel = treeItem.nodeLevel
+                                    nextNodeInfo.isLevelUp = true
+                                    nextNodeInfo.style = treeItem.style
                                 } else {
                                     parentOrdered.push(treeItem)
                                 }
                             }
                             // 汇聚节点层级会提高
-                            if (treeItem.nodeLevel === 1) {
+                            if (treeItem.nodeLevel === 1 && !parentId) {
                                 treeItem.style = 'margin-left: 0px'
                             }
                         } else {
@@ -1616,7 +1650,7 @@
                     
                     if (conditions.length) {
                         conditions.forEach(item => {
-                            item.style = `margin-left: ${marginLeft + 33}px`
+                            item.style = `margin-left: ${item.parentId ? 16 : marginLeft + 33}px`
                             treeItem.children.push(item)
                             this.retrieveLines(
                                 flowId,
@@ -2206,7 +2240,6 @@
                     this.pending.retry = true
                     await this.onRetryTask(data)
                     this.isNodeInfoPanelShow = false
-                    this.isFailedSubproceeNodeInfo = null
                     this.setTaskStatusTimer()
                     this.updateNodeActived(this.nodeDetailConfig.id, false)
                 } catch (error) {
@@ -2316,13 +2349,6 @@
                         && this.pipelineData.activities[key].component.code === 'pause_node'))
                         ? 'SUSPENDED'
                         : ''
-            },
-            // 刷新任务状态
-            handleRefreshTaskStatus () {
-                const nodeId = this.isFailedSubproceeNodeInfo.id
-                this.isFailedSubproceeNodeInfo = null
-                this.setTaskStatusTimer()
-                this.updateNodeActived(nodeId, false)
             }
         }
     }
@@ -2342,20 +2368,6 @@
     font-size: 12px;
 }
 
-.subprocess-failed-tips {
-    margin-top: -1px;
-    color: #63656e;
-    /deep/.bk-alert-title {
-        display: flex;
-    }
-    /deep/.bk-link {
-        vertical-align: initial;
-        line-height: 16px;
-        .bk-link-text {
-            font-size: 12px;
-        }
-    }
-}
 .task-container {
     position: relative;
     width: 100%;
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index 12133e4733..dffff209a9 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1281,12 +1281,8 @@
                     const { activities, conditions, constants } = this.variableCited[key]
                     const citedNum = activities.length + conditions.length + constants.length
                     if (citedNum <= 1) {
-                        // 切换插件/切换版本/更新子流程时直接删除引用量为1变量
-                        if (this.isUpdateConstants) {
-                            this.deleteUnhookingVar()
-                        } else {
-                            this.isCancelGloVarDialogShow = true
-                        }
+                        // 直接删除引用量为1变量
+                        this.deleteUnhookingVar()
                     } else {
                         if (sourceInfo[id].length <= 1) {
                             this.$delete(sourceInfo, id)
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
index 298a7d5865..4d4d3759c5 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateHeader.vue
@@ -331,6 +331,7 @@
                 }
             },
             goBackToTplEdit () {
+                this.$emit('handleGoMangeScheme', false)
                 this.$emit('goBackToTplEdit')
             },
             goTaskCreate (pid) {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index 7262fc4003..436676610c 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -94,7 +94,7 @@
                 </span>
                 <span v-else class="col-operation-item">{{ $t('编辑') }}</span>
             </span>
-            <span class="col-item col-more" v-if="!isViewMode && !isInternalVal">
+            <span class="col-item col-more" v-if="!isViewMode && !isInternalVal && !['component_outputs', 'component_inputs'].includes(variableData.source_type)">
                 <bk-popover placement="bottom" theme="light" :distance="0" :arrow="false" ext-cls="var-operate-popover">
                     <i class="bk-icon icon-more"></i>
                     <template slot="content">
diff --git a/frontend/desktop/src/store/modules/task.js b/frontend/desktop/src/store/modules/task.js
index 679db993f4..6cf2d3fd5a 100644
--- a/frontend/desktop/src/store/modules/task.js
+++ b/frontend/desktop/src/store/modules/task.js
@@ -537,7 +537,7 @@ const task = {
         getInstanceRetryParams ({ commit }, data) {
             return axios.get(`api/v3/taskflow/${data.id}/enable_fill_retry_params/`).then(response => response.data)
         },
-        // 节点执行记录
+        // 节点执行详情
         getNodeExecutionRecord ({ commit }, data) {
             return axios.get(`api/v3/taskflow/${data.taskId}/node_execution_record/`, {
                 params: {

From 868039b897fcd4b8de607b118406bdf1af08e93a Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Fri, 25 Aug 2023 09:32:23 +0800
Subject: [PATCH 046/112] =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=20(#7022)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/assets/fonts/bksops-icon.eot  | Bin 39840 -> 40776 bytes
 .../desktop/src/assets/fonts/bksops-icon.svg  |   6 ++
 .../desktop/src/assets/fonts/bksops-icon.ttf  | Bin 39672 -> 40608 bytes
 .../desktop/src/assets/fonts/bksops-icon.woff | Bin 23252 -> 24000 bytes
 .../common/RenderForm/FormGroup.vue           |   4 +-
 .../components/common/RenderForm/FormItem.vue |   4 +-
 .../common/RenderForm/tags/TagInput.vue       |  19 +++-
 .../common/RenderForm/tags/TagTextarea.vue    |  30 +++++--
 .../TemplateCanvas/NodeTemplate/Subflow.vue   |   9 +-
 frontend/desktop/src/config/i18n/cn.js        |  17 +++-
 frontend/desktop/src/config/i18n/en.js        |  17 +++-
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  20 +++--
 .../pages/task/TaskExecute/NodeTreeItem.vue   |  16 +++-
 .../pages/task/TaskExecute/TaskOperation.vue  |  83 ++++++++++++++----
 .../desktop/src/pages/task/TaskList/index.vue |  10 +--
 .../TemplateEdit/NodeConfig/OutputParams.vue  |  10 +--
 .../TabGlobalVariables/VariableItem.vue       |  31 +++++--
 .../TabGlobalVariables/index.vue              |   4 +-
 frontend/desktop/src/scss/iconfont.scss       |   6 ++
 19 files changed, 217 insertions(+), 69 deletions(-)

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.eot b/frontend/desktop/src/assets/fonts/bksops-icon.eot
index 4c0606fe87551f30e43741d3c61c77146f3a97b1..d8c71d9d0fd5dd7bcc870cccdd60cc1173120e0e 100644
GIT binary patch
delta 1380
zcmXw2Uu;ul6#ve5|M&0O+k0<YOV{?UfA+_=EA1_D-MS6Ox^{CxVGpRo!ZxQ_VPObk
zF_b-EqCUt{)DRQF#Q0#q7#br?qQ)m;1YZpB2=hhFOnkr?iBiuUcu&qf-}n1|=Xbty
zdVAqZdi`t4m(CM%;lnlFVDFt{FRcx}U7sZcUMGZ19jsLs*P@%p2w|@gVtec5g%fj^
ze!TN0A?|MpS^Z~zwmK8P|4|gVchQY`1S}&wa*633^R=VPn{w+i>it9r{bk|s!Rnc9
z3*QssDj{~PR$X3%o8)g?dyyYHRISaP5&iR4Le8Q9J-v8%>FDli<yS)9f0_{C`Nj<B
z(RBhyM!&?KySLw2_>)*!1PHlj|7`RB*tiHjW}W=rxDNY)ZzO0DxaK^)PlwrEtq0r>
ztrjvlbOyZ#9VM7gx0DI}7*VrE4@S!t&eCPv7f1+sfyR5>4!XfLZgK^7gKf1MAoleE
zo)*Y7nIrS$6#0Z)28zalA1#2E*s?S{vJ4Eu9+-w1n1ki!N&YwpSIAZDif^onD~%)K
zJJMY&Xg=4P7HM5nH}Ha{lPehU;--_U&F@@Cfh~SM_^@fnADpby)`M0zJIZ89mh_{X
z0|Y)6$G4*Lf&=17h{ue)p=tw=&*4gcgy9acaDD)^AP7l_@E$c|u%qx|xxC_?hyi_W
z$+<XQdDSB99xJc5Pj&$W5?^R1#>>+brYqwoH0Yzgm3n#Xg+)l0dV5Q0I$NpPE#*=9
z^nUlLD{5sQum>uY<BEH5#Pvp19#~41CM5g9_;}4GO_cc2F{^!{(vdcku`|BaYISip
zm>%*J*-0v775l~?SBo3@?W&?`s^&^Exvbg7b`Ot$!aG5)$8y<t*6h+1q>9Hu1x3@1
zTqGu&-76kdlLsJ|#dFXy*s7*(15Xgzffvwl&38jiHK&o!WpNr9&588`YBG8>qbVq9
z@&t^J)3qRzS9E@Bv~^^f33y91+!!3Pj3TJp^O)+yf@W1ErbmQWikeliAX1BF63$(S
z8w?{slmZu@D)e`{BU6PqeW{<Ld<T9__DpPKcekD`Bxx68luv~nZY7b7rjl|`kh!lW
z>k-W-T1B@bm9{u|Y3Ny5ZFf@up4D8ACqkW~g;J}>=l*xoCVIkd);tIWB8UTHRlIGU
zo>0Ii+E749^h&5O43amM*Og*a=npxQxzuEbVzEaOBXP~<4R;!LZ#0#U+uC*x9dJ0s
zwz{l}Q%{OxOT(PgwTpweB~++%PfkxrLy|whb_qfMk)W(td8;=}AO7V??<<YW4M#26
zT|0^j{ljW^_36oe>%)Pz$sKxD=V=c(q;_9N@=hY|7ZpXc$-d0(J<oVRj`;b&Ml_^_
zZ5Bb)z2V%g4vT9p;t}x-ToFIF?dM2XizuR``y!cJQOVt|Nz?;&o2hpj^(5A%3O2Xj
z6uhBUj^y+jr5Q#rD#Pb1A(z1S0(erzy?fQpoxRlRm^tu`-))iDwA{S0c9Ft*bLH$J
c{=?VdtLAU-HaS^%?a(VDnRNDX%;9JJA8^+XEC2ui

delta 441
zcmXv|IY<Lh5PkErS=T5^)It|8@JgX#B^taMu@o$<gs_^#EwU!4;DIC{D2Skjj}R5a
z!otEr_<}Krbr1^+3rlUS1W(e$NyPtn%=|ZRj_j>Cxf1%x5%6=E)O)qW!(A>pvYiM3
zv<6^u#<61BuFnf-mq2-VHnI|~H%|wFsy!f{vO`v|BipdW-e+d7&4OoC&v1UjY_*-m
z<(GW^n&&+N;yDtXvBsOaOu$>u+Pq^e$LJnkoY%6ydCqb|dxmM30ZAV>Y{a4qi#49y
zJ0LHBk}(;imbNsA&CJ~0Ln2T)@QE^w1-{|iY5b4!oa$U@yvi&E$R&MZn1r&$hw!t*
z&2%w4ncV6+E>46<v09kj$<b5PH4)*zAI<DD<*~a@KDh@(J}<pSe?M`-k0}HZMjWTO
zAnqnXwG5NdUPL$jp@)WOf~IJif@()!B3`A-q_HYDjos2LZz;TtYAnqd>diY(DqMXO
USE2ngL1|Tyiji7BQ0~InzlsWLq5uE@

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.svg b/frontend/desktop/src/assets/fonts/bksops-icon.svg
index 1ba0297788..0b4dc054f8 100644
--- a/frontend/desktop/src/assets/fonts/bksops-icon.svg
+++ b/frontend/desktop/src/assets/fonts/bksops-icon.svg
@@ -584,6 +584,12 @@
       <glyph glyph-name="uniE202" unicode="&#xE202;" d="M896 716H128C110.4 716 96 701.6 96 684V-84C96-101.6 110.4-116 128-116H896C913.6-116 928-101.6 928-84V684C928 701.6 913.6 716 896 716ZM864-52H160V652H864V-52ZM544 376.8L588.8 332 729.6 472.8V389.6H793.6V581.6H601.6V517.6H684.8L544 376.8ZM729.6 517.6L729.6 517.6 729.6 517.6 729.6 517.6ZM480 223.2L435.2 268 294.4 127.2V210.4H230.4V18.4H422.4V82.4H339.2L480 223.2ZM294.4 82.4L294.4 82.4 294.4 82.4 294.4 82.4Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
 
       
+      <glyph glyph-name="uniE204" unicode="&#xE204;" d="M1094.9377 612.7954C1094.9953 514.9382 1023.9288 431.5466 927.3002 416.0883 830.6716 400.63 737.1363 457.6891 706.6656 550.6815 600.8672 527.531 596.0323 427.8188 590.7993 304.2166L590.5149 285.7304C590.5149 118.8987 551.8359-21.7108 395.0153-48.2173 377.4449-145.4423 291.2289-215.0721 192.4837-211.7857 93.7384-208.4994 12.3427-133.2915 1.2755-35.1133-9.7917 63.0648 52.8184 154.5059 148.3541 179.6926 243.8897 204.8794 343.4432 156.1906 382.2171 65.317 490.8596 85.6234 498.7091 185.9044 504.1128 312.8625L504.3972 331.6332C504.1036 413.8324 517.3053 493.4181 570.6333 555.9714L389.896 555.8577C361.4167 461.3676 268.0442 401.9751 170.3912 416.2349 72.7383 430.4946 0.248 514.1072-0.0196 612.7954-0.1078 711.7107 72.4434 795.6868 170.3227 809.9653 268.202 824.2438 361.7199 764.4937 389.896 669.6763L705.1298 669.6763 707.0638 676.2745C738.315 768.569 831.7481 824.7082 927.9107 808.9703 1024.0732 793.2323 1094.7355 710.2371 1094.9377 612.7954ZM981.1727 612.7954C981.1727 659.9171 942.9731 698.1167 895.8514 698.1167 848.7297 698.1167 810.5301 659.9171 810.5301 612.7954 810.5301 565.6738 848.7297 527.4741 895.8514 527.4741 942.9731 527.4741 981.1727 565.6738 981.1727 612.7954Z"  horiz-adv-x="1094" vert-adv-y="1024"  />
+
+      
+      <glyph glyph-name="uniE205" unicode="&#xE205;" d="M3.1577-44.5346L0.4511-37.3318C6.1651 11.4873 9.4731 74.1118 10.3753 150.5416L47.3656 150.5416C48.2678 106.9246 48.8693 83.3154 49.17 79.714 49.7715 69.71 51.5759 59.1059 54.5833 47.9015 81.0479 1.0832 123.0003-23.9265 180.4405-27.1278L180.4405 268.1876C140.4429 274.9902 110.1439 283.6936 89.5436 294.2978 68.9433 304.9019 51.8015 320.1079 38.1181 339.9156 24.4347 359.7233 14.6608 382.1321 8.7965 407.1419 2.9322 432.1516 0 459.2622 0 488.4736 0 540.8941 5.7139 582.7104 17.1419 613.9226 28.5698 645.1348 48.5686 673.5459 77.1383 699.1559 105.7081 724.7659 140.1421 740.5721 180.4405 746.5744L180.4405 812 219.2352 812C219.2352 805.9977 218.9345 798.5948 218.333 789.7913 217.7316 780.9879 217.2805 767.3826 216.9797 748.9754 281.0361 746.1743 333.2135 730.9683 373.5119 703.3576L373.5119 695.5545C370.2038 675.9469 367.9483 657.3396 366.7454 639.7327L361.3322 525.6882 324.793 525.6882C323.8907 546.0961 323.4396 562.5025 323.4396 574.9074 323.4396 588.9129 322.9885 599.517 322.0863 606.7198 321.7856 611.1215 320.5827 616.9238 318.4775 624.1266 309.7562 639.7327 296.975 653.0379 280.1339 664.0422 263.2928 675.0465 242.2414 681.349 216.9797 682.9496L216.9797 417.646C262.6913 408.8425 299.1554 396.3376 326.3718 380.1313 353.5883 363.925 374.2637 340.8159 388.3982 310.8042 402.5327 280.7925 409.6 241.7773 409.6 193.7585 409.6 148.1407 403.8861 108.3251 392.4581 74.3118 381.0302 40.2986 366.595 12.1876 349.1524-10.0211 331.7098-32.2298 312.9891-49.4365 292.9903-61.6413 272.9915-73.846 247.6546-83.1497 216.9797-89.5522L216.9797-141.7726C218.4834-182.9887 219.2352-206.3978 219.2352-212L177.2828-212C178.7865-174.3853 179.8391-134.7698 180.4405-93.1536 144.0517-92.7534 113.6023-89.152 89.0925-82.3494 64.5827-75.5467 35.9377-62.9418 3.1577-44.5346ZM180.4405 679.9484C158.1862 672.7456 142.3977 664.7425 133.0749 655.939 121.0455 644.3345 111.5724 628.7284 104.6555 609.1208 97.7386 589.5131 94.2802 568.3048 94.2802 545.4959 94.2802 514.2837 100.8963 488.5737 114.1286 468.3658 127.3609 448.1579 149.4649 434.4525 180.4405 427.2497L180.4405 679.9484ZM216.9797-22.9261C248.2561-12.5221 271.563 5.8851 286.9004 32.2954 302.2379 58.7057 309.9066 90.7182 309.9066 128.3329 309.9066 151.1419 306.6737 171.3497 300.2079 188.9566 293.7421 206.5635 283.2164 221.1692 268.6308 232.7737 254.0452 244.3783 236.8282 251.9812 216.9797 255.5826L216.9797-22.9261ZM1228.8 812L1251.0609 811.4192C1281.6325 811.4192 1308.3455 806.7725 1331.2 797.4793 1346.3374 791.2838 1358.0614 782.9586 1366.3722 772.5037 1374.6829 762.0488 1381.5096 748.4961 1386.8522 731.8457 1394.5693 707.8382 1398.4278 680.5392 1398.4278 649.949L1398.4278 434.4617C1398.4278 407.7436 1399.7635 387.8987 1402.4348 374.9268 1405.1061 361.955 1409.4099 351.1129 1415.3461 342.4005 1421.2823 333.688 1428.851 326.6213 1438.0522 321.2002 1439.1546 320.6471 1441.2141 319.6672 1444.2307 318.2605L1456.1516 312.7604C1463.5477 309.3703 1473.0971 305.02 1484.8 299.7096 1452.7443 285.7697 1433.4516 276.2829 1426.9217 271.249 1417.4238 263.1174 1410.7455 252.8561 1406.887 240.4651 1401.2475 223.4275 1398.4278 198.2583 1398.4278 164.9575L1398.4278-49.9489C1398.4278-105.7085 1387.52-146.6568 1365.7043-172.7941 1343.8887-198.9314 1305.5258-212 1250.6157-212L1231.9165-212 1231.9165-192.2518C1246.4603-193.0263 1258.9264-190.1221 1269.3148-183.5394 1279.7032-176.9567 1287.8655-168.0507 1293.8017-156.8213 1299.738-145.592 1303.5965-131.2649 1305.3774-113.84 1306.1194-109.9679 1306.5523-98.5664 1306.6759-79.6357L1306.713 146.371C1306.713 170.7657 1308.6423 193.6116 1312.5009 214.9087 1315.469 230.0102 1320.7374 243.1756 1328.3061 254.405 1335.8748 265.6343 1345.5954 275.3148 1357.4678 283.4464 1366.669 289.6419 1380.3223 295.063 1398.4278 299.7096 1376.7606 305.5179 1359.1003 314.1335 1345.447 325.5564 1331.7936 336.9794 1322.4441 350.8225 1317.3983 367.0856 1310.2748 389.1571 1306.713 417.8113 1306.713 453.0482L1306.713 666.793C1306.713 691.1877 1306.2678 706.4829 1305.3774 712.6784 1303.8933 724.295 1301.2962 735.7179 1297.5861 746.9472 1293.8759 758.1766 1288.7559 767.1794 1282.2261 773.9558 1275.6962 780.7321 1268.1275 785.4755 1259.52 788.186 1250.9125 790.8966 1240.6725 792.2518 1228.8 792.2518L1228.8 812ZM697.4197 812C704.9315 812 711.3915 811.8063 716.8 811.4189L716.8 791.6614C703.2789 791.274 691.1099 788.2716 680.293 782.6543 669.4761 777.037 661.138 768.5141 655.2789 757.0858 649.4197 745.6574 644.9878 731.4204 641.9831 714.3747 641.4823 710.5007 641.1902 698.9594 641.1067 679.7507L641.0817 453.4596C641.0817 430.2155 638.9784 407.7461 634.7718 386.0516 632.0676 370.5556 626.9596 357.1902 619.4479 345.9555 611.9362 334.7209 602.7718 325.5201 591.9549 318.3532 581.138 311.1862 566.5653 305.0846 548.2366 300.0484 570.4714 294.2374 588.4995 285.5209 602.3211 273.8988 616.1427 262.2767 625.6075 247.9429 630.7155 230.8972 637.6263 208.4279 641.0817 180.3412 641.0817 146.6373L641.0817-67.2086C641.0817-91.6149 641.3822-106.7235 641.9831-112.5346 643.7859-124.544 646.5653-135.7787 650.3211-146.2385 654.077-156.6984 659.4103-165.7055 666.3211-173.2598 673.2319-180.8142 680.8188-186.1409 689.0817-189.2401 697.3446-192.3394 706.584-193.3079 716.8-192.1457L716.8-211.9032 697.4197-211.9032C667.9737-212.6779 642.584-208.8039 621.2507-200.2811 602.3211-192.1457 588.6498-182.9449 580.2366-172.6787 571.8235-162.4126 565.0629-148.9503 559.9549-132.2921 552.1427-107.8857 548.2366-80.3802 548.2366-49.7755L548.2366 165.2326C548.2366 191.9633 546.8845 211.8176 544.1803 224.7956 541.4761 237.7736 537.1192 248.6208 531.1099 257.3374 525.1005 266.0539 517.2883 273.124 507.6732 278.5476 503.1662 281.2594 487.5418 288.4264 460.8 300.0484 493.8516 314.7697 513.2319 324.4547 518.9408 329.1036 528.2554 336.8516 535.016 346.9241 539.2225 359.3209 545.2319 376.754 548.2366 401.9351 548.2366 434.8643L548.2366 650.4534C548.2366 706.2393 559.2789 747.1102 581.3634 773.0661 603.4479 799.022 642.1333 812 697.4197 812ZM878.7979 607.2C895.0519 592.344 911.0349 572.5007 926.7471 547.6701 942.4593 522.8394 968.5559 472.4352 1005.037 396.4576 1028.515 431.263 1047.2974 460.5505 1061.3841 484.32L1123.691 592.5563C1148.2526 591.2829 1162.8811 590.6462 1167.5767 590.6462L1228.8 592.5563 1228.8 542.8949C1207.8504 541.1971 1194.757 539.1809 1189.5196 536.8464 1184.2822 534.5119 1174.0783 524.325 1158.9079 506.2856 1143.7376 488.2462 1118.4536 454.1836 1083.0561 404.0978L1036.4614 337.8827 1115.0222 178.7117C1139.2226 129.0504 1158.1855 93.3961 1171.9111 71.7488 1178.7739 60.2885 1184.2822 53.4972 1188.436 51.3749 1192.5898 49.2526 1206.0444 46.2815 1228.8 42.4613L1228.8-7.2C1202.0713-6.3511 1165.9513-5.9266 1120.4402-5.9266 1094.4339-5.9266 1073.6649-6.3511 1058.1333-7.2 1049.8258 6.3826 1037.7256 28.8788 1021.8328 60.2885L989.3249 122.6835 947.6064 207.9992C911.8476 151.5465 889.6339 115.8922 880.9651 101.0363 864.7111 73.4466 844.3034 37.3679 819.7418-7.2 800.5982-6.7755 784.8861-6.5633 772.6053-6.5633 761.4081-6.5633 743.3481-6.7755 718.4254-7.2L718.4254 42.4613C744.0705 43.7347 761.0469 47.9793 769.3545 55.195 779.808 64.4831 807.3592 102.3229 852.0079 168.7142L875.7571 204.2892C888.344 223.2664 901.9996 244.028 916.7238 266.5741L846.2899 404.0978 819.2 457.5793C809.4476 474.982 799.8758 489.6257 790.4847 501.5105 784.7055 508.7262 779.1972 513.7136 773.9598 516.4725 768.7224 519.2315 762.6723 520.611 755.8095 520.611 749.6691 520.611 739.5556 519.5498 725.4688 517.4276L716.8 565.1789C774.5919 577.9125 828.5912 591.9196 878.7979 607.2Z"  horiz-adv-x="1484" vert-adv-y="1024"  />
+
+      
 
   </font>
   </defs>
diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.ttf b/frontend/desktop/src/assets/fonts/bksops-icon.ttf
index 545c55fd060a3a22725a839480666a1e32624509..ed11d935cbc610b9610e58427e97ed01b427728f 100644
GIT binary patch
delta 1408
zcmXw3O>7%g5PtLa-@oy$ch@$KV|!z7{;(a_KNWG}CM8W`Cq#iZhXN^1n-EakMonqc
z3gPrnBsf4T7a_y}kPru?B2=qV8;a<;q971zdqQovfD{miBA|jUvuSyw@x1rV%r|dl
z*ZbEc`r()KtkGB?1YRYC%pR=QR?a21juXOOCB*gSi_0e$FMNCZ4MOB=gq;3oX`yz=
zy!TN8WAC6AmJo1^@)%2O?OduKTia5si^%r_A@t|vBL{0|+n28s;u}Zoc)hl^0^g9o
zaUa0==;2y@;j9>1auRYL3Fw)XBdf<|YSmu|dG|>|glErPHHJ3`U@Ynd_Px6Yyrn;g
zlSP1#yYA1n{<qeq<>zlRB|M9S+9)nNZ-e~WjKTrno9j>pu5}IW(Ghl!b)Wm%ve3_=
zGN^s1NXvY>oki%!h}!vmXdT-)OV{vRB2kPBH-BSy(oL?J<Vx%&Ygx@1VPF8zTOxC0
zkt~sQ@(H;J6orKlN*JYUTQcxavak#G!W<leMObUy<W7KanOwnJ^Ud#sQ_btb+tM8@
zXs@fSd2vJ3Ht~YClFMlE;<l12t&r~+u;tHpJ!ripzyDf;TKBD9c8tl992rD94+wnH
z#9vk81rL}hFq4I1LDPqzn8%&*5W^E<vEmTu5fD-k=lxo?z>dN5mCC8WR1)YjtKOB#
z>dOvcW}<SsW4Z?*+;vGmIa!&bFjt*Cslxybo@!Jko?C&;cz^$RhAvd=ZbxNIIdec>
zzpPdF13O=>o>1joqrTT`%Ft?hd`faJPfpfd($qLVHsN$HS35IyGIqvWmes@EVEV`t
zWH+gj)7UpYaNR5vcWA1nYq~GR<a2f#JN!HXD(?lOk<91JoZY1_LRG(q3aV}t^6{i%
zcdz<2T^WLW4*j5Ku~l7b2Y&=QfEQ43&-X%Jv!_wa=WrTm?THNnaxz9DtE)(9#|da3
zrRx!<s2cqCXd4)5C*Unn@KE3|s!#@PM-fxKSkSJjCXKj|OjElm7R1o9orH52%mTwm
zkf6Ysv!%gqIX+u5=?jA#<va0ha%YpHGrdNxl%hRMp|T$H$ZA(AkxnUn5$2wjYQ*)R
z=oDp7I^*#0((u!Y)*({>p4EMx$D-Y$gHoqIDF3_V68$lmwH?uL9C2WrYM{;E7YzqR
z7ZM0v{Sq>afD}j<4YiyQ2BY3oK0V#3I^6NDQB!vXV%-IIAdxPbuD0F7^B%9*)=)HY
z_Hl7yb%gW!_HbZ2qNQr@^xTv*EQP{sj}QqRjVP*<cLrkg!JnSY{_)Ypk%S|+XJ=WZ
zzdPN&0V6f&d@$5Dz0=4UJnaLI)Di4V-R?3&qN<86C78Xn_bERp@em*0OhomV%OQwH
zAeO(`>F_n;ei41(i-)-OpW-n+u8NWojAw5qB)LPEs2|)eo9`C#Nvuy3Tyn@JyrET(
z=8Za~Sw<*SM?R=VeFEPP;7^zL?bEt<_fx0m(EL{+*&(qR1>a9xGWqf0_X79rsQATb
l4V`OJ*l2y<T*1Ho27J*Pd8frG!YhYg8qH>Mk8B=;{{xdX4e$T}

delta 437
zcmXv|JxD@f6g~Izy)qNRXpl!gLQxJDPEle-L(~>DGzs!b&B0e@(GP^SG&E(rAR&kb
zheqKmFsW#iXlQ7NrfO(t?U$C<eMa|ixc58XIhT8MA-+#VzB3mEXam6Xtf8ls9lr-q
zP5^geF14O$)rvzva~{YRl5suOQ*GO3?<2E6$%1RFuEO&<vny#VuRU4T8SlFT#A9k<
zR-f$X)c{W`YZ*gdOVbTLdG@m3H?JG<yi-dy0=s?=Y^4{LmRnpuZ-7|>>c@A_J4eeP
z_A-C2Z*$S6@CO<d7WjlOqy4{I&sIy_y(7$TCxoqX*|{=aO&>+cVQ$h033)~DBE-7N
zbT9)<UgtQhxgiRy+PMICS4~$$ir*pl*r%DF%77VE!@{!6MRjnH_#=b}Vn`s1B1*(*
z669rQjP4rx=np{}rYVZh48`P&x=K>7cT+=^*V|Q*E6$2jPIxjTFPjgt@?!5;P+2DS
M(<C1XQnl~>1rW4m+yDRo

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.woff b/frontend/desktop/src/assets/fonts/bksops-icon.woff
index 0b0cd50eb9fad63aac77cd6cc8df7ccb77e8c9ee..f42a17ea0db6696572d6614a5a46c32e6abe872f 100644
GIT binary patch
delta 4309
zcmY*cXHXMbw@v5>NL8dNB1Hv6dT0?tQ$RpOq=OKObV7@ih#EQ(q=(Q&5a~S-q}R}U
zlM<v!0J(H2`EtMa=FPlwX3d(l&f0tbIzRS!4X~vV$l<TAsR;lA$j7n;!0<0;X2)}Y
z5l}lfTTcK0_znP|rUn2QqvC~#evYni2LOO30st_`002VIONOQ+ouIb%0Dy@ox$+?y
zav}#gLQZ6p>{*cYEi&$0(V)ROx%mW;y&$rV2LLEGi0q_FR}VXK?iCApj^DqC<8$qE
zvkf56l`|y|0q~P?3pfZkb+>hc0sy9k<d6xu7#T<B#Ng=x^8o<N$q|Ys0D#uq&{k(N
zfexq$v`c^hMGzHITjx`@5w^9q0hAmLRJ}j|9)0CJ0Mj|?Jp2-NqkC`nBA_x!JYQKT
z_xauJZ|b#)x2p?~)kQ4g{HA?uv)ZEe^pQ~;@ortZ(gTtS7sy~|i#q7=R=+*|uo1By
zTlaQZb$|0mmNe-*EMp6CNrC|n-%&mfe~|%}H|(>1fhZZO%I`a+RH*j;(NH8u+QHL<
zN<lRvl4#8;r<)hAJ^MdVSBSpsDtg84Vh3@J88GCWdmTuO@F%QHUjujUoRnA?m)3b$
zUp}ZYjM6k@7te(pd=lVllDzJC@H@uJBy!=odNZHWN<zd5=%{1C+gIpsbI8-QU~6H?
zq)oBclnCGaBIP0-S-8wlp4;k%1+S%!V^Ua(aH4R^*W@?%M~qFQe-}@O@^-ZHJ`U!#
zce}dciCWS|<qBwxMc6s%vZKAlWM%MA`Lq~NLq#>e)Su;ED{*e`t<LA$1_^D=#T#v^
zJ2ng_x%(8*s(@mx4!$xMIR0?-6uwZ1t^$R_K!{J5m>~d-H}J!aexyYQi^Lk61XQ&B
z#vq-hRMbe!vQ(E8Y7gF>0;6Wfetx3s@N|JxUEE^aZzEh)k9Mg~p0P;jK7{w%O6;c&
zF^zi*GSsJ;*C!!OE9UAml<E^Y=R1GSx3eWz#;g`ES?$;f9k0(AE4O@5?szl#NAlAj
zQG^RTrW^iV#I)N;c|f{&T{v^#FSvW()t)^a9?Ch>ri0VvGlwJHaD6VgK^|Nh66^_H
z3j%}lNxP$@OPOIXEyCpd@MV#>eUxF3NTR5dv6k9>r7LE8WR)iROInZPpH1N_rx<o*
z5Frwx$E6WGc9oS$Y>LvbCrORNI~Ku$v=CPpm|`;Qxu(wHEzTOt7%X3FVXY3#aCyDa
z_$_Cb8}F+vBkfa)%z<^Amp&&@;SZly%g7w5L+tdWWNMRgDoU7Q-Rzu*y<uIovNE+9
zIThPXvD-FIu3F>-*+^JjQ1g-7UKr^#urPsm{bcO)mFJjhH?Yu$coiVHqPC!-rFA*=
zs$qm@WPi$Fo-2$nD8n%|WMF}Sc&+n9@z{vEXXn&2i1|Za$F2U*W~`kTh!jW;6!NNA
zEq!9~dIO!p-LPf=nc{WWK({kl!anA>pk#ao43irrAI^G%g}ZL_tx7?#F|vtx1v1Ge
z;;A553wP0!`;3THsSyJS6Yf6f=Nt=Ro<3+)j>T89LX(N7Z}lDo+b@}j*CmrwB7P#w
z8{1_dF-3l_&9NwzPQ)LEd8gTlreMkBD4KE_=51;tnt~*gy=Y1&IgK}v@F%z7|9)=u
zTC^<x<!MvD0SeEwTHj`XI_B=%Q$^s9MJq<Dt-J5x{qI-I4hI)k1TC_;h%e$g6!HF&
zdx<%L!L!3ns&=Pg!jtAdzDGKWFV1$*;E&}iMhx8Kc!~zDLu%l?25wezFVaiG-WWL+
z%FQuOI5g(W5+z@x*D+13@j+^4oM+TncFlysj~OS3!T8JfCoPp@w^XZ%AVkC`#)(5a
zi0?&5rJ#Un4N)&*NUV{A0E5(!+A3iJKdOng5oKbHTm%>VkFb-jVT)iFr&2#I^mj=a
z6DS0B*aX#AKeusO2$7NT0Gs;hb_^vqvF}CaoSsiqX5IGVLC>iqt6bkpht_EjWo6cz
zdC>b{#(~qUu(i_%kbRO!9kf7`SVf!}7JuUBk*Jd#%)5FIk3xCZKs~gunR{#Cae=9J
z0HDf)M&Joz)-F$B@MM6vy`yp*6!@uWpKpCGFks04WPw?sd5{J?g`zGs4EU(XA?8%U
zplM9?qUYAi(-*8HS$fv@Prnrni#}&lV~Kws`;V4JQnu*x(SNMXz9Hfx?j&hz`~OUv
zF+Y=3_a@b6U}w^1Jp3FS*V1>7gRP&`Rcj-O$`kf>h(v1fFOOxR^yA}ynfZOaW2D-!
zcRAX4L@_3ep5MN5%Vd6<oP3t+BA6?mb({NLgBSLB&c}>MHwv`MyR0ucP&hUaj%6_P
zgu+d!hrUovduHxHC6S`1UZ?GxQ*;d!8X4I&{x%{Ja_<ddO8GrCbQDWlYG#keM{%VI
z?^RJ|2)A!9)7vt2hu4-jaJl{-Ocg!ccReH5+iX!~S-_PG`dUE)jll5Wlk<g%9Jqq1
z3b1wQt(aVyQ=?f2;cJ8!sCH-msdTMw$5sR5OO`yBRqn04LtYb?YTvoc?dzVI7=tWf
z#9zbnghyg8QJpr~nQAI}#kv^ltY!V*%1!7l#9^87*C6w<*5rH1pM&DcXpH~`$#%a}
zhMtjDsuHHoY@U{kDLRi2m}Qt>`Tq4vCYpN3`l8?IoOlnLIio`Rt#dPYotN^cNu}M0
zr7uH&fSKW~yN{(0W=_6IyA}I0L+YbZyGr18!;fi?;ndcX=f#Pkj{6i2N%Y!0;=dDF
zkcejLxaZe+0?aS2POo3}9$IXmzDbv_BMePOn^=R-N0%ejuA7y)Z0DE8AB7Eb+YhU7
zJ{5W{#C?jS`M#A@54iIiz4YRlU<i*yVOAl1z!Ip;h|7cRqwq;#?(DrK@l`#>#b+&y
z+Oc<2LJXS6T_3mj8!F7?oHu^xFYtO3Hr<23b1{a*!59RJmy)NHi;R5)PsGBKY>l-F
zE4Z!_1N6LUGWA0|_EMYaKf;;-?Jf(u3-qNVq+B#-jOJSVlRg>|4{46W!0K?@B_Sj$
zrJL2F3*$a5|H10gF;z^SRG<K45&Ove(H}l^hzOn70a8hZvgXt|>Mu{w$AwB^CJlt3
z+A9&7&d&if1#7In8j0Lq6JEBS4_vgyyuZH{^eWVA5_s|``Rh=9=NWY>CF&qqcely)
zWpL`kTm2?F)OXJ1f?~_2^wekBxROVj$alQpHP&6ny6W%DFzjrT&o#Y0c+GdS;C!<Q
zs2c2#^5purxrhCM^K9Id%TL)cLB>sptH0!T=8ZX9KrMo(v;Op{!Shq`^0Vf5BM;|X
zw(;)8zT(-f$1|Gd^}}*Xb8<=vm<+u^*XlHD5l4r^*IQ?g$NpIa)I45c)of2`wC%fK
zpI%=1=vRVztY9WI6<bTln`mQiF8z%hF-DM5zD56`gp3U9#7TZUY-1aJFPFB20Hsj!
zS5GtCo}r4KohkC;_<AbQZ#M_+&``I%M*l(8`sCZ+Xl-G3U^9#Zg5?I(SQKs;eA-o@
zpjZXcTcB3GA0FDT=y`f|$6Hqf4G*4Z#512IHkWp`3dAjDhKI5gLJdO=-l^6aanH|E
zJn|Ez<xW^sxY|})zTt??9=rJx;aAe>3$oAq8GZf0GC#9q52?vj@j8RT9LRF7Bh!~Q
z3T(?LSTepe`sfT_lOO5lYsipQ9T}QJV&8tCpRLjoc;^J+6hOc-9VqL4X!xRXzNbHu
z9g@$w#~e$C%d&vuK1*GFt}#xsL{C0|43FHn)9svkt9UXx+?BpF*9^UepfVV@pssQz
zyuWWPclAA|rslKLE;ArTVOc@$9%-~~=LSD$PAXIV+?&wg>Fr|=raD_4NubzxcWETp
zeui3Jz%xOY1>jxoTwFdGBoG)ec7GSxMOk_NIlSypiPPH0H>-y+Hf>u=OUu!9twO-T
zbNUVVUUy}^<jz=9Qqmp7#Y1%W_l`I7rtNy|lpoaMh9z3JT3du1xxI$#uTjgdv=&EE
zs+;R*MAErprmykSntoytPq|$pK@p`nU&o;1GaM{48A(O+Q2s<c{MHva=h|@`)%EC9
z7#rajd73A4Eq0wXoKiN74tYp;98qLbHF6k31=EN#dX<r>nZ}}nAd0^*c!FzN3TN9I
zE8&W`iN39h3j~B}YP|ZUYv{ld{w~?i*RN(T-ZFy?^E+37{X>h>P~Fk4wgzh*Rl*Cn
zz16P({o8y)Uo6uh;|Sbl#FD(Jo^ndBnL^im<JhX(vH&2)(9=8AGrgB0XJUIjiB>Mb
z{8#LWros)i&3Bb=5kY!81IyWq_K<7kkr=LtVcPy5j0D14f~(1Nyacq%jz3!E^F|6)
zy1wiEx!^rrjY?U!EtM9KuAW4hvq_`#iTcfL&#S|aDnBZ%j-OmUgq2}IPP&yjYuGrv
z9kf`LwdhklF*E0K^GAKYLV12S<xR8gL6lPizQ|8L)+6#dB9C#NQ2`bWPQDC${6-G0
zES!$dA`u*iu%Y)y`>9A=%nZ2$ZRlLpiUW8*A*Nn$<GQCNdQ*=S74f*kPD<+{{(Rj_
zdhvE@4v*Kb`i2Jvz7Ba~_}LQ&i^Xm$cqvClsHA=c6uTS6>sQH00R2qM?0w=fSIb-N
zP0Kv*z9#<2!EO>6wnhS&MXDjl3rzsV&c@!x20*A0lfK!tKNkdDa<B!2hU2ytS~f_Z
zE~CqT+SCHQK{rw#<pQkEm}nD1U+~dL0LtNXj0s;}d|)<SKO%8%rIAQL_e}W^K$V2C
z5AY7S{L$tA^`7qhlN=fiq)L64%Futwye16*NbghhRJFZy03r&rQw{p*rEM^!zl(NQ
zjr3{zqasZEfs~pY(sXMvpmmHiA!~nm=d25dso5!NY=${#!Zf9`PV=@AwGYGjrsFeG
z@ydP<oNHD08!MCo%S9Nbqnk{7REhWy;t-IxM~$~%fVa<9jPT!`gW!Z(es#U-V?J;9
z9;PJ{(}C!Xxl5=1lr1d^O<zzRV+4vF1AUNoP8}T`kuJwnDWt;`QuY<H80zDqU$u4?
z|6+UTbvMNeWa24g;w3v(j&{MKwy>c**vND&(i|HrJ3q)b-)mXC>b|pVwX+h!Z^Os@
z56c!jRVyH|I{+gR@R`Z=*Il`av;ugTBOJ93M}%_1BU9i=6L{>@OdAib*Bm#Xgu@5o
zhG>I&w1WCYg8CeT204RzO@apGgYf=AL(Jzr`se)*&ig#h2XCJDTAvSqU01DZ_ZA}#
z_a{p%$2eEoxG*E8iV4z6_Z_z}iXwwuGm1)%ySxq#5B+{~{zbaym~3!1kjZF+^9aFk
z)*4cNlSsSEpx7ER%%G?y5@0gSuy74`e}m>{A&+mK`*>`Fq5N;n{}Bg+g*OlLLdG9#
zC;RC%=KmaZcdn~8pS`<%XIFb69w!Lb`UmwT<>0f`sLtCb4>pDVbq^9kCWro-g0~zm
zin9)@{+~dE<Xdl={7w2_dIl}1H99LjvfR$BIh)uqZZz4pstKGp5<U{%k*=6(oa)%=
zuv$6mQsO3+?FFy!#h%F?aUZ{NP}&)(?;hXz?_C)8FF|;0*BzOkm0V0Vn(w+Fnki*i
zIW|{K&1~Ts_x*Q?{+Ik2&kDvieH1}W{s%jATL+34#ADayy2ZKOZRQ_0gTN>5e|}1y
gJwteAwW@@r1-1te#W1a=iepX(U|9KbH2LHF2kgUgs{jB1

delta 3541
zcmXX|c|6qZ+x<$BWl~7iEM?!<k+GDqJd`baV>bq&Fm{?L%OIpIV;eMNi^|eiLlVj$
z*>}R&jU=SOyz@N2_r5>pbFOplb6xkp*T)vR5ds}&sF{HQKnKvyy%B)rU(WsWf>Q_W
z?C$644*+zJ0pRQo0I(v?rb=A$^bJP<00Yf8nFjz=Hb3txEiVsOH~?6g(>fJtP!s<m
zkmyA-X<jT%3(;_$S)ZZV%P%O5=DninrvPwf;Rlu4<onQ_ma|r%{S){v%mih5{anLn
z^VMwr4PK=|h^`Mfc;M>i0RT3iX(3x$bKLXuUM&6(kwE}p$4}D@0KjO-$^3UO{XCrp
z9U>h{CyrKB+&mt4O>nJu4Ws8ooc&4%^m;KLgyFizynkl8bNB4-9I*()jE@W}i>#(B
z@75QIys=`Jy*qWq2wVI9ovuDs;>ACrxx1w~2&LKs5lFuS{?<F?blLHp;{x#9uTMAj
z)^Swj!_mFSx0IQ0NP6)z;;&XJj8TsY?xKp_{H~&9GgAvcR*;sgrNox!^D7FMq;f8g
z7Ke-^BEHK;^z>y5Al*Hxo~qW!sdcSPutVHDx1MS3I&G!K1gJmz{4QSVncz37yG=%s
zftA6m*VWl#v$281aQhYwpYbf81};LRyEA`6LgAtpzx4QNi>)Lw6v180(+Ty3!z9@<
zrHs*pJ;$6KF;XaTarX5HVWeH9N~Kn%*#Y)Kt2`}VBQd?AR}yDH*!sGT>&U@%O<Jw;
z-}jeOt<d)yAd*LZM9ICB+pmRzy#Bc+_e#;EF(Jv@SXu6CTm4JXtf8l4@A0zRUS^CM
zfjs$2>!hF`%*{h7(oIh*n=n4>rfhGQA|lX3NpmwFQ-1#t`#Y3+%IYE%)0hL}?z@Ny
z^l{qsV_gj)yPUnolWB|cbfP#Wd+>)U7ckv{v!~~L8i_I^9tI)&*_4~I>}Ps>uP$_K
zjq<PjQb_$Nk*b(_B;z8SWY@=ztxYCXxrnB&ez(@_NZ0JTKUR$`3&#X&5|NtUSgO#g
z`c7`pgA<e!g5%v!sl4zM*$)GJz9f_SnwaemU8Zv@0wEs5W`D<#Cxy->)SVG(l=ZNV
z^}PIP1h`)c{#j!AUAlyqsNt>38_f4e7GIndExybv(^!qh>NJJ~yq2`UA)2N2REdO}
zoPpLC;~WI_gl(BEzNkVu1JV05ZKwx=7OKjQb6MQ%xzF>r%5SZ1C=kRR%qmdnvu3A7
zylgzu;83YY4|V6`<(>XAIKcu+@$>ca<$$`&E2$i~LEZCce&6843Z}bWL8ZO~Uz2rj
z4xC_93JH0yW;Nbz?g)bhZ?ldPz*gfO=8lHY;4GfkoAC0tb!dDu5i}aCXcZcVZ+?r}
zXr}oO%HPK0n>SfU9UqpzEhFVWU-JkzyB-0X6G+s?9vUr*5g}sV#|Ljvcr-lG&{cky
zH5@%CANd@Qobz47HQ3EPN$kKLy16CbWuPFBrcraOE2ee^Awl$q+CKnikS;*&4Y+%i
zhRm@R7<6s2S_a7!YTwP>8<>TcaR+(ucuEjwF}2Cy43B8M3<t;~2QEQ`L+wjxJ+xWg
znA$tECk$TZkY)^<V<$1SeTo?#Z}BpFtR6WJC5UIB_FVUlC?e1%F4z%;9m<o%+uPV@
z-c7<Ny{(SIuuGd9ZrXVqIf&ZuHKU)YV!z#U%O_c8**!cu7IjhydLz%%JO;v=dAb#o
zkhx)#zY<M+YokIq@<98DB>bGO>PQ}#R_4)4@JOBjCZcZG{9y>+M*mf4>!eRPc!y`B
zUz<2fzxyOpIm)ZtQ_!9)n~*9S%JW$qO93rfLLbdOEPux+6MF5lCl*a%UqliGn0Mpw
zb7=1-AK|vznf8m$Ffu&hq0FJm=LXEm1_X)>9vpOt!#8Qbz23Gp%&=Y3;m&Ok1ocn5
z5@*?W(@AZKe<lZ`PTiWaM4oZyP8VY-(u=mle6E1LK^zs~HGl@ItfIMdS9L)BRA+39
z%3>o41#(PV9!Oz>iW0T><E4@v(e#R41Ce#{48lg}du~(epQ@?$A+r~Cs-O7Ev~;tG
zG01$}WV|3Id^_)XsVPj9%UXhe#?ZWo0c>t<tsf@?FW0*quo)x8oO#z8Z&C6-+PETP
zsytpQGr9=ZE1Oj?CFRFvBna8i{7|o`7syt?lj_+`-5NOF`$MHt+!=<776=+~3`wt6
z!(_tHs#<Kka;U*`@g_rs1XZT%2AkIhHpDW<s}l>4^x8s{V0>|!M?!Ug%14sh3+`aC
zgX{j9k9&p&?@F+8F~>8Vvt>TV+H&^{*F8iv;H~>rCk`f`#nc?l8T0a&a<x*5S}A_Q
zrg`Ch5>Ldrl#)>S<vNTBa}IwlcKp4{K3rD~&32`>c{f5eP;cec%MZgVdy}{>h)c5$
zUi}PHZ76ry;b98>OsCO0L#))eWlcD4=l<7A;4dFZefq05{JuGf;~<`@s`r_j*7f4N
zqBbf4JHzq<Z{ov4pjw@6{MXhY58B(m?HH2X=rlXc#a1d=qA+!ClHWqAX0lHWYtG$P
zK=W<}M&P<6Kq?L2Qg?O=sO#j(QSIz#Ya8**dVA41cF9|pw-(O8qz^YX$Zx9sLxOmj
zSU8rD2d<kFFF3qo)8a#Z#^Wq<V_6QGb`#IhnWSDd7Rk^KfcM>>NNUyZW*wC;G2qF_
zGhDOCk@Qa2cYHoQ*z)*n6>Q=5vAA8CGrBInDV*a(qz79#sI1F{4kT|QE0z%NLsJfI
z?L1EQ(^S8}!{k^$+oi*o4W-P-m$sG8##&F}zdhem>-_;~q;LIotQ~)<8zTdL86V)A
z*cp7nYdufC*?KX`)cKTUel`2znlyVV>zWRm0%}U`j#9GbC_M1V)b+@UC$Q{DD|8Z{
z&>zHW8v_%8OFD>&iY3D1&PS!27LWD{=4Z8o&zDE^gJa5Ew^;&GYwc{sXL&Elcr8PW
zF3yQZax=+prY(|Z8mR6@e?KyrRjggI?Cu!iPWzmqUvpIxthb9{-0128S?J<)O5y~+
zLw{v7sbnOdZ8Byx7Tsm<2XSl^T}L+%YRa!*y8CQCVc8b;pVj4uX<d8_cX6vXntUpB
zc}t5iGF}ZTeEhNu%^}~x>7*OlZxhwxUKEp|1sL6BO547Ym-%L}<H7MwYeIj)S=U|H
zDD@YA6kaI6Zw-4DOzm+7uy*#F&?zxQ?J}tRy5tnIJeo4C&WK#NE>52GsjNd6I>&!U
z-%<*yC!Vm3j<s-=|9oWQ!-mYyx#Nkbl}=yJts>;L2b&<0?~m?8!;Z#pzHtbTvrt6(
zl+I)pT@bX?yo1wQgGa{^4i+hQNh5qr#Y#*mt7v;W-TB<2QsGjj&Sy?my1YO7Vt+aC
zsib!~*-VJp{Rpi*mP)3`v09?HlvYGU?heHY4_}$>dRKpNQ2#0Npxky8P#NVTELB*p
zcFcnL9}`j5`%9rx=-3j=RcA0n%jRo|gy}r$BtDRLK=+RqcT?-jxPQ*QgMA3o@c+<$
zPUv?sbLOON*~jrUO9w<=&yQd0^4MVve=YlAQCwf;0-4Jho}tLODfAmn|0Mw9sdaN`
z`lCWb5Qr4tBJX`<1$J844Y|YGeB3_yNK*d*aIRaU4pwiYrPn5n=m++6sFVPe1?L-=
zbOJ=~lu`k?sTL3rhI4m;ySM<0&Si2VJ$utp9t#Lp;0fbAlH~H6YDm?ec%U#1H1V_E
z5wZYc*FnX!O)?CZ?qti&Z~>?eJ<psTWgEk2Ne_JKQu3|4U>8Iu^l#w5p%WcHpFT;V
zJDdGDo2BoRZABRXlmpLn)|J{L=+N93SzQL0vpW<VN3CbCl@?scRu)>R;#LsJzLrp)
zjU2eave>@&gG^cZfFqD!x3nV>21o<t!lPm;bqju>rCPeB27;W73GeeXJ8*k=;7Z3b
znRPNzNU#1pMm-y<p3$j}yQZF2te&ecgJA0Mm+1-66!#YqugUPh^-1D-(ca0D=k<))
zbDrihmDS;t)zj<L^N?QILqp${tD})OQumr3vos|nHO1a;N+vc%OWS{yvO!+<Y0UL$
z#BMeg@HM{3qb*{MnbVE=kj8YvOxNs8XKU4xHhGoq>ay@vgjQ<xlN8Nfcg+C~&99c4
z{mTE_r+nR%<!j@zCeXda51%T1msFirL37Kpv@L3mq&2rnuf2Rtdxb-rq^!Nl(zYz!
zw!+s&g0!tNqL#%`D_2k?Flv?UbXoos0fGF9&p(E^EzRt2jvaJ0`ZIV2VF#A`272uw
zWdn(I0rdj|laTlv`{ew;aVR`&?egEa2Q=dR8+Y;vRqY|T#YpL(M4MI%{*E>sWSYDD
zJ392-4s-J@@P@%`IbU$`gOQYGi~osM<qgA=a>4!EEhV!<54;=R!=_}nu_4BguaLCR
z>pTC<z4&l#U9|O8*6%c@q1zGvxhJm*_v_Nh4p-35>$ZP0Q6>LRmXj6RBW;zBY+F3H
zQH01*vUQ8?wiBT>u{Du$XKSCVS_7#W|I@bnteff+H6LcUgi2}cZq1#17O6s3BtZVV
z;C;u<c^Ku*$r#F~eV;tm0&5*JEgPTQ*$O_;*dZU!LMZv|hGoO+K^pm{DmwzLlmm@c
xQyq%d^v?F-K_n$+hjE^*jV}t^*ETFT<LRI3x-zG56~f}lopMV56Fp4;{ts+N&-efU

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index d1042da71b..c384bd4016 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -102,7 +102,7 @@
         <!-- 变量勾选checkbox -->
         <div class="rf-tag-hook" v-if="showHook" :class="{ 'hide-render-icon': !isShowRenderIcon }">
             <i
-                :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                 v-bk-tooltips="{
                     content: hook ? $t('取消变量引用') : $t('设置为变量'),
                     placement: 'bottom',
@@ -464,7 +464,7 @@
             }
         }
         .hook-icon {
-            font-size: 19px;
+            font-size: 16px;
         }
         .icon-angle-up-fill {
             font-size: 12px;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 0962868297..dff64bede9 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -129,7 +129,7 @@
             <!-- 变量勾选checkbox -->
             <div class="rf-tag-hook" v-if="showHook" :class="{ 'hide-render-icon': !isShowRenderIcon }">
                 <i
-                    :class="['common-icon-variable-cite hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
+                    :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                     v-bk-tooltips="{
                         content: hook ? $t('取消变量引用') : $t('设置为变量'),
                         placement: 'bottom',
@@ -669,7 +669,7 @@
             }
         }
         .hook-icon {
-            font-size: 19px;
+            font-size: 16px;
         }
         .render-skip-icon {
             margin-left: 7px;
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index a384cf878d..0a48d1a0dc 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -162,6 +162,17 @@
                     const selectDom = this.$el.querySelector('.rf-select-content')
                     selectDom.scrollTo({ top: 0 })
                 }
+            },
+            value (val) {
+                this.input.value = val
+                if (!this.input.focus) {
+                    this.$nextTick(() => {
+                        const divInputDom = this.$el.querySelector('.div-input')
+                        if (divInputDom) {
+                            divInputDom.innerHTML = this.value
+                        }
+                    })
+                }
             }
         },
         created () {
@@ -231,6 +242,7 @@
             },
             // 文本框点击
             handleInputMouseUp (e) {
+                if (this.isDisabled) return
                 // 判断是否点到变量节点上
                 let isVarTagDom = false
                 const varTagDoms = this.$el.querySelectorAll('.var-tag')
@@ -270,11 +282,7 @@
             // 文本框获取焦点
             handleInputFocus (e) {
                 this.input.focus = true
-                const input = this.$refs.input
-                // 设置光标到最后
                 const selection = window.getSelection()
-                selection.selectAllChildren(input)
-                selection.collapseToEnd()
                 if (!this.input.value) return
                 setTimeout(() => {
                     let focusSelection = null
@@ -481,6 +489,9 @@
             .div-input {
                 height: 32px;
             }
+            /deep/.var-tag {
+                cursor: not-allowed;
+            }
         }
     }
     .div-input {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 25b96d4425..838f55b0bc 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">
+        <div class="rf-form-wrapper" v-if="formMode">
             <div class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled }">
                 <div
                     ref="input"
@@ -47,6 +47,7 @@
                 </div>
             </transition>
         </div>
+        <span v-else class="rf-view-value">{{ viewValue }}</span>
         <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
     </div>
 </template>
@@ -117,15 +118,11 @@
                     this.varList = val
                 }
             },
-            textareaValue: {
-                get () {
-                    if (!this.formMode && ['', undefined].includes(this.value)) {
-                        return '--'
-                    }
+            viewValue () {
+                if (this.value === '' || this.value === undefined) {
+                    return '--'
+                } else {
                     return this.value
-                },
-                set (val) {
-                    this.updateForm(val)
                 }
             },
             isDisabled () {
@@ -139,6 +136,17 @@
                     const selectDom = this.$el.querySelector('.rf-select-content')
                     selectDom.scrollTo({ top: 0 })
                 }
+            },
+            value (val) {
+                this.input.value = val
+                if (!this.input.focus) {
+                    this.$nextTick(() => {
+                        const divInputDom = this.$el.querySelector('.div-input')
+                        if (divInputDom) {
+                            divInputDom.innerText = this.value
+                        }
+                    })
+                }
             }
         },
         created () {
@@ -203,6 +211,7 @@
             },
             // 文本框点击
             handleInputMouseUp (e) {
+                if (this.isDisabled) return
                 // 判断是否点到变量节点上
                 let isVarTagDom = false
                 const varTagDoms = this.$el.querySelectorAll('.var-tag')
@@ -453,6 +462,9 @@
             cursor: not-allowed;
             background-color: #fafbfd;
             border-color: #dcdee5;
+            /deep/.var-tag {
+                cursor: not-allowed;
+            }
         }
     }
     .div-input {
diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
index f51555150e..117b380855 100755
--- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
+++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue
@@ -43,16 +43,16 @@
         <!-- 节点右上角执行相关的icon区域 -->
         <node-right-icon-status :node="node"></node-right-icon-status>
         <!-- tooltip提示（任务终止时禁止节点操作） -->
-        <div class="state-icon">
+        <div class="state-icon" :class="{ 'subprocess-operate': isSubProcessNode }">
             <template v-if="node.task_state !== 'REVOKED'">
                 <template v-if="node.status === 'FAILED' && node.type === 'tasknode'">
                     <span v-if="isShowRetryBtn" @click.stop="$emit('onRetryClick', node.id)">
                         <i class="common-icon-retry"></i>
-                        {{ $t('重试') }}
+                        {{ $t('重试子流程') }}
                     </span>
                     <span v-if="isShowSkipBtn" @click.stop="$emit('onSkipClick', node.id)">
                         <i class="common-icon-skip"></i>
-                        {{ $t('跳过') }}
+                        {{ $t('跳过子流程') }}
                     </span>
                 </template>
                 <template v-if="!isSubProcessNode && node.status === 'RUNNING'">
@@ -174,4 +174,7 @@
             height: 200%;
         }
     }
+    .subprocess-operate {
+        right: -18px !important;
+    }
 </style>
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 594d451288..8927296d98 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1589,12 +1589,10 @@ const cn = {
     '确认删除该标签?': '确认删除该标签?',
     '关联的流程将同时移除本标签': '关联的流程将同时移除本标签',
     '分组': '分组',
-    '确定跳过当前节点?': '确定跳过当前节点？',
-    '跳过节点将忽略当前失败节点继续往后执行': '跳过节点将忽略当前失败节点继续往后执行',
     '确定终止当前任务?': '确定终止当前任务',
     '终止任务将停止执行任务，但执行中节点将运行完成': '终止任务将停止执行任务，但执行中节点将运行完成',
     '确定继续往后执行?': '确定继续往后执行?',
-    '若该变量被节点引用，请及时检查并更新节点配置': '若该变量被节点引用，请及时检查并更新节点配置',
+    '删除变量将导致所有变量引用失效，请及时检查并更新节点配置': '删除变量将导致所有变量引用失效，请及时检查并更新节点配置',
     '此流程无执行方案，无需选择': '此流程无执行方案，无需选择',
     '最近 x 次成功执行耗时': '最近 {num} 次成功执行耗时',
     '已运行': '已运行',
@@ -1757,7 +1755,18 @@ const cn = {
     '间隔': '间隔',
     'error_handle_秒': '秒',
     '仅支持查询最近x天任务记录': '仅支持查询最近{x}天任务记录',
-    '失效': '失效'
+    '失效': '失效',
+    '该类型仅支持从节点配置生成变量': '该类型仅支持从节点配置生成变量',
+    '该类型仅支持从节点配置取消引用': '该类型仅支持从节点配置取消引用',
+    '重试子流程': '重试子流程',
+    '跳过子流程': '跳过子流程',
+    '确定跳过子流程【n】 ？': '确定跳过子流程【{n}】 ？',
+    '跳过子流程将忽略子流程中所有未完成节点': '跳过子流程将忽略子流程中所有未完成节点',
+    '确定跳过节点【n】 ？': '确定跳过节点【{n}】 ？',
+    '跳过节点将忽略失败继续往后执行': '跳过节点将忽略失败继续往后执行',
+    '确定重试子流程【n】 ？': '确定重试子流程【{n}】 ？',
+    '确定重试节点【n】 ？': '确定重试节点【{n}】 ？',
+    '子任务中重试无法修改参数，如需修改请在根任务中操作': '子任务中重试无法修改参数，如需修改请在根任务中操作'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index b27594ca85..5589bcd3d5 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1621,12 +1621,10 @@ const en = {
     '确认删除该标签?': 'Delete this tag?',
     '关联的流程将同时移除本标签': 'All flow using this tag will remove it  at the same time',
     '分组': 'group',
-    '确定跳过当前节点?': 'Skip this node?',
-    '跳过节点将忽略当前失败节点继续往后执行': 'Skip node will ignore the current failed node and continue to execute',
     '确定终止当前任务?': 'Terminate this task?',
     '终止任务将停止执行任务，但执行中节点将运行完成': 'Terminating a task will stop executing tasks, but executing nodes will run to completion',
     '确定继续往后执行?': 'Want to continue?',
-    '若该变量被节点引用，请及时检查并更新节点配置': 'If the variable is used by the node, please check and update the node setting',
+    '删除变量将导致所有变量引用失效，请及时检查并更新节点配置': 'Deleting a variable will cause all variable references to become invalid. Please check and update node setttings.',
     '此流程无执行方案，无需选择': 'No node-group',
     '最近 x 次成功执行耗时': 'Time Cost for the last {num} successful records',
     '暂无成功执行历史': 'No Records',
@@ -1791,7 +1789,18 @@ const en = {
     '间隔': 'with ',
     'error_handle_秒': 'Sec Interval',
     '仅支持查询最近x天任务记录': 'You can only query the tasks for the last {x} days.',
-    '失效': 'Invalid'
+    '失效': 'Invalid',
+    '该类型仅支持从节点配置生成变量': 'The type only supports "Set as A Variable" from node settings.',
+    '该类型仅支持从节点配置取消引用': 'The type only supports "Unlink Variable "  from  node settings.',
+    '重试子流程': 'Retry Subflow',
+    '跳过子流程': 'Skip  Subflow',
+    '确定跳过子流程【n】 ？': 'Skip this subflow [ {n} ] ?',
+    '跳过子流程将忽略子流程中所有未完成节点': 'Skipping a subflow will ignore all unfinished nodes within the subflow.',
+    '确定跳过节点【n】 ？': 'Skip this node [ {n} ] ?',
+    '跳过节点将忽略失败继续往后执行': 'Skipping  node will ignore the failure and continue executing the next step.',
+    '确定重试子流程【n】 ？': 'Retry this subflow [ {n} ] ？',
+    '确定重试节点【n】 ？': 'Retry this node [ {n} ] ？',
+    '子任务中重试无法修改参数，如需修改请在根任务中操作': 'Retrying in a sub-task does not allow modifying parameters. If modification is needed, please operate in the root task.'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 3fd82869e2..7bcca77fdf 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -200,14 +200,14 @@
                             v-if="isShowRetryBtn"
                             data-test-id="taskExecute_form_retryBtn"
                             @click="onRetryClick">
-                            {{ $t('重试') }}
+                            {{ isSubProcessNode ? $t('重试子流程') : $t('重试') }}
                         </bk-button>
                         <bk-button
                             theme="default"
                             v-if="isShowSkipBtn"
                             data-test-id="taskExecute_form_skipBtn"
                             @click="onSkipClick">
-                            {{ $t('跳过') }}
+                            {{ isSubProcessNode ? $t('跳过子流程') : $t('跳过') }}
                         </bk-button>
                     </template>
                     <bk-button
@@ -1035,7 +1035,7 @@
                         nodeStatus = nodeStatus.data.children
                     }
                     this.updateNodeInfo(nodeStatus)
-                    if (node.parentId) { // 只有子流程下的节点在画布上才能找到
+                    if (node.parentId && !node.isSubProcess) { // 只有子流程下的节点在画布上才能找到
                         this.moveNodeToView(node.id)
                     }
                 })
@@ -1391,10 +1391,20 @@
                 }
             },
             onRetryClick () {
-                this.$emit('onRetryClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+                const info = {
+                    name: this.executeInfo.name,
+                    taskId: this.subProcessTaskId,
+                    isSubProcessNode: this.isSubProcessNode
+                }
+                this.$emit('onRetryClick', this.nodeDetailConfig.node_id, info)
             },
             onSkipClick () {
-                this.$emit('onSkipClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+                const info = {
+                    name: this.executeInfo.name,
+                    taskId: this.subProcessTaskId,
+                    isSubProcessNode: this.isSubProcessNode
+                }
+                this.$emit('onSkipClick', this.nodeDetailConfig.node_id, info)
             },
             onResumeClick () {
                 this.$emit('onTaskNodeResumeClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
index 93542cbd28..73334925dd 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -30,7 +30,7 @@
                     </span>
                     <!--子流程展开/收起-->
                     <span
-                        v-if="node.isSubProcess"
+                        v-if="node.isSubProcess && node.children.length"
                         class="common-icon-next-triangle-shape gateway-triangle"
                         @click.stop="toggleExpanded(node)">
                     </span>
@@ -44,9 +44,14 @@
                     </span>
                     <!--空的占位符-->
                     <span v-else-if="node.isCallback || node.isLevelUp ? false : !node.parentId" class="empty-div"></span>
+                    <!--汇合图标-->
+                    <span
+                        v-if="node.isDifferLevelConverge"
+                        :class="['common-icon-converge-node', nodeStateMap[node.state]]">
+                    </span>
                     <!--网关图标-->
                     <span
-                        v-if="nodeType[node.type]"
+                        v-else-if="nodeType[node.type]"
                         :class="[
                             nodeType[node.type],
                             nodeStateMap[node.state]
@@ -204,9 +209,11 @@
                     }
 
                 }
+                .common-icon-converge-node,
                 .subprocess-icon,
                 .gateway-icon {
                     margin-top: 2px;
+                    color: #c4c6cc;
                     &.finished {
                         color: #2dcb56;
                     }
@@ -223,6 +230,9 @@
                         color: #da635f;
                     }
                 }
+                .common-icon-converge-node {
+                    font-size: 12px;
+                }
                 .default-node {
                     display: inline-block;
                     width: 8px;
@@ -332,7 +342,7 @@
         }
     }
     .subprocess-border-line {
-        &::before {
+        &::after {
             content: '';
             display: block;
             height: calc(100% - 23px);
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 41493d6cfa..79161f4c2a 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -73,7 +73,7 @@
                 <div class="header">
                     <span>{{sideSliderTitle}}</span>
                     <div class="sub-title" v-if="nodeInfoType === 'modifyParams' && retryNodeId">
-                        {{ nodeTreePipelineData.activities[retryNodeId] && nodeTreePipelineData.activities[retryNodeId].name }}
+                        {{ retryNodeName }}
                     </div>
                 </div>
             </div>
@@ -85,7 +85,7 @@
                     :params-can-be-modify="paramsCanBeModify"
                     :instance-actions="instanceActions"
                     :instance-name="instanceName"
-                    :instance_id="subProcessTaskId || instance_id"
+                    :instance_id="instance_id"
                     :retry-node-id="retryNodeId"
                     :is-sub-canvas="nodeNav.length > 1"
                     @nodeTaskRetry="nodeTaskRetry"
@@ -386,7 +386,8 @@
                 nodeData: [],
                 convergeInfo: {},
                 nodeSourceMaps: {},
-                nodeTargetMaps: {}
+                nodeTargetMaps: {},
+                retryNodeName: ''
             }
         },
         computed: {
@@ -1006,20 +1007,33 @@
                     componentData
                 }
             },
-            async onRetryClick (id, taskId) {
+            async onRetryClick (id, info) {
                 try {
-                    this.subProcessTaskId = taskId
-                    if (this.isChildTaskFlow || taskId) {
+                    // 独立子任务重试使用二次确认弹框
+                    if (this.isChildTaskFlow) {
+                        const nodeConfig = this.nodeTreePipelineData.activities[id]
+                        const isSubProcessNode = nodeConfig.component.code === 'subprocess_plugin'
+                        const title = isSubProcessNode
+                            ? this.$t('确定重试子流程【n】 ？', { n: nodeConfig.name })
+                            : this.$t('确定重试节点【n】 ？', { n: nodeConfig.name })
+                        const subTitle = this.$t('子任务中重试无法修改参数，如需修改请在根任务中操作')
                         const h = this.$createElement
                         this.$bkInfo({
                             subHeader: h('div', { class: 'custom-header' }, [
                                 h('div', {
-                                    class: 'custom-header-title mb20',
+                                    class: 'custom-header-title',
+                                    directives: [{
+                                        name: 'bk-overflow-tips'
+                                    }]
+                                }, [title]),
+                                isSubProcessNode ? h('div', {
+                                    class: 'custom-header-sub-title bk-dialog-header-inner',
                                     directives: [{
                                         name: 'bk-overflow-tips'
                                     }]
-                                }, [i18n.t('确定重试当前节点？')])
+                                }, [subTitle]) : ''
                             ]),
+                            width: 450,
                             extCls: 'dialog-custom-header-title',
                             maskClose: false,
                             confirmLoading: true,
@@ -1031,6 +1045,8 @@
                         })
                         return
                     }
+                    const { taskId } = info || {}
+                    this.subProcessTaskId = taskId
                     const resp = await this.getInstanceRetryParams({ id: taskId || this.instance_id })
                     if (resp.data.enable) {
                         this.openNodeInfoPanel('retryNode', i18n.t('重试节点'))
@@ -1042,7 +1058,20 @@
                             await this.loadNodeInfo(id)
                         }
                     } else {
-                        this.openNodeInfoPanel('modifyParams', i18n.t('重试节点'))
+                        // 子流程任务节点，不需要重新获取节点配置
+                        if (!taskId) {
+                            this.setNodeDetailConfig(id)
+                        }
+                        let isSubProcessNode = false
+                        if (info) {
+                            isSubProcessNode = info.isSubProcessNode
+                            this.retryNodeName = info.name
+                        } else {
+                            const nodeConfig = this.nodeTreePipelineData.activities[id]
+                            isSubProcessNode = nodeConfig?.component.code === 'subprocess_plugin'
+                            this.retryNodeName = nodeConfig.name
+                        }
+                        this.openNodeInfoPanel('modifyParams', isSubProcessNode ? i18n.t('重试子流程') : i18n.t('重试节点'))
                         this.retryNodeId = id
                     }
                 } catch (error) {
@@ -1119,8 +1148,29 @@
                     console.warn(e)
                 }
             },
-            onSkipClick (id, taskId) {
+            onSkipClick (id, info) {
                 const h = this.$createElement
+                let name = ''
+                let taskId = this.instance_id
+                let title = ''
+                let subTitle = ''
+                let isSubProcessNode = false
+                if (info) {
+                    name = info.name
+                    taskId = info.taskId
+                    isSubProcessNode = info.isSubProcessNode
+                } else {
+                    const nodeConfig = this.nodeTreePipelineData.activities[id]
+                    name = nodeConfig.name
+                    isSubProcessNode = nodeConfig.component.code === 'subprocess_plugin'
+                }
+                if (isSubProcessNode) {
+                    title = this.$t('确定跳过子流程【n】 ？', { n: name })
+                    subTitle = this.$t('跳过子流程将忽略子流程中所有未完成节点')
+                } else {
+                    title = this.$t('确定跳过节点【n】 ？', { n: name })
+                    subTitle = this.$t('跳过节点将忽略失败继续往后执行')
+                }
                 this.$bkInfo({
                     subHeader: h('div', { class: 'custom-header' }, [
                         h('div', {
@@ -1128,14 +1178,15 @@
                             directives: [{
                                 name: 'bk-overflow-tips'
                             }]
-                        }, [i18n.t('确定跳过当前节点?')]),
+                        }, [title]),
                         h('div', {
                             class: 'custom-header-sub-title bk-dialog-header-inner',
                             directives: [{
                                 name: 'bk-overflow-tips'
                             }]
-                        }, [i18n.t('跳过节点将忽略当前失败节点继续往后执行')])
+                        }, [subTitle])
                     ]),
+                    width: 450,
                     extCls: 'dialog-custom-header-title',
                     maskClose: false,
                     confirmLoading: true,
@@ -1153,9 +1204,9 @@
                     }
                     await this.loadNodeInfo()
 
-                    const { instance_id, component_code, node_id } = this.nodeDetailConfig
+                    const { component_code, node_id } = this.nodeDetailConfig
                     const data = {
-                        instance_id: this.subProcessTaskId || instance_id,
+                        instance_id: this.subProcessTaskId || this.instance_id,
                         component_code,
                         node_id
                     }
@@ -1448,7 +1499,8 @@
                                     ...existNode,
                                     isLevelUp: lastNode.isLevelUp,
                                     style: lastNode.style,
-                                    isDifferLevelConverge: true
+                                    isDifferLevelConverge: true,
+                                    children: []
                                 })
                             }
                         }
@@ -2338,6 +2390,7 @@
             onHiddenSideslider () {
                 this.subProcessTaskId = null
                 this.nodeInfoType = ''
+                this.retryNodeName = ''
                 this.updateNodeActived(this.nodeDetailConfig.node_id, false)
             },
             // 判断RUNNING的节点是否有暂停节点，若有，则将当前任务状态标记为暂停状态
diff --git a/frontend/desktop/src/pages/task/TaskList/index.vue b/frontend/desktop/src/pages/task/TaskList/index.vue
index 3fa2d6f78e..1ee371bb25 100644
--- a/frontend/desktop/src/pages/task/TaskList/index.vue
+++ b/frontend/desktop/src/pages/task/TaskList/index.vue
@@ -546,21 +546,21 @@
                         this.totalPage = totalPage
                     }
                     const result = await this.setListHaveChild(list)
+                    // mixins getExecuteStatus
+                    this.getExecuteStatus('executeStatus', result)
+                    this.setTaskListData(result)
                     // 当存在默认打开的子流程时，需手动打开
                     if (this.initOpenTask.length) {
-                        this.setTaskListData(result)
                         const task = result.find(item => item.id === Number(this.initOpenTask[0]))
                         task && await this.getCurProcessChdProcess(task)
                         this.initOpenTask = []
                         return
                     }
-                    // mixins getExecuteStatus
-                    this.getExecuteStatus('executeStatus', result)
-                    this.setTaskListData(result)
-                    this.listLoading = false
                 } catch (e) {
                     this.listLoading = e.message === 'cancelled'
                     console.log(e)
+                } finally {
+                    this.listLoading = false
                 }
             },
             // 设置每条记录是否有子流程
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index 621cae9fd2..cc01a3e58e 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -27,7 +27,7 @@
                     <div v-bk-overflow-tips :style="{ color: props.row.hooked ? '#3a84ff' : '#63656e' }">{{ props.row.key }}</div>
                     <span class="hook-icon-wrap">
                         <i
-                            :class="['common-icon-variable-cite hook-icon', {
+                            :class="['common-icon-variable-hook hook-icon', {
                                 actived: props.row.hooked,
                                 disabled: isViewMode || !hook
                             }]"
@@ -344,14 +344,14 @@
         right: 22px;
         top: 9px;
         display: inline-block;
-        width: 24px;
-        height: 24px;
-        line-height: 24px;
+        width: 32px;
+        height: 32px;
+        line-height: 32px;
         background: #f0f1f5;
         text-align: center;
         border-radius: 2px;
         .hook-icon {
-            font-size: 18px;
+            font-size: 16px;
             color: #979ba5;
             cursor: pointer;
             &.disabled {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index 436676610c..ab366b7962 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -14,7 +14,7 @@
         <div :class="['variable-content', { 'view-model': isViewMode }]" @click="onEditVariable(variableData.key, variableData.index)">
             <i v-if="!isSystemVar && !isProjectVar && !showCitedList" class="col-item-drag common-icon-drawable f16"></i>
             <span v-if="!isViewMode && !isSystemVar && !isProjectVar" @click.stop class="col-item-checkbox">
-                <bk-checkbox :value="variableChecked" @change="onChooseVariable"></bk-checkbox>
+                <bk-checkbox :disabled="isComponentVar" :value="variableChecked" @change="onChooseVariable"></bk-checkbox>
             </span>
             <i v-if="isSystemVar" class="variable-icon common-icon-lock-disable"></i>
             <i v-if="isProjectVar" class="variable-icon common-icon-paper"></i>
@@ -94,12 +94,21 @@
                 </span>
                 <span v-else class="col-operation-item">{{ $t('编辑') }}</span>
             </span>
-            <span class="col-item col-more" v-if="!isViewMode && !isInternalVal && !['component_outputs', 'component_inputs'].includes(variableData.source_type)">
+            <span class="col-item col-more" v-if="!isViewMode && !isInternalVal">
                 <bk-popover placement="bottom" theme="light" :distance="0" :arrow="false" ext-cls="var-operate-popover">
                     <i class="bk-icon icon-more"></i>
                     <template slot="content">
-                        <p class="operate-item" @click.stop="onCloneVariable()">{{ $t('克隆') }}</p>
-                        <p class="operate-item" @click.stop="onDeleteVariable">{{ $t('删除') }}</p>
+                        <p
+                            :class="['operate-item', { 'disabled': isComponentVar }]"
+                            v-bk-tooltips="{ content: $t('该类型仅支持从节点配置生成变量'), disabled: !isComponentVar }"
+                            @click.stop="onCloneVariable()">
+                            {{ $t('克隆') }}
+                        </p>
+                        <p
+                            :class="['operate-item', { 'disabled': isComponentVar }]"
+                            v-bk-tooltips="{ content: $t('该类型仅支持从节点配置取消引用'), disabled: !isComponentVar }"
+                            @click.stop="onDeleteVariable">{{ $t('删除') }}
+                        </p>
                     </template>
                 </bk-popover>
             </span>
@@ -165,6 +174,9 @@
             isProjectVar () {
                 return this.variableData.source_type === 'project'
             },
+            isComponentVar () {
+                return ['component_outputs', 'component_inputs'].includes(this.variableData.source_type)
+            },
             citedList () {
                 const defaultCiteData = {
                     activities: [],
@@ -277,6 +289,7 @@
                 }
             },
             onDeleteVariable () {
+                if (this.isComponentVar) return
                 const h = this.$createElement
                 this.$bkInfo({
                     subHeader: h('div', { class: 'custom-header' }, [
@@ -285,13 +298,13 @@
                             directives: [{
                                 name: 'bk-overflow-tips'
                             }]
-                        }, [i18n.t('确认删除') + i18n.t('全局变量') + `"${this.variableData.key}"?`]),
+                        }, [i18n.t('确认删除') + i18n.t('全局变量') + `【${this.variableData.key}】?`]),
                         h('div', {
                             class: 'custom-header-sub-title bk-dialog-header-inner',
                             directives: [{
                                 name: 'bk-overflow-tips'
                             }]
-                        }, [i18n.t('若该变量被节点引用，请及时检查并更新节点配置')])
+                        }, [i18n.t('删除变量将导致所有变量引用失效，请及时检查并更新节点配置')])
                     ]),
                     extCls: 'dialog-custom-header-title',
                     maskClose: false,
@@ -307,6 +320,7 @@
                 this.$emit('onEditVariable', key, index)
             },
             onCloneVariable () {
+                if (this.isComponentVar) return
                 this.$emit('onCloneVariable', this.variableData)
             },
             onChooseVariable (value) {
@@ -333,6 +347,11 @@
                 background: rgba(225,236,255,0.60);
                 color: #3a84ff;
             }
+            &.disabled {
+                color: #cccccc;
+                cursor: not-allowed;
+                background: #fff;
+            }
         }
     }
 </style>
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index a1206db75d..1a7b183f5e 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -610,7 +610,7 @@
             onDeleteVarList () {
                 let title = ''
                 if (this.deleteVarListLen === 1) {
-                    title = i18n.t('确认删除') + i18n.t('全局变量') + `"${this.deleteVarList[0].key}"?`
+                    title = i18n.t('确认删除') + i18n.t('全局变量') + `【${this.deleteVarList[0].key}】?`
                 } else {
                     title = i18n.t('确认删除所选的x个变量？', { num: this.deleteVarListLen })
                 }
@@ -628,7 +628,7 @@
                             directives: [{
                                 name: 'bk-overflow-tips'
                             }]
-                        }, [i18n.t('若该变量被节点引用，请及时检查并更新节点配置')])
+                        }, [i18n.t('删除变量将导致所有变量引用失效，请及时检查并更新节点配置')])
                     ]),
                     extCls: 'dialog-custom-header-title',
                     maskClose: false,
diff --git a/frontend/desktop/src/scss/iconfont.scss b/frontend/desktop/src/scss/iconfont.scss
index 80cbfb5019..bad7e07801 100644
--- a/frontend/desktop/src/scss/iconfont.scss
+++ b/frontend/desktop/src/scss/iconfont.scss
@@ -590,3 +590,9 @@
 .common-icon-full-screen:before {
 	content: "\e202";
 }
+.common-icon-variable-hook:before {
+	content: "\e205";
+}
+.common-icon-converge-node:before {
+	content: "\e204";
+}

From 5babb3fa988aa08cad125a71e491d448ff0a852f Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Wed, 23 Aug 2023 16:03:43 +0800
Subject: [PATCH 047/112] =?UTF-8?q?optimization:=20=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/models.py                    |  7 +++++-
 .../collections/subprocess_plugin/v1_0_0.py   | 22 ++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gcloud/taskflow3/models.py b/gcloud/taskflow3/models.py
index 8cfe5199d0..3d56567d08 100644
--- a/gcloud/taskflow3/models.py
+++ b/gcloud/taskflow3/models.py
@@ -1036,8 +1036,13 @@ def change_parent_task_node_state_to_running(self):
             schedule = runtime.get_schedule_with_node_and_version(parent_node_id, parent_node_version)
             DBSchedule.objects.filter(id=schedule.id).update(expired=False)
             # FAILED 状态需要转换为 READY 之后才能转换为 RUNNING
-            runtime.set_state(node_id=parent_node_id, version=parent_node_version, to_state=states.READY)
+            runtime.set_state(
+                node_id=parent_node_id, version=parent_node_version, to_state=states.READY, clear_archived_time=True
+            )
             runtime.set_state(node_id=parent_node_id, version=parent_node_version, to_state=states.RUNNING)
+            data_outputs = runtime.get_execution_data_outputs(parent_node_id)
+            data_outputs.pop("ex_data", None)
+            runtime.set_execution_data_outputs(parent_node_id, data_outputs)
 
             # 仅当父流程的节点状态为失败时，才需要唤醒父流程的节点
             parent_task_id = TaskFlowRelation.objects.filter(task_id=self.id).first().parent_task_id
diff --git a/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py b/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
index 2b4f38ffcc..7d0219f25e 100644
--- a/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
+++ b/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
@@ -20,23 +20,20 @@
 from django.conf import settings
 from django.db import transaction
 from django.utils import timezone
-from pipeline.models import PipelineTemplate
-
-from pipeline.core.flow.io import StringItemSchema, IntItemSchema
-
+from django.utils.translation import ugettext_lazy as _
+from pipeline.component_framework.component import Component
+from pipeline.core.flow import Service
+from pipeline.core.flow.io import IntItemSchema, StringItemSchema
 from pipeline.eri.runtime import BambooDjangoRuntime
-
-from gcloud.core.models import EngineConfig, Project
-from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
+from pipeline.models import PipelineTemplate
 from pydantic import BaseModel
 
 from gcloud.common_template.models import CommonTemplate
 from gcloud.constants import NON_COMMON_TEMPLATE_TYPES, PROJECT
-from gcloud.taskflow3.models import TaskFlowInstance, TimeoutNodeConfig, TaskCallBackRecord, TaskFlowRelation
+from gcloud.core.models import EngineConfig, Project
+from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
+from gcloud.taskflow3.models import TaskCallBackRecord, TaskFlowInstance, TaskFlowRelation, TimeoutNodeConfig
 from gcloud.tasktmpl3.models import TaskTemplate
-from pipeline.component_framework.component import Component
-from pipeline.core.flow import Service
-from django.utils.translation import ugettext_lazy as _
 
 
 class Subprocess(BaseModel):
@@ -206,8 +203,7 @@ def schedule(self, data, parent_data, callback_data=None):
         task_id = data.get_one_of_outputs("task_id")
         self.finish_schedule()
         if not task_success:
-            task_url = data.get_one_of_outputs("task_url")
-            data.set_outputs("ex_data", f'子流程节点执行异常，请<a href="{task_url}" target="_blank">去往子任务</a>查看详情')
+            data.set_outputs("ex_data", "子流程执行失败，请检查失败节点")
             return False
         try:
             subprocess_task = TaskFlowInstance.objects.get(id=task_id)

From 61e745e5cdefa79f907617330433f65b50223f9c Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Mon, 21 Aug 2023 22:23:55 +0800
Subject: [PATCH 048/112] =?UTF-8?q?sprintfix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=AE=A1=E7=90=86=E9=87=8D=E8=A3=85=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=86=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/components/atoms/nodeman/create_task/v4_0.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index 86dd4b1df5..847d333e00 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -283,8 +283,8 @@
         if (node_type === "PROXY") {
             self.columns.push(...proxy_columns);
         }
-        // 安装 / 卸载需要认证信息
-        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+        // 安装 / 重装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") {
             self.columns.push(...auth_columns);
         }
         // 非卸载场景需要配置信息

From cbe6312bccc193b89879c7f5e1dbe09a80b3fd53 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Mon, 28 Aug 2023 14:24:20 +0800
Subject: [PATCH 049/112] =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E9=87=8D=E8=AF=95=E6=93=8D=E4=BD=9C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?&&=E5=AD=90=E6=B5=81=E7=A8=8B=E7=94=BB=E5=B8=83=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96&&=E5=AD=90=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=BF=AB=E7=85=A7=E4=BC=A0=E5=8F=82=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20(#7024)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/config/i18n/cn.js        |   2 +-
 frontend/desktop/src/config/i18n/en.js        |   2 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    | 170 ++++++++++++++----
 .../ExecuteInfo/ExecuteInfoForm.vue           |   2 +-
 .../TaskExecute/ExecuteInfo/InputParams.vue   |  13 +-
 .../pages/task/TaskExecute/TaskOperation.vue  |  64 +++----
 6 files changed, 175 insertions(+), 78 deletions(-)

diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 8927296d98..4b6e116144 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1766,7 +1766,7 @@ const cn = {
     '跳过节点将忽略失败继续往后执行': '跳过节点将忽略失败继续往后执行',
     '确定重试子流程【n】 ？': '确定重试子流程【{n}】 ？',
     '确定重试节点【n】 ？': '确定重试节点【{n}】 ？',
-    '子任务中重试无法修改参数，如需修改请在根任务中操作': '子任务中重试无法修改参数，如需修改请在根任务中操作'
+    '非根节点仅支持以原参数进行重试': '非根节点仅支持以原参数进行重试'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 5589bcd3d5..5c907c1b7e 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1800,7 +1800,7 @@ const en = {
     '跳过节点将忽略失败继续往后执行': 'Skipping  node will ignore the failure and continue executing the next step.',
     '确定重试子流程【n】 ？': 'Retry this subflow [ {n} ] ？',
     '确定重试节点【n】 ？': 'Retry this node [ {n} ] ？',
-    '子任务中重试无法修改参数，如需修改请在根任务中操作': 'Retrying in a sub-task does not allow modifying parameters. If modification is needed, please operate in the root task.'
+    '非根节点仅支持以原参数进行重试': 'Non-root nodes only support retrying with the original parameters.'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 7bcca77fdf..123485ea48 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -54,12 +54,11 @@
                                 v-bk-tooltips.top="$t('放大')"
                                 @click="onZoomIn">
                             </i>
-                            <i
-                                :class="canvasExpand ? 'common-icon-partial-screen' : 'common-icon-full-screen'"
-                                v-bk-tooltips.top="$t(canvasExpand ? '收起' : '最大化')"
-                                @click="canvasExpand = !canvasExpand">
-                            </i>
                         </div>
+                        <!--可拖拽-->
+                        <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
+                        <i :class="['resize-proxy', 'top']" ref="resizeProxy"></i>
+                        <div class="resize-mask" ref="resizeMask"></div>
                     </div>
                     <div
                         v-if="location"
@@ -534,7 +533,7 @@
             this.loadNodeInfo()
             if (this.subProcessPipeline) {
                 this.$nextTick(() => {
-                    this.setSubprocessCanvasZoom()
+                    this.initCanvasZoom()
                 })
             }
         },
@@ -701,13 +700,13 @@
                      * 兼容旧版本子流程节点输入数据
                      * 获取子流程输入参数 (subflow_detail_var 标识当前为子流程节点详情)
                      */
+                    constants = { subflow_detail_var: true, ...inputsInfo }
                     inputsInfo = Object.values(this.pipelineData.constants).reduce((acc, cur) => {
                         if (cur.show_type === 'show') {
                             acc[cur.key] = cur.value
                         }
                         return acc
                     }, {})
-                    constants = { subflow_detail_var: true, ...inputsInfo }
                 }
                 for (const key in inputsInfo) {
                     renderData[key] = inputsInfo[key]
@@ -997,7 +996,9 @@
                     const time = name === 'history' ? 300 : 0
                     setTimeout(() => {
                         const scrollBoxDom = document.querySelector('.scroll-box')
-                        scrollBoxDom.scrollTo({ top: scrollBoxDom.scrollHeight, behavior: 'smooth' })
+                        const subProcessCanvasDom = document.querySelector('.sub-process')
+                        const { height = 0 } = subProcessCanvasDom.getBoundingClientRect()
+                        scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
                     }, time)
                 }
             },
@@ -1021,7 +1022,7 @@
                 if (node.isSubProcess || updateCanvas) {
                     this.canvasRandomKey = new Date().getTime()
                     this.$nextTick(() => {
-                        this.setSubprocessCanvasZoom()
+                        this.initCanvasZoom()
                     })
                 }
                 this.$emit('onClickTreeNode', node)
@@ -1040,23 +1041,11 @@
                     }
                 })
             },
-            setSubprocessCanvasZoom () {
-                const flowDom = this.$el.querySelector('.sub-flow')
-                if (!flowDom) return
-                const { height = 0, width = 0 } = flowDom.getBoundingClientRect()
-                let jsFlowInstance = this.$refs.subProcessCanvas
-                jsFlowInstance = jsFlowInstance.$refs.jsFlow
-                jsFlowInstance && jsFlowInstance.zoomOut(0.75, width / 2, height / 2)
-                const { start_event, flows } = this.subProcessPipeline
-                const firstNodeId = flows[start_event.outgoing].target
-                const firstNodeDom = document.querySelector(`#${firstNodeId}`)
-                const { y } = firstNodeDom.getBoundingClientRect()
-                jsFlowInstance.setCanvasPosition(0, 180 - y)
-            },
             // 移动画布，将节点放到画布中央
             moveNodeToView (id) {
                 // 判断dom是否存在当前视图中
                 const nodeEl = document.querySelector(`#${id} .canvas-node-item`)
+                if (!nodeEl) return
                 const isInViewPort = this.judgeInViewPort(nodeEl)
                 // 如果不存在需要将节点挪到画布中间
                 if (!isInViewPort) {
@@ -1079,6 +1068,34 @@
                 const { top, left } = element.getBoundingClientRect()
                 return top > canvasTop && top < canvasTop + height && left > canvasLeft && left < canvasLeft + width
             },
+            // 画布初始化时缩放比偏移
+            initCanvasZoom () {
+                // 获取画布上下左右最大坐标
+                const xList = this.canvasData.locations.map(node => node.x)
+                const yList = this.canvasData.locations.map(node => node.y)
+                const minX = Math.min(...xList)
+                const maxX = Math.max(...xList)
+                const minY = Math.min(...yList)
+                const maxY = Math.max(...yList)
+                const maxXNodeId = this.canvasData.locations.find(node => node.x === maxX).id
+                const maxYNodeId = this.canvasData.locations.find(node => node.y === maxY).id
+                const { width } = this.$el.querySelector(`#${maxXNodeId}`).getBoundingClientRect()
+                const { height } = this.$el.querySelector(`#${maxYNodeId}`).getBoundingClientRect()
+                const netHeight = maxY - minY + height + 60
+                const netWidth = maxX - minX + width + 80
+                const subprocessDom = this.$el.querySelector('.sub-process')
+                const { height: canvasHeight, width: canvasWidth } = subprocessDom.getBoundingClientRect()
+                // 最大比例0.75
+                let ratio = Math.min(canvasHeight / netHeight, canvasWidth / netWidth)
+                ratio = ratio > 0.75 ? 0.75 : ratio
+                let jsFlowInstance = this.$refs.subProcessCanvas
+                jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                jsFlowInstance && jsFlowInstance.zoomOut(ratio, 0, 0)
+                // 设置偏移量
+                const offsetX = canvasWidth / 2 - (minX - 30 + netWidth / 2) * ratio
+                const offsetY = canvasHeight / 2 - (minY + netHeight / 2) * ratio
+                jsFlowInstance.setCanvasPosition(offsetX, offsetY, true)
+            },
             
             toggleNodeActive (id, isActive) {
                 const node = document.getElementById(id)
@@ -1265,6 +1282,7 @@
                         const pipelineTree = JSON.parse(resp.pipeline_tree)
                         const parentInfo = {
                             parentId: nodeInfo.parentId ? nodeInfo.parentId + '-' + nodeInfo.id : nodeInfo.id,
+                            independentId: nodeInfo.id,
                             parentLevel: nodeInfo.nodeLevel,
                             lastLevelStyle: 'margin-left: 0px',
                             taskId
@@ -1294,7 +1312,7 @@
                         this.$set(nodeActivity, 'pipeline', { ...pipelineTree, taskId })
                         this.canvasRandomKey = new Date().getTime()
                         this.$nextTick(() => {
-                            this.setSubprocessCanvasZoom()
+                            this.initCanvasZoom()
                         })
                     }
                 } catch (error) {
@@ -1394,7 +1412,8 @@
                 const info = {
                     name: this.executeInfo.name,
                     taskId: this.subProcessTaskId,
-                    isSubProcessNode: this.isSubProcessNode
+                    isSubProcessNode: this.isSubProcessNode,
+                    isSubNode: !!this.nodeDetailConfig.root_node
                 }
                 this.$emit('onRetryClick', this.nodeDetailConfig.node_id, info)
             },
@@ -1420,6 +1439,44 @@
             },
             onContinueClick () {
                 this.$emit('onContinueClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+            },
+            handleMousedown (event) {
+                this.updateResizeMaskStyle()
+                this.updateResizeProxyStyle()
+                this.canvasExpand = false
+                document.addEventListener('mousemove', this.handleMouseMove)
+                document.addEventListener('mouseup', this.handleMouseUp)
+            },
+            handleMouseMove (event) {
+                const flowDom = this.$el.querySelector('.sub-flow')
+                const { top: flowTop } = flowDom.getBoundingClientRect()
+                let top = event.clientY - flowTop
+                let maxHeight = window.innerHeight - 180
+                maxHeight = maxHeight - (this.isShowActionWrap ? 48 : 0)
+                top = top > maxHeight ? maxHeight : top
+                top = top < 160 ? 160 : top
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.top = `${top}px`
+            },
+            updateResizeMaskStyle () {
+                const resizeMask = this.$refs.resizeMask
+                resizeMask.style.display = 'block'
+                resizeMask.style.cursor = 'row-resize'
+            },
+            updateResizeProxyStyle () {
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'visible'
+            },
+            handleMouseUp () {
+                const resizeMask = this.$refs.resizeMask
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'hidden'
+                resizeMask.style.display = 'none'
+                const subProcessDom = document.querySelector('.sub-process')
+                subProcessDom.style.height = resizeProxy.style.top
+                this.canvasExpand = true
+                document.removeEventListener('mousemove', this.handleMouseMove)
+                document.removeEventListener('mouseup', this.handleMouseUp)
             }
         }
     }
@@ -1530,7 +1587,7 @@
     }
     .sub-process {
         flex-shrink: 0;
-        height: 160px;
+        height: 320px;
         margin: 0 25px 8px 15px;
         position: relative;
         background: #e1e4e8;
@@ -1573,7 +1630,7 @@
             }
         }
         .flow-option {
-            width: 96px;
+            width: 68px;
             height: 32px;
             position: absolute;
             bottom: 16px;
@@ -1589,11 +1646,8 @@
             border-radius: 2px;
             i {
                 cursor: pointer;
-                &:nth-child(2) {
-                    margin: 0 14px;
-                }
                 &:last-child {
-                    font-size: 14px;
+                    margin-left: 14px;
                 }
                 &:hover {
                     color: #3a84ff;
@@ -1601,10 +1655,9 @@
             }
         }
         &.canvas-expand {
-            height: calc(100% - 85px);
             & + div {
                 .log-section {
-                    height: 858px;
+                    height: 768px;
                 }
             }
         }
@@ -1715,5 +1768,58 @@
             }
         }
     }
+    .resize-trigger {
+        height: 5px;
+        width: calc(100% + 40px);
+        position: absolute;
+        left: -15px;
+        bottom: -5px;
+        cursor: row-resize;
+        z-index: 3;
+        &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            height: 1px;
+            width: 100%;
+        }
+        &::after {
+            content: "";
+            position: absolute;
+            top: 5px;
+            right: 50%;
+            width: 2px;
+            height: 2px;
+            color: #979ba5;
+            transform: translate3d(0,-50%,0);
+            background: currentColor;
+            box-shadow: 4px 0 0 0 currentColor,8px 0 0 0 currentColor,-4px 0 0 0 currentColor,-8px 0 0 0 currentColor;
+        }
+        &:hover::before {
+            background-color: #3a84ff;
+        }
+    }
+    .resize-proxy {
+        visibility: hidden;
+        position: absolute;
+        pointer-events: none;
+        z-index: 9999;
+        &.top {
+            top: 320px;
+            left: -15px;
+            width: calc(100% + 40px);
+            border-top: 1px dashed #3a84ff;
+        }
+    }
+    .resize-mask {
+        display: none;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 9999;
+    }
 }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 0b42a18063..80aeb626c0 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -269,7 +269,7 @@
             async initData () {
                 try {
                     // 获取对应模板配置
-                    const tplConfig = this.getNodeSnapshotConfig ? {} : await this.getNodeSnapshotConfig(this.nodeDetailConfig)
+                    const tplConfig = await this.getNodeSnapshotConfig(this.nodeDetailConfig)
                     this.templateConfig = tplConfig.data || { ...this.nodeActivity, isOldData: true } || {}
                     if (this.isSubProcessNode || this.nodeActivity.type === 'SubProcess') { // 子流程任务节点
                         // tplConfig.data为null为该功能之前的旧数据，没有original_template_id字段的，不调接口
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
index 7b62bf863d..1df95a09f4 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
@@ -24,7 +24,7 @@
                         :scheme="renderConfig"
                         :form-option="renderOption"
                         :constants="inputConstants"
-                        v-model="inputRenderDate">
+                        v-model="inputRenderData">
                     </RenderForm>
                     <NoData v-else></NoData>
                 </template>
@@ -32,7 +32,7 @@
                     <jsonschema-form
                         v-if="renderConfig && renderConfig.properties && Object.keys(renderConfig.properties).length > 0"
                         :schema="renderConfig"
-                        :value="inputRenderDate">
+                        :value="inputRenderData">
                     </jsonschema-form>
                     <no-data v-else></no-data>
                 </template>
@@ -99,7 +99,7 @@
                 },
                 renderKey: null,
                 inputConstants: {},
-                inputRenderDate: {},
+                inputRenderData: {},
                 isExpand: true
             }
         },
@@ -132,7 +132,8 @@
                     }
                     this.inputConstants = constants
                 },
-                deep: true
+                deep: true,
+                immediate: true
             },
             renderData: {
                 handler (val) {
@@ -143,11 +144,11 @@
                         Object.keys(this.renderData).forEach(key => {
                             const value = this.renderData[key]
                             if (/^\${[^${}]+}$/.test(value) && key in this.inputConstants) {
-                                this.renderData[key] = this.inputConstants[key]
+                                renderData[key] = this.inputConstants[key]
                             }
                         })
                     }
-                    this.inputRenderDate = renderData
+                    this.inputRenderData = renderData
                 },
                 deep: true,
                 immediate: true
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 79161f4c2a..2028ce31f2 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -1009,14 +1009,15 @@
             },
             async onRetryClick (id, info) {
                 try {
+                    const { taskId } = info || {}
+                    this.subProcessTaskId = taskId
                     // 独立子任务重试使用二次确认弹框
-                    if (this.isChildTaskFlow) {
+                    if (this.isChildTaskFlow || (info && info.isSubNode)) {
                         const nodeConfig = this.nodeTreePipelineData.activities[id]
-                        const isSubProcessNode = nodeConfig.component.code === 'subprocess_plugin'
-                        const title = isSubProcessNode
-                            ? this.$t('确定重试子流程【n】 ？', { n: nodeConfig.name })
-                            : this.$t('确定重试节点【n】 ？', { n: nodeConfig.name })
-                        const subTitle = this.$t('子任务中重试无法修改参数，如需修改请在根任务中操作')
+                        const name = info ? info.name : nodeConfig.name
+                        const title = info.isSubProcessNode
+                            ? this.$t('确定重试子流程【n】 ？', { n: name })
+                            : this.$t('确定重试节点【n】 ？', { n: name })
                         const h = this.$createElement
                         this.$bkInfo({
                             subHeader: h('div', { class: 'custom-header' }, [
@@ -1026,12 +1027,12 @@
                                         name: 'bk-overflow-tips'
                                     }]
                                 }, [title]),
-                                isSubProcessNode ? h('div', {
+                                h('div', {
                                     class: 'custom-header-sub-title bk-dialog-header-inner',
                                     directives: [{
                                         name: 'bk-overflow-tips'
                                     }]
-                                }, [subTitle]) : ''
+                                }, [this.$t('非根节点仅支持以原参数进行重试')])
                             ]),
                             width: 450,
                             extCls: 'dialog-custom-header-title',
@@ -1045,32 +1046,18 @@
                         })
                         return
                     }
-                    const { taskId } = info || {}
-                    this.subProcessTaskId = taskId
                     const resp = await this.getInstanceRetryParams({ id: taskId || this.instance_id })
                     if (resp.data.enable) {
                         this.openNodeInfoPanel('retryNode', i18n.t('重试节点'))
-                        // 子流程任务节点，不需要重新获取节点配置
-                        if (!taskId) {
-                            this.setNodeDetailConfig(id)
-                        }
+                        this.setNodeDetailConfig(id)
                         if (this.nodeDetailConfig.component_code) {
                             await this.loadNodeInfo(id)
                         }
                     } else {
-                        // 子流程任务节点，不需要重新获取节点配置
-                        if (!taskId) {
-                            this.setNodeDetailConfig(id)
-                        }
-                        let isSubProcessNode = false
-                        if (info) {
-                            isSubProcessNode = info.isSubProcessNode
-                            this.retryNodeName = info.name
-                        } else {
-                            const nodeConfig = this.nodeTreePipelineData.activities[id]
-                            isSubProcessNode = nodeConfig?.component.code === 'subprocess_plugin'
-                            this.retryNodeName = nodeConfig.name
-                        }
+                        this.setNodeDetailConfig(id)
+                        const nodeConfig = this.nodeTreePipelineData.activities[id]
+                        const isSubProcessNode = nodeConfig?.component.code === 'subprocess_plugin'
+                        this.retryNodeName = nodeConfig.name
                         this.openNodeInfoPanel('modifyParams', isSubProcessNode ? i18n.t('重试子流程') : i18n.t('重试节点'))
                         this.retryNodeId = id
                     }
@@ -1410,7 +1397,7 @@
                 const endNode = tools.deepClone(data.end_event)
                 const fstLine = startNode.outgoing
                 const nodeId = data.flows[fstLine].target
-                const { parentId, parentLevel, lastLevelStyle, taskId } = pipelineInfo
+                const { parentId, independentId, parentLevel, lastLevelStyle, taskId } = pipelineInfo
                 let marginLeft
                 if (lastLevelStyle) {
                     marginLeft = lastLevelStyle.match(/[0-9]+/g)[0]
@@ -1439,7 +1426,7 @@
                 })
                 this.getNodeTargetMaps(data)
                 this.getNodeSourceMaps(data)
-                const nodeInfo = { id: nodeId, parentId, parentLevel, lastLevelStyle, taskId }
+                const nodeInfo = { id: nodeId, parentId, independentId, parentLevel, lastLevelStyle, taskId }
                 this.retrieveLines(data.id, data, nodeInfo, orderedData)
                 orderedData.push(endEvent)
                 // 过滤root最上层汇聚网关
@@ -1461,6 +1448,7 @@
                     branchId,
                     nodeLevel = 1,
                     parentId,
+                    independentId,
                     parentLevel,
                     lastLevelStyle,
                     lastId,
@@ -1519,6 +1507,11 @@
                         isLevelUp,
                         taskId
                     }
+                    if (parentId) {
+                        let subprocessStack = independentId ? parentId.split(independentId)[1] : parentId
+                        subprocessStack = subprocessStack?.split('-') || []
+                        treeItem.subprocessStack = subprocessStack.filter(item => item)
+                    }
                     let marginLeft = 0
                     if (treeItem.nodeLevel === 1) {
                         marginLeft = 0
@@ -1633,6 +1626,7 @@
                                     if (this.nodeIds[componentData.id]) {
                                         delete this.nodeIds[componentData.id]
                                     }
+                                    parentInfo.independentId = id
                                     treeItem.children = this.getOrderedTree(componentData, parentInfo)
                                 }
                                 treeItem.type = 'SubProcess'
@@ -1703,6 +1697,7 @@
                     if (conditions.length) {
                         conditions.forEach(item => {
                             item.style = `margin-left: ${item.parentId ? 16 : marginLeft + 33}px`
+                            item.subprocessStack = treeItem.subprocessStack
                             treeItem.children.push(item)
                             this.retrieveLines(
                                 flowId,
@@ -1712,6 +1707,7 @@
                                     branchId: item.id,
                                     nodeLevel: item.nodeLevel,
                                     parentId,
+                                    independentId,
                                     gatewayId: id,
                                     lastId: item.id
                                 },
@@ -2139,7 +2135,7 @@
                 this.updateTaskStatus(id)
             },
             async onClickTreeNode (node) {
-                const { id, conditionType, parentId, taskId } = node
+                const { id, conditionType, parentId, taskId, subprocessStack = [] } = node
                 if (this.nodeDetailConfig.node_id) {
                     this.updateNodeActived(this.nodeDetailConfig.node_id, false)
                 }
@@ -2174,17 +2170,11 @@
                     this.isCondition = true
                     this.conditionData = { ...node }
                 }
-                let subprocessStack = parentId ? parentId.split('-') : []
-                let instance_id = this.instance_id
-                if (taskId) {
-                    subprocessStack = []
-                    instance_id = taskId
-                }
                 this.nodeDetailConfig = {
                     component_code: code,
                     version: version,
                     node_id: nodeId,
-                    instance_id,
+                    instance_id: taskId || this.instance_id,
                     taskId,
                     root_node: parentId,
                     subprocess_stack: JSON.stringify(subprocessStack),

From fe8dba91e87bba7888215796e15a4e331b141f61 Mon Sep 17 00:00:00 2001
From: normal-wls <1158341873@qq.com>
Date: Mon, 28 Aug 2023 21:29:07 +0800
Subject: [PATCH 050/112] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=8E=E6=9F=A5=E7=9C=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E4=BA=BA=E6=8F=90=E5=89=8D=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#7026)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bugfix: 修复任务创建后查看节点详情，任务执行代理人提前确定问题

* minor: unit test fix

* minor: unit test fix
---
 gcloud/contrib/function/handlers.py           | 11 ++++-
 gcloud/periodictask/signals/handlers.py       | 11 ++---
 gcloud/taskflow3/domains/context.py           | 11 ++---
 gcloud/taskflow3/domains/dispatchers/task.py  | 45 +++++++++----------
 gcloud/taskflow3/models.py                    |  8 ++--
 gcloud/taskflow3/signals/__init__.py          |  2 +-
 .../task_context/test_task_executor.py        | 16 ++++---
 .../models/taskflow/test_executor_proxy.py    |  6 +--
 8 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/gcloud/contrib/function/handlers.py b/gcloud/contrib/function/handlers.py
index 0c639ce887..82519e98a9 100755
--- a/gcloud/contrib/function/handlers.py
+++ b/gcloud/contrib/function/handlers.py
@@ -14,9 +14,9 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from gcloud.taskflow3.models import TaskFlowInstance
-from gcloud.taskflow3.signals import taskflow_started, taskflow_finished, taskflow_revoked
 from gcloud.contrib.function.models import FunctionTask
+from gcloud.taskflow3.models import TaskFlowInstance
+from gcloud.taskflow3.signals import pre_taskflow_start, taskflow_finished, taskflow_revoked, taskflow_started
 
 
 @receiver(post_save, sender=TaskFlowInstance)
@@ -27,6 +27,13 @@ def function_task_create_handler(instance, created, **kwargs):
         )
 
 
+@receiver(pre_taskflow_start)
+def pre_taskflow_start_handler(task_id, executor, **kwargs):
+    taskflow = TaskFlowInstance.objects.filter(id=task_id).first()
+    if taskflow:
+        taskflow.record_and_get_executor_proxy(taskflow.executor or executor)
+
+
 @receiver(taskflow_started)
 def function_task_started_handler(task_id, **kwargs):
     FunctionTask.objects.filter(task_id=task_id).update(status="executed")
diff --git a/gcloud/periodictask/signals/handlers.py b/gcloud/periodictask/signals/handlers.py
index 41f531a894..1e0088dcff 100644
--- a/gcloud/periodictask/signals/handlers.py
+++ b/gcloud/periodictask/signals/handlers.py
@@ -17,13 +17,8 @@
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from pipeline.contrib.periodic_task.models import PeriodicTask as PipelinePeriodicTask
-from pipeline.contrib.periodic_task.models import (
-    PeriodicTaskHistory as PipelinePeriodicTaskHistory,
-)
-from pipeline.contrib.periodic_task.signals import (
-    periodic_task_start_failed,
-    pre_periodic_task_start,
-)
+from pipeline.contrib.periodic_task.models import PeriodicTaskHistory as PipelinePeriodicTaskHistory
+from pipeline.contrib.periodic_task.signals import periodic_task_start_failed, pre_periodic_task_start
 
 from gcloud.constants import PROJECT, TaskCreateMethod
 from gcloud.core.models import EngineConfig
@@ -50,6 +45,8 @@ def pre_periodic_task_start_handler(sender, periodic_task, pipeline_instance, **
         engine_ver=periodic_task.extra_info.get("engine_ver", EngineConfig.ENGINE_VER_V1),
     )
 
+    task.record_and_get_executor_proxy(task.executor or periodic_task.creator)
+
     # crete auto retry strategy
     arn_creator = AutoRetryNodeStrategyCreator(taskflow_id=task.id, root_pipeline_id=pipeline_instance.instance_id)
     arn_creator.batch_create_strategy(pipeline_instance.execution_data)
diff --git a/gcloud/taskflow3/domains/context.py b/gcloud/taskflow3/domains/context.py
index d057c0cee8..bb60e22d53 100644
--- a/gcloud/taskflow3/domains/context.py
+++ b/gcloud/taskflow3/domains/context.py
@@ -13,12 +13,12 @@
 import datetime
 import logging
 
-from django.utils import translation, timezone
 from django.conf import settings
+from django.utils import timezone, translation
 from django.utils.translation import ugettext_lazy as _
 
 from engine_pickle_obj.context import SystemObject
-from gcloud.core.models import Business, ProjectConfig, Project
+from gcloud.core.models import Business, Project, ProjectConfig
 from gcloud.project_constants.domains.context import get_project_constants_context
 
 logger = logging.getLogger("root")
@@ -69,10 +69,11 @@ def task_executor(self, taskflow, operator):
         :return: 该任务执行时实际使用的执行人
         :rtype: str
         """
-        runtime_executor_proxy = taskflow.executor_proxy or ProjectConfig.objects.task_executor_for_project(
-            self.project_id, operator
+        return (
+            taskflow.recorded_executor_proxy
+            or taskflow.executor_proxy
+            or ProjectConfig.objects.task_executor_for_project(self.project_id, operator)
         )
-        return taskflow.record_and_get_executor_proxy(runtime_executor_proxy)
 
     def context(self):
         return {"${%s}" % TaskContext.prefix: {"type": "plain", "is_param": True, "value": self}}
diff --git a/gcloud/taskflow3/domains/dispatchers/task.py b/gcloud/taskflow3/domains/dispatchers/task.py
index 5fd4b68cdd..5b24089be4 100644
--- a/gcloud/taskflow3/domains/dispatchers/task.py
+++ b/gcloud/taskflow3/domains/dispatchers/task.py
@@ -11,46 +11,41 @@
 specific language governing permissions and limitations under the License.
 """
 
-import json
 import copy
+import json
 import logging
 import traceback
 from typing import Optional
 
-from django.utils import timezone
-from django.db import transaction
 from bamboo_engine import api as bamboo_engine_api
+from bamboo_engine import exceptions as bamboo_engine_exceptions
 from bamboo_engine import states as bamboo_engine_states
 from bamboo_engine.context import Context
 from bamboo_engine.eri import ContextValue
-from bamboo_engine import exceptions as bamboo_engine_exceptions
-from pipeline.eri.runtime import BambooDjangoRuntime
-from pipeline.service import task_service
-from pipeline.models import PipelineInstance
-from pipeline.parser.context import get_pipeline_context
+from django.db import transaction
+from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+from opentelemetry import trace
+from pipeline.core.data.var import Variable
 from pipeline.engine import api as pipeline_api
+from pipeline.engine import exceptions as pipeline_exceptions
 from pipeline.engine.models import PipelineModel
-from pipeline.core.data.var import Variable
+from pipeline.eri.runtime import BambooDjangoRuntime
 from pipeline.eri.utils import CONTEXT_TYPE_MAP
-from pipeline_web.parser.format import format_web_data_to_pipeline, classify_constants
-from pipeline.engine import exceptions as pipeline_exceptions
-from pipeline.exceptions import (
-    ConvergeMatchError,
-    ConnectionValidateError,
-    IsolateNodeError,
-    StreamValidateError,
-)
-from opentelemetry import trace
-
+from pipeline.exceptions import ConnectionValidateError, ConvergeMatchError, IsolateNodeError, StreamValidateError
+from pipeline.models import PipelineInstance
+from pipeline.parser.context import get_pipeline_context
+from pipeline.service import task_service
 
+from engine_pickle_obj.context import SystemObject
 from gcloud import err_code
-from gcloud.taskflow3.signals import taskflow_started
-from gcloud.taskflow3.domains.context import TaskContext
-from gcloud.taskflow3.utils import format_pipeline_status, format_bamboo_engine_status
 from gcloud.project_constants.domains.context import get_project_constants_context
-from engine_pickle_obj.context import SystemObject
+from gcloud.taskflow3.domains.context import TaskContext
+from gcloud.taskflow3.signals import pre_taskflow_start, taskflow_started
+from gcloud.taskflow3.utils import format_bamboo_engine_status, format_pipeline_status
+from pipeline_web.parser.format import classify_constants, format_web_data_to_pipeline
+
 from .base import EngineCommandDispatcher, ensure_return_is_dict
-from django.utils.translation import ugettext_lazy as _
 
 logger = logging.getLogger("root")
 
@@ -109,6 +104,7 @@ def dispatch(self, command: str, operator: str) -> dict:
 
     def start_v1(self, executor: str) -> dict:
         try:
+            pre_taskflow_start.send(sender=self.__class__, task_id=self.taskflow_id, executor=executor)
             result = self.pipeline_instance.start(executor=executor, queue=self.queue, check_workers=False)
             if result.result:
                 taskflow_started.send(sender=self.__class__, task_id=self.taskflow_id)
@@ -157,6 +153,7 @@ def start_v1(self, executor: str) -> dict:
 
     def start_v2(self, executor: str) -> dict:
         # CAS
+        pre_taskflow_start.send(sender=self.__class__, task_id=self.taskflow_id, executor=executor)
         update_success = PipelineInstance.objects.filter(
             instance_id=self.pipeline_instance.instance_id, is_started=False
         ).update(start_time=timezone.now(), is_started=True, executor=executor)
diff --git a/gcloud/taskflow3/models.py b/gcloud/taskflow3/models.py
index 3d56567d08..61f11df366 100644
--- a/gcloud/taskflow3/models.py
+++ b/gcloud/taskflow3/models.py
@@ -48,7 +48,7 @@
     TaskCreateMethod,
 )
 from gcloud.contrib.appmaker.models import AppMaker
-from gcloud.core.models import EngineConfig, Project, StaffGroupSet
+from gcloud.core.models import EngineConfig, Project, ProjectConfig, StaffGroupSet
 from gcloud.core.utils import convert_readable_username
 from gcloud.project_constants.domains.context import get_project_constants_context
 from gcloud.shortcuts.cmdb import get_business_attrinfo, get_business_group_members
@@ -1243,9 +1243,11 @@ def get_notify_type(self):
         notify_type = json.loads(self.template.notify_type)
         return notify_type if isinstance(notify_type, dict) else {"success": notify_type, "fail": notify_type}
 
-    def record_and_get_executor_proxy(self, executor_proxy):
+    def record_and_get_executor_proxy(self, operator):
         if self.recorded_executor_proxy is None:
-            self.recorded_executor_proxy = executor_proxy
+            self.recorded_executor_proxy = self.executor_proxy or ProjectConfig.objects.task_executor_for_project(
+                self.project_id, operator
+            )
             self.save(update_fields=["recorded_executor_proxy"])
         return self.recorded_executor_proxy
 
diff --git a/gcloud/taskflow3/signals/__init__.py b/gcloud/taskflow3/signals/__init__.py
index 72a0022ff7..e9a94b74af 100644
--- a/gcloud/taskflow3/signals/__init__.py
+++ b/gcloud/taskflow3/signals/__init__.py
@@ -13,7 +13,7 @@
 
 from django.dispatch import Signal
 
-
+pre_taskflow_start = Signal(providing_args=["task_id", "executor"])
 taskflow_started = Signal(providing_args=["task_id"])
 taskflow_finished = Signal(providing_args=["task_id"])
 taskflow_revoked = Signal(providing_args=["task_id"])
diff --git a/gcloud/tests/taskflow3/context/task_context/test_task_executor.py b/gcloud/tests/taskflow3/context/task_context/test_task_executor.py
index 36381acf80..94b7ebb1f1 100644
--- a/gcloud/tests/taskflow3/context/task_context/test_task_executor.py
+++ b/gcloud/tests/taskflow3/context/task_context/test_task_executor.py
@@ -13,10 +13,9 @@
 
 from django.test import TestCase
 
-
+from gcloud.taskflow3.context import TaskContext
 from gcloud.tests.mock import *  # noqa
 from gcloud.tests.mock_settings import *  # noqa
-from gcloud.taskflow3.context import TaskContext
 
 
 def mock_init(self):
@@ -33,13 +32,19 @@ def setUpClass(cls):
     def tearDownClass(cls):
         TaskContext.__init__ = cls.init
 
+    def test_use_taskflow_recorded_executor_proxy(self):
+        taskflow = MagicMock()
+        taskflow.executor_proxy = "dummy_executor"
+        taskflow.recorded_executor_proxy = "dummy"
+        context = TaskContext()
+        self.assertEqual(context.task_executor(taskflow, "operator"), "dummy")
+
     def test_use_taskflow_executor_proxy(self):
         taskflow = MagicMock()
         taskflow.executor_proxy = "dummy"
-        taskflow.record_and_get_executor_proxy = MagicMock(return_value="dummy")
+        taskflow.recorded_executor_proxy = None
         context = TaskContext()
         self.assertEqual(context.task_executor(taskflow, "operator"), "dummy")
-        taskflow.record_and_get_executor_proxy.assert_called_once_with("dummy")
 
     def test_use_project_config_executor_proxy(self):
         project_config = MagicMock()
@@ -47,7 +52,6 @@ def test_use_project_config_executor_proxy(self):
         with patch(TASKFLOW_CONTEXT_PROJECT_CONFIG, project_config):
             taskflow = MagicMock()
             taskflow.executor_proxy = ""
-            taskflow.record_and_get_executor_proxy = MagicMock(return_value="proxy")
+            taskflow.recorded_executor_proxy = None
             context = TaskContext()
             self.assertEqual(context.task_executor(taskflow, "operator"), "proxy")
-            taskflow.record_and_get_executor_proxy.assert_called_once_with("proxy")
diff --git a/gcloud/tests/taskflow3/models/taskflow/test_executor_proxy.py b/gcloud/tests/taskflow3/models/taskflow/test_executor_proxy.py
index 9001c2891d..a31c3caeb4 100644
--- a/gcloud/tests/taskflow3/models/taskflow/test_executor_proxy.py
+++ b/gcloud/tests/taskflow3/models/taskflow/test_executor_proxy.py
@@ -14,7 +14,6 @@
 from django.test import TestCase
 
 from gcloud.taskflow3.models import TaskFlowInstance
-
 from gcloud.tests.mock import *  # noqa
 from gcloud.tests.mock_settings import *  # noqa
 
@@ -54,9 +53,10 @@ def test_normal(self):
             self.assertEqual(taskflow.executor_proxy, "dummy")
 
     @patch("gcloud.taskflow3.models.TaskFlowInstance.save", MagicMock(return_value=None))
+    @patch("gcloud.taskflow3.models.ProjectConfig.objects.task_executor_for_project", MagicMock(return_value="dummy"))
     def test_recorded_executor_proxy(self):
-        taskflow = TaskFlowInstance()
-        ep = taskflow.record_and_get_executor_proxy("dummy")
+        taskflow = TaskFlowInstance(template_source="None")
+        ep = taskflow.record_and_get_executor_proxy("operator")
         self.assertEqual(ep, "dummy")
         self.assertEqual(taskflow.recorded_executor_proxy, "dummy")
 

From 5f4d3f7eec1dbc68f5ee6b320a52c8bfc55f660d Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Wed, 30 Aug 2023 10:23:00 +0800
Subject: [PATCH 051/112] =?UTF-8?q?horse=E7=89=88=E6=9C=AC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20(#7029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       |  68 ++++++++--
 .../common/RenderForm/tags/TagTextarea.vue    | 117 +++++++++++++-----
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  71 ++++++-----
 .../ExecuteInfo/ExecuteInfoForm.vue           |  16 +++
 .../src/pages/task/TaskExecute/NodeTree.vue   |   7 +-
 .../pages/task/TaskExecute/NodeTreeItem.vue   |  12 +-
 .../pages/task/TaskExecute/TaskOperation.vue  |  29 ++---
 .../TabGlobalVariables/VariableItem.vue       |  11 +-
 .../TabGlobalVariables/index.vue              |   9 +-
 9 files changed, 234 insertions(+), 106 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index 0a48d1a0dc..f079b90797 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -170,9 +170,19 @@
                         const divInputDom = this.$el.querySelector('.div-input')
                         if (divInputDom) {
                             divInputDom.innerHTML = this.value
+                            this.handleInputBlur()
                         }
                     })
                 }
+            },
+            render (val) {
+                // 如果表单项开启了变量免渲染，不以tag展示
+                if (!val) {
+                    const divInputDom = this.$el.querySelector('.div-input')
+                    divInputDom.innerHTML = this.value
+                } else {
+                    this.handleInputBlur()
+                }
             }
         },
         created () {
@@ -182,7 +192,9 @@
             const divInputDom = this.$el.querySelector('.div-input')
             if (divInputDom) {
                 divInputDom.innerHTML = this.value
-                this.handleInputBlur()
+                if (this.render) {
+                    this.handleInputBlur()
+                }
             }
         },
         beforeDestroy () {
@@ -217,9 +229,7 @@
                 const replaceContent = previousDomContent + focusNodeContent
                 divInputDom.innerHTML = divInputDom.innerHTML.replace(previousDomContent + focusNode.data, replaceContent)
                 // 更新表单
-                const replacedValue = divInputDom.innerText
-                this.input.value = replacedValue
-                this.updateForm(replacedValue)
+                this.updateInputValue()
                 // 清空/关闭
                 this.isListOpen = false
                 this.hoverKey = ''
@@ -250,7 +260,7 @@
                     isVarTagDom = Array.from(varTagDoms).some(item => dom.nodeContains(item, e.target))
                 }
                 if (isVarTagDom) {
-                    const varText = e.target.innerText
+                    const varText = e.target.value
                     const divInputDom = this.$el.querySelector('.div-input')
                     // 记录光标的位置
                     const selection = window.getSelection()
@@ -301,9 +311,7 @@
             // 文本框输入
             handleInputChange (e, selection) {
                 if (!selection) {
-                    const { innerText } = e.target
-                    this.input.value = innerText
-                    this.updateForm(innerText)
+                    this.updateInputValue()
                 }
                 let matchResult = []
                 const { focusNode, anchorOffset } = selection || window.getSelection()
@@ -375,19 +383,51 @@
                     this.handleInputBlur()
                 }
             },
+            updateInputValue () {
+                // 获取行内纯文本
+                const divInputDom = this.$el.querySelector('.div-input')
+                let inputValue = divInputDom.textContent
+                if (divInputDom.childNodes.length) {
+                    inputValue = Array.from(divInputDom.childNodes).map(item => {
+                        return item.type === 'button' ? item.value : item.textContent
+                    }).join('')
+                }
+                this.input.value = inputValue
+                this.updateForm(inputValue)
+            },
             // 文本框失焦
             handleInputBlur  (e) {
                 this.$emit('blur')
                 this.input.focus = false
+                // 如果表单项开启了变量免渲染，不以tag展示
+                if (!this.render) return
                 // 支持所有变量（系统变量，内置变量，自定义变量）
-                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
-                const innerHtml = this.input.value.replace(varRegexp, (match) => {
-                    if (this.constantArr.includes(match)) {
-                        return `<span contenteditable="false" class="var-tag" id="${Math.random()}">${match}</span>` // 两边留空格保持间距
+                const varRegexp = /\${([^${}]+)}/g
+                // 获取行内纯文本
+                const divInputDom = this.$el.querySelector('.div-input')
+                let domValue = divInputDom.textContent
+                if (divInputDom.childNodes.length) {
+                    domValue = Array.from(divInputDom.childNodes).map(item => {
+                        return item.type === 'button' ? item.value : item.textContent
+                    }).join('')
+                }
+                const innerHtml = domValue.replace(varRegexp, (match, $0) => {
+                    let isExistVar = false
+                    if ($0) {
+                        isExistVar = this.constantArr.some(item => {
+                            const varText = item.slice(2, -1)
+                            if ($0.indexOf(varText) > -1) {
+                                const regexp = new RegExp(`^(.*\\W|\\W)?${varText}(\\W|\\W.*)?$`)
+                                return regexp.test($0)
+                            }
+                        })
+                    }
+                    if (isExistVar) {
+                        const randomId = Math.random().toString().slice(-6)
+                        return `<input type="button" class="var-tag" id="${randomId}" value=${match} />` // 两边留空格保持间距
                     }
                     return match
                 })
-                const divInputDom = this.$el.querySelector('.div-input')
                 divInputDom.innerHTML = innerHtml
             },
             // 文本框按键事件
@@ -502,9 +542,11 @@
         white-space: nowrap;
         overflow: hidden;
         /deep/.var-tag {
+            margin-right: 1px;
             padding: 0px 4px;
             background: #f0f1f5;
             cursor: pointer;
+            border: none;
             &:hover {
                 background: #eaebf0;
             }
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 838f55b0bc..66e22e2efa 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -11,8 +11,8 @@
 */
 <template>
     <div class="tag-textarea">
-        <div class="rf-form-wrapper" v-if="formMode">
-            <div class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled }">
+        <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"
                     class="div-input"
@@ -47,7 +47,6 @@
                 </div>
             </transition>
         </div>
-        <span v-else class="rf-view-value">{{ viewValue }}</span>
         <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
     </div>
 </template>
@@ -93,7 +92,7 @@
                     focus: false
                 },
                 varList: [],
-                varListPosition: 0,
+                varListPosition: '',
                 hoverKey: '',
                 selection: {},
                 lastEditRange: null
@@ -118,13 +117,6 @@
                     this.varList = val
                 }
             },
-            viewValue () {
-                if (this.value === '' || this.value === undefined) {
-                    return '--'
-                } else {
-                    return this.value
-                }
-            },
             isDisabled () {
                 return !this.editable || !this.formMode || this.disable
             }
@@ -144,9 +136,19 @@
                         const divInputDom = this.$el.querySelector('.div-input')
                         if (divInputDom) {
                             divInputDom.innerText = this.value
+                            this.handleInputBlur()
                         }
                     })
                 }
+            },
+            render (val) {
+                // 如果表单项开启了变量免渲染，不以tag展示
+                if (!val) {
+                    const divInputDom = this.$el.querySelector('.div-input')
+                    divInputDom.innerText = this.value
+                } else {
+                    this.handleInputBlur()
+                }
             }
         },
         created () {
@@ -156,7 +158,11 @@
             const divInputDom = this.$el.querySelector('.div-input')
             if (divInputDom) {
                 divInputDom.innerText = this.value
-                this.handleInputBlur()
+                if (this.render) {
+                    this.handleInputBlur()
+                    // 把用户手动换行变成div标签
+                    divInputDom.innerHTML = divInputDom.innerHTML.replace(/<br>/g, '<div><br></div>')
+                }
             }
         },
         beforeDestroy () {
@@ -201,9 +207,7 @@
                 selection.removeAllRanges()
                 selection.addRange(range)
                 // 更新表单
-                const divInputDom = this.$el.querySelector('.div-input')
-                this.input.value = divInputDom.innerText
-                this.updateForm(divInputDom.innerText)
+                this.updateInputValue()
                 // 清空/关闭
                 this.isListOpen = false
                 this.hoverKey = ''
@@ -219,7 +223,7 @@
                     isVarTagDom = Array.from(varTagDoms).some(item => dom.nodeContains(item, e.target))
                 }
                 if (isVarTagDom) {
-                    const varText = e.target.innerText
+                    const varText = e.target.value
                     const divInputDom = this.$el.querySelector('.div-input')
                     const varTextNode = document.createTextNode(varText)
                     // 替换内容
@@ -249,9 +253,7 @@
             // 文本框输入
             handleInputChange (e, updateForm = true) {
                 if (updateForm) {
-                    const { innerText } = e.target
-                    this.input.value = innerText
-                    this.updateForm(innerText)
+                    this.updateInputValue()
                 }
                 const range = window.getSelection().getRangeAt(0)
                 this.lastEditRange = range
@@ -338,32 +340,69 @@
                     this.handleInputBlur()
                 }
             },
+            updateInputValue () {
+                const divInputDom = this.$el.querySelector('.div-input')
+                const childNodes = Array.from(divInputDom.childNodes).filter(item => item.nodeName !== 'TEXT')
+                const inputValue = childNodes.map(dom => {
+                    // 获取行内纯文本
+                    let domValue = dom.textContent || '\n'
+                    if (dom.childNodes.length) {
+                        domValue = Array.from(dom.childNodes).map(item => {
+                            return item.type === 'button' ? item.value : item.textContent
+                        }).join('')
+                    }
+                    return domValue
+                }).join('\n')
+                this.input.value = inputValue
+                this.updateForm(inputValue)
+            },
             // 文本框失焦
             handleInputBlur  (e) {
                 this.$emit('blur')
                 this.input.focus = false
+                // 如果表单项开启了变量免渲染，不以tag展示
+                if (!this.render) return
                 // 支持所有变量（系统变量，内置变量，自定义变量）
-                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
+                const varRegexp = /\${([^${}]+)}/g
                 const divInputDom = this.$el.querySelector('.div-input')
-                divInputDom.childNodes.forEach(dom => {
-                    const domValue = dom.textContent
-                    const innerHtml = domValue.replace(varRegexp, (match) => {
-                        if (this.constantArr.includes(match)) {
+                const childNodes = Array.from(divInputDom.childNodes).filter(item => item.nodeName !== 'TEXT')
+                childNodes.forEach(dom => {
+                    // 获取行内纯文本
+                    let domValue = dom.textContent
+                    if (dom.childNodes.length) {
+                        domValue = Array.from(dom.childNodes).map(item => {
+                            return item.type === 'button' ? item.value : item.textContent
+                        }).join('')
+                    }
+                    // 支持匹配变量内运算
+                    const innerHtml = domValue.replace(varRegexp, (match, $0) => {
+                        let isExistVar = false
+                        if ($0) {
+                            isExistVar = this.constantArr.some(item => {
+                                const varText = item.slice(2, -1)
+                                if ($0.indexOf(varText) > -1) {
+                                    const regexp = new RegExp(`^(.*\\W|\\W)?${varText}(\\W|\\W.*)?$`)
+                                    return regexp.test($0)
+                                }
+                            })
+                        }
+                        if (isExistVar) {
                             // 两边留空格保持间距
                             const randomId = Math.random().toString().slice(-6)
-                            return `<span class="var-tag" contenteditable="false" id="tag_${randomId}">${match}</span>`
+                            return `<input type="button" class="var-tag" id="tag_${randomId}" value=${match} />`
                         }
                         return match
                     })
+                    // div会将\n解析成<br>标签，需要手动把内容标签下的<br>标签清理掉
+                    if (dom.nodeName !== 'BR' && dom.nextElementSibling?.nodeName === 'BR') {
+                        divInputDom.removeChild(dom.nextElementSibling)
+                    }
                     if (dom.nodeName === '#text') {
                         const newDom = document.createElement('div')
                         newDom.innerHTML = innerHtml
                         divInputDom.replaceChild(newDom, dom)
                     } else if (dom.nodeName === 'DIV') {
                         dom.innerHTML = innerHtml
-                    } else {
-                        const newDom = document.createElement('text')
-                        divInputDom.replaceChild(newDom, dom)
                     }
                 })
             },
@@ -384,6 +423,9 @@
                             this.handleDocumentKeydown(e)
                         }
                         break
+                    case 'Backspace':
+                        this.handleDocumentBackspace(e)
+                        break
                     default:
                         return false
                 }
@@ -412,6 +454,9 @@
                         }
                     }
                 }
+            },
+            handleDocumentBackspace (event) {
+                
             }
         }
     }
@@ -477,9 +522,11 @@
         overflow-y: auto;
         /deep/.var-tag {
             padding: 0px 4px;
+            margin-right: 1px;
             background: #f0f1f5;
             cursor: pointer;
             white-space: nowrap;
+            border: none;
             &:hover {
                 background: #eaebf0;
             }
@@ -489,5 +536,19 @@
             color: #c4c6cc;
         }
     }
+    /deep/.div-input {
+        >div {
+            height: 18px;
+            width: 100%;
+        }
+    }
+    .text-view-mode {
+        padding-left: 0;
+        padding-right: 0;
+        border: none;
+        background: inherit !important;
+        color: inherit !important;
+        cursor: text !important;
+    }
 }
 </style>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 123485ea48..3fc8fb0c32 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -30,7 +30,7 @@
                 </div>
                 <div :class="['scroll-box', { 'subprocess-scroll': subProcessPipeline }]">
                     <div
-                        :class="['sub-process', { 'canvas-expand': canvasExpand }]"
+                        :class="['sub-process']"
                         v-if="subProcessPipeline"
                         v-bkloading="{ isLoading: subprocessLoading, opacity: 1, zIndex: 100 }">
                         <TemplateCanvas
@@ -333,7 +333,6 @@
                 executeRecord: {},
                 subFlowData: {},
                 subCanvasData: {},
-                canvasExpand: false,
                 timer: null,
                 subprocessLoading: true,
                 subprocessTasks: [],
@@ -533,7 +532,7 @@
             this.loadNodeInfo()
             if (this.subProcessPipeline) {
                 this.$nextTick(() => {
-                    this.initCanvasZoom()
+                    this.setCanvasZoomPosition()
                 })
             }
         },
@@ -977,29 +976,31 @@
                 }
             },
             onZoomOut () {
-                const flowDom = this.$el.querySelector('.sub-flow')
-                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
-                this.$refs.subProcessCanvas.onZoomOut({ x: width / 2, y: height / 2 })
+                let jsFlowInstance = this.$refs.subProcessCanvas
+                jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                jsFlowInstance.zoomOut(0.8)
+                this.$nextTick(() => {
+                    this.setCanvasZoomPosition(true)
+                })
             },
             onZoomIn () {
-                const flowDom = this.$el.querySelector('.sub-flow')
-                const { height = 0, width = 0 } = flowDom?.getBoundingClientRect()
-                this.$refs.subProcessCanvas.onZoomIn({ x: width / 2, y: height / 2 })
+                let jsFlowInstance = this.$refs.subProcessCanvas
+                jsFlowInstance = jsFlowInstance.$refs.jsFlow
+                jsFlowInstance.zoomIn(1.2)
+                this.$nextTick(() => {
+                    this.setCanvasZoomPosition(true)
+                })
             },
             onTabChange (name) {
                 this.curActiveTab = name
                 if (['record', 'log'].includes(name)) {
                     this.onSelectExecuteRecord(this.theExecuteRecord)
                 }
-                if (this.canvasExpand) {
-                    // 操作历史数据是动态加载的，需要延时才能准确的滚动到最底部
-                    const time = name === 'history' ? 300 : 0
-                    setTimeout(() => {
-                        const scrollBoxDom = document.querySelector('.scroll-box')
-                        const subProcessCanvasDom = document.querySelector('.sub-process')
-                        const { height = 0 } = subProcessCanvasDom.getBoundingClientRect()
-                        scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
-                    }, time)
+                const { top } = document.querySelector('.execute-info').getBoundingClientRect()
+                const height = 700 + top - window.innerHeight
+                if (height > 0) {
+                    const scrollBoxDom = document.querySelector('.scroll-box')
+                    scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
                 }
             },
             onSelectNode (node) {
@@ -1022,7 +1023,7 @@
                 if (node.isSubProcess || updateCanvas) {
                     this.canvasRandomKey = new Date().getTime()
                     this.$nextTick(() => {
-                        this.initCanvasZoom()
+                        this.setCanvasZoomPosition()
                     })
                 }
                 this.$emit('onClickTreeNode', node)
@@ -1069,7 +1070,8 @@
                 return top > canvasTop && top < canvasTop + height && left > canvasLeft && left < canvasLeft + width
             },
             // 画布初始化时缩放比偏移
-            initCanvasZoom () {
+            setCanvasZoomPosition (zoom) {
+                if (!this.canvasData.locations) return
                 // 获取画布上下左右最大坐标
                 const xList = this.canvasData.locations.map(node => node.x)
                 const yList = this.canvasData.locations.map(node => node.y)
@@ -1085,12 +1087,18 @@
                 const netWidth = maxX - minX + width + 80
                 const subprocessDom = this.$el.querySelector('.sub-process')
                 const { height: canvasHeight, width: canvasWidth } = subprocessDom.getBoundingClientRect()
-                // 最大比例0.75
-                let ratio = Math.min(canvasHeight / netHeight, canvasWidth / netWidth)
-                ratio = ratio > 0.75 ? 0.75 : ratio
+                // 画布实例
                 let jsFlowInstance = this.$refs.subProcessCanvas
                 jsFlowInstance = jsFlowInstance.$refs.jsFlow
-                jsFlowInstance && jsFlowInstance.zoomOut(ratio, 0, 0)
+                let ratio
+                if (zoom) {
+                    ratio = jsFlowInstance.zoom
+                } else {
+                    // 最大比例0.75
+                    ratio = Math.min(canvasHeight / netHeight, canvasWidth / netWidth)
+                    ratio = ratio > 0.75 ? 0.75 : ratio
+                    jsFlowInstance && jsFlowInstance.zoomOut(ratio, 0, 0)
+                }
                 // 设置偏移量
                 const offsetX = canvasWidth / 2 - (minX - 30 + netWidth / 2) * ratio
                 const offsetY = canvasHeight / 2 - (minY + netHeight / 2) * ratio
@@ -1312,7 +1320,7 @@
                         this.$set(nodeActivity, 'pipeline', { ...pipelineTree, taskId })
                         this.canvasRandomKey = new Date().getTime()
                         this.$nextTick(() => {
-                            this.initCanvasZoom()
+                            this.setCanvasZoomPosition()
                         })
                     }
                 } catch (error) {
@@ -1443,7 +1451,6 @@
             handleMousedown (event) {
                 this.updateResizeMaskStyle()
                 this.updateResizeProxyStyle()
-                this.canvasExpand = false
                 document.addEventListener('mousemove', this.handleMouseMove)
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
@@ -1474,7 +1481,6 @@
                 resizeMask.style.display = 'none'
                 const subProcessDom = document.querySelector('.sub-process')
                 subProcessDom.style.height = resizeProxy.style.top
-                this.canvasExpand = true
                 document.removeEventListener('mousemove', this.handleMouseMove)
                 document.removeEventListener('mouseup', this.handleMouseUp)
             }
@@ -1654,16 +1660,10 @@
                 }
             }
         }
-        &.canvas-expand {
-            & + div {
-                .log-section {
-                    height: 768px;
-                }
-            }
-        }
     }
     .execute-info {
         height: 100%;
+        min-height: 700px;
         display: flex;
         flex-direction: column;
         padding-bottom: 0;
@@ -1747,6 +1747,9 @@
         /deep/ .primary-value.code-editor {
             height: 300px;
         }
+        /deep/.log-section {
+            min-height: 758px;
+        }
     }
     .scroll-box {
         flex: 1;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 80aeb626c0..d589db5a33 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -680,6 +680,12 @@
             .rf-group-name {
                 display: none;
             }
+            .rf-tag-label {
+                width: 20%;
+            }
+            .rf-tag-form {
+                margin-left: 20%;
+            }
             
             .hide-render-icon {
                 top: 0;
@@ -693,6 +699,16 @@
                 top: 0;
             }
         }
+        >.rf-form-group {
+            .form-item-group >.rf-form-item {
+                .rf-tag-label {
+                    width: 20%;
+                }
+                .rf-tag-form {
+                    margin-left: 20%;
+                }
+            }
+        }
         .rf-tag-label {
             width: 130px;
             padding-right: 24px;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
index 46d6fd8eb2..ae87860a84 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTree.vue
@@ -49,7 +49,12 @@
             defaultActiveId: {
                 handler (val) {
                     this.activeId = val
-                    const nodeId = val.split('-')[0]
+                    let nodeId = val.split('-')[0]
+                    // 分支条件默认选中特殊处理
+                    if (val.split('-').pop() === 'condition') {
+                        nodeId = val.split('-').slice(0, -1).join('-')
+                        this.activeId = nodeId
+                    }
                     this.setDefaultActiveId(this.treeData, nodeId)
                 },
                 deep: true,
diff --git a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
index 73334925dd..b6dd415732 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/NodeTreeItem.vue
@@ -130,15 +130,9 @@
                 }
             },
             handleClickNode (node) {
-                const { conditionType, children } = node
-                if (conditionType) {
-                    if (conditionType === 'parallel') {
-                        node.expanded = true
-                        return
-                    }
-                    if (children.length === 0) {
-                        return
-                    }
+                if (node.conditionType === 'parallel') {
+                    node.expanded = true
+                    return
                 }
                 if (!node.expanded) {
                     node.expanded = true
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 2028ce31f2..576a4bb4d3 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -1406,11 +1406,18 @@
                 } else {
                     marginLeft = 0
                 }
+                let subprocessStack
+                if (parentId) {
+                    subprocessStack = independentId ? parentId.split(independentId)[1] : parentId
+                    subprocessStack = subprocessStack?.split('-') || []
+                    subprocessStack = subprocessStack.filter(item => item)
+                }
                 const orderedData = [Object.assign({}, startNode, {
                     title: this.$t('开始节点'),
                     name: this.$t('开始节点'),
                     nodeLevel: 1,
                     parentId,
+                    subprocessStack,
                     expanded: false,
                     taskId,
                     style: `margin-left: ${marginLeft}px`
@@ -1420,6 +1427,7 @@
                     name: this.$t('结束节点'),
                     nodeLevel: 1,
                     parentId,
+                    subprocessStack,
                     expanded: false,
                     taskId,
                     style: `margin-left: ${marginLeft}px`
@@ -1548,7 +1556,7 @@
                                 const { name: branchName, evaluate } = nodeConfig.conditions[key]
                                 return {
                                     id: id + '-' + key,
-                                    name: branchName + '-' + key,
+                                    name: branchName,
                                     title: branchName,
                                     value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
@@ -1566,7 +1574,7 @@
                                 // 默认条件置顶
                                 conditions.unshift({
                                     id: id + '-' + flow_id,
-                                    name: branchName + '-' + flow_id,
+                                    name: branchName,
                                     title: branchName,
                                     value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
@@ -1772,6 +1780,7 @@
                 Object.assign(this.nodeTargetMaps, targetMap)
             },
             getGatewayConvergeNodes (id, parentId, convergeInfo = {}, index, isDeep) {
+                if (!id) return
                 if (!convergeInfo[parentId]) {
                     convergeInfo[parentId] = {
                         id: parentId,
@@ -2004,12 +2013,6 @@
                 this.updateNodeActived(id, true)
                 // 如果为子流程节点则需要重置pipelineData的constants
                 this.nodePipelineData = { ...this.nodeTreePipelineData }
-                // 兼容旧版本子流程节点输出数据
-                const selectLocation = this.canvasData.locations.find(item => item.id === id)
-                if (selectLocation?.type === 'subflow') {
-                    const { constants } = this.nodeTreePipelineData.activities[id].pipeline
-                    this.nodePipelineData['constants'] = constants
-                }
                 this.convergeInfo = {}
                 this.nodeIds = {}
                 this.nodeData = this.getOrderedTree(this.completePipelineData)
@@ -2018,8 +2021,8 @@
             onOpenConditionEdit (data, isCondition = true) {
                 if (isCondition && data) {
                     this.onNodeClick(data.nodeId)
-                    // 生成网关添加id 条件name + 分支条件outgoning
-                    this.defaultActiveId = data.name + '-' + data.id
+                    // 生成网关添加id 网关id + 分支条件outgoning + 特殊标识
+                    this.defaultActiveId = data.nodeId + '-' + data.id + '-condition'
                     this.isCondition = true
                     this.isShowConditionEdit = true
                     this.conditionData = { ...data }
@@ -2182,12 +2185,6 @@
                 }
                 // 节点树切换时，如果为子流程节点则需要重置pipelineData的constants
                 this.nodePipelineData = { ...pipelineData }
-                // 兼容旧版本子流程节点输出数据
-                const selectLocation = pipelineData.location.find(item => item.id === id)
-                if (selectLocation?.type === 'subflow') {
-                    const { constants } = pipelineData.activities[id].pipeline
-                    this.nodePipelineData['constants'] = constants
-                }
             },
             // 切换画布视图
             async switchCanvasView (nodeActivities, isRootNode = false) {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index ab366b7962..4d2569ba63 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -14,7 +14,12 @@
         <div :class="['variable-content', { 'view-model': isViewMode }]" @click="onEditVariable(variableData.key, variableData.index)">
             <i v-if="!isSystemVar && !isProjectVar && !showCitedList" class="col-item-drag common-icon-drawable f16"></i>
             <span v-if="!isViewMode && !isSystemVar && !isProjectVar" @click.stop class="col-item-checkbox">
-                <bk-checkbox :disabled="isComponentVar" :value="variableChecked" @change="onChooseVariable"></bk-checkbox>
+                <bk-checkbox
+                    :disabled="isComponentVar"
+                    :value="variableChecked"
+                    v-bk-tooltips="{ content: $t('该类型仅支持从节点配置取消引用'), disabled: !isComponentVar }"
+                    @change="onChooseVariable">
+                </bk-checkbox>
             </span>
             <i v-if="isSystemVar" class="variable-icon common-icon-lock-disable"></i>
             <i v-if="isProjectVar" class="variable-icon common-icon-paper"></i>
@@ -99,8 +104,8 @@
                     <i class="bk-icon icon-more"></i>
                     <template slot="content">
                         <p
-                            :class="['operate-item', { 'disabled': isComponentVar }]"
-                            v-bk-tooltips="{ content: $t('该类型仅支持从节点配置生成变量'), disabled: !isComponentVar }"
+                            v-if="!isComponentVar"
+                            class="operate-item"
                             @click.stop="onCloneVariable()">
                             {{ $t('克隆') }}
                         </p>
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index 1a7b183f5e..0b2d8a277a 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -312,7 +312,9 @@
                 return this.deleteVarList.length
             },
             editVarList () {
-                return this.variableList.filter(item => item.source_type !== 'system' && item.source_type !== 'project')
+                return this.variableList.filter(item => {
+                    return !['system', 'project', 'component_outputs', 'component_inputs'].includes(item.source_type)
+                })
             }
         },
         watch: {
@@ -737,8 +739,11 @@
         }
     }
 }
+/deep/.bk-sideslider-content {
+    height: calc(100% - 60px);
+}
 .global-variable-panel {
-    height: calc(100vh - 60px);
+    height: 100%;
     .is-hidden {
         transform: scale(0)
     }

From 8690ca2cb240866444ad88056455177ecfd0e850 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Wed, 30 Aug 2023 14:19:12 +0800
Subject: [PATCH 052/112] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A1=86=E8=87=AA?=
 =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20(#7032)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       | 36 +++++++------------
 .../common/RenderForm/tags/TagTextarea.vue    |  8 ++---
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  6 ++--
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index f079b90797..803e33b69e 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -262,29 +262,21 @@
                 if (isVarTagDom) {
                     const varText = e.target.value
                     const divInputDom = this.$el.querySelector('.div-input')
-                    // 记录光标的位置
-                    const selection = window.getSelection()
-                    const varTextOffset = selection.anchorOffset
-                    // 上一个相邻的tag
-                    const tagNodes = Array.from(divInputDom.childNodes).filter(item => item.nodeName !== '#text')
-                    const index = tagNodes.findIndex(item => item.id === e.target.id)
-                    const previousTagDom = tagNodes[index - 1]
+                    const varTextNode = document.createTextNode(varText)
                     // 替换内容
-                    divInputDom.innerHTML = divInputDom.innerHTML.replace(e.target.outerHTML, varText)
-                    // 变量左侧文本的长度
-                    let startToVarTextLength = 0
-                    let previousDom = null
-                    // 选取符合条件的文本节点
-                    const textNode = Array.from(divInputDom.childNodes).find(item => {
-                        const previousDomMatch = previousTagDom ? previousTagDom.id === previousDom?.id : true
-                        if (previousDomMatch && item.nodeName === '#text' && item.textContent.indexOf(varText) > -1) {
-                            startToVarTextLength = item.textContent.split(varText)[0].length
+                    Array.from(divInputDom.childNodes).some(node => {
+                        if (node.id === e.target.id) {
+                            divInputDom.replaceChild(varTextNode, node)
                             return true
                         }
-                        previousDom = item
-                        return false
                     })
-                    selection.collapse(textNode, startToVarTextLength + varTextOffset)
+                    const selection = window.getSelection()
+                    const range = document.createRange()
+                    range.selectNodeContents(varTextNode)
+                    range.setStart(varTextNode, varTextNode.length)
+                    range.collapse(true)
+                    selection.removeAllRanges()
+                    selection.addRange(range)
                 } else if (this.input.value) {
                     this.handleInputChange(e)
                 }
@@ -331,11 +323,7 @@
                     matchResult = [matchText]
                 }
                 if (matchResult && matchResult[0]) {
-                    const regStr = matchResult[0].replace(/[\$\{\}]/g, '\\$&')
-                    const inputReg = new RegExp(regStr)
-                    this.varList = this.constantArr.filter(item => {
-                        return inputReg.test(item)
-                    })
+                    this.varList = this.constantArr.filter(item => item.indexOf(matchText) > -1)
                     // 计算变量下拉列表的left
                     this.isListOpen = false
                     if (this.varList.length) {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 66e22e2efa..a61fc760f1 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -269,18 +269,14 @@
                     previousText = lastNode.textContent
                 }
                 const matchText = previousText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
-                // 如果是完整全局变量则不进行手续操作
+                // 如果是完整全局变量则不进行后续操作
                 if (/^\$\{\w+\}$/.test(matchText)) {
                     this.isListOpen = false
                     return
                 }
                 // 判断是否为变量格式
                 if (matchText === '$' || /^\${[a-zA-Z_]*[\w|.]*/.test(matchText)) {
-                    const regStr = matchText.replace(/[\$\{\}]/g, '\\$&')
-                    const inputReg = new RegExp(regStr)
-                    this.varList = this.constantArr.filter(item => {
-                        return inputReg.test(item)
-                    })
+                    this.varList = this.constantArr.filter(item => item.indexOf(matchText) > -1)
                     // 计算变量下拉列表的坐标
                     this.isListOpen = false
                     if (this.varList.length) {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 3fc8fb0c32..153afb6164 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -997,9 +997,9 @@
                     this.onSelectExecuteRecord(this.theExecuteRecord)
                 }
                 const { top } = document.querySelector('.execute-info').getBoundingClientRect()
-                const height = 700 + top - window.innerHeight
-                if (height > 0) {
-                    const scrollBoxDom = document.querySelector('.scroll-box')
+                const scrollBoxDom = document.querySelector('.scroll-box')
+                const height = window.innerHeight - top
+                if (height < 700) {
                     scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
                 }
             },

From 016aaba69baec23b84143fcf8676e8f5b1f243ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:28:35 +0800
Subject: [PATCH 053/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99&&=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=89=A7=E8=A1=8C=E6=96=B9=E6=A1=88=E6=9C=AA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=88=B7=E6=96=B0unique=5Fid=E7=9A=84=E5=80=BC=20(#70?=
 =?UTF-8?q?27)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bugfix: 修复节点预览报错&&更新执行方案未正确刷新unique_id的值

* bugfix: 修复代码问题
---
 gcloud/tasktmpl3/domains/constants.py         | 20 ++-----------------
 .../apis/drf/viewsets/template_scheme.py      | 11 ++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index ea70952d2f..4b73d75a13 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -114,6 +114,7 @@ def get_need_render_context_keys():
             return keys
 
     need_render_context_keys = get_need_render_context_keys()
+
     context_values = [
         ContextValue(key=key, type=VAR_CONTEXT_MAPPING[info["type"]], value=info["value"], code=info.get("custom_type"))
         for key, info in list(pipeline["data"].get("inputs", {}).items()) + list(parent_params.items())
@@ -131,24 +132,7 @@ def get_need_render_context_keys():
         param_data = {key: info["value"] for key, info in pipeline["activities"][subprocess]["params"].items()}
         # 获取子流程的参数
         hydrated_param_data = Template(param_data).render(parent_hydrated_context)
-        child_inputs = child_pipeline.get("data").get("inputs")
-        # 需要提前渲染好子流程参数的值
-        subprocess_context_values = [
-            ContextValue(
-                key=key,
-                type=VAR_CONTEXT_MAPPING[child_inputs.get(key)["type"]],
-                value=value,
-                code=child_inputs.get(key).get("custom_type"),
-            )
-            for key, value in hydrated_param_data.items()
-        ]
-
-        subprocess_context = Context(runtime, subprocess_context_values, root_pipeline_data)
-        subprocess_hydrated_context = subprocess_context.hydrate(deformat=True)
-        # 此时已经准备好了子流程所有的输出，到下一层递归时，由于parent_params在inputs之后被处理，所以parent_params会更新最终的值
-        formatted_param_data = {
-            "${" + key + "}": {"value": value, "type": "plain"} for key, value in subprocess_hydrated_context.items()
-        }
+        formatted_param_data = {key: {"value": value, "type": "plain"} for key, value in hydrated_param_data.items()}
 
         return preview_node_inputs(
             runtime=runtime,
diff --git a/gcloud/template_base/apis/drf/viewsets/template_scheme.py b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
index ef16b5ff2e..cdeb8b3dea 100644
--- a/gcloud/template_base/apis/drf/viewsets/template_scheme.py
+++ b/gcloud/template_base/apis/drf/viewsets/template_scheme.py
@@ -267,6 +267,17 @@ def create(self, request, *args, **kwargs):
 
         return Response(serializer.data, status=status.HTTP_201_CREATED)
 
+    def update(self, request, *args, **kwargs):
+        partial = kwargs.pop("partial", False)
+        instance = self.get_object()
+        template_id = instance.unique_id.split("-")[0]
+        serializer = self.get_serializer(instance, data=request.data, partial=partial)
+        serializer.is_valid(raise_exception=True)
+        # 防止用户不传name
+        instance.unique_id = "{}-{}".format(template_id, serializer.validated_data.get("name") or instance.name)
+        self.perform_update(serializer)
+        return Response(serializer.data)
+
     def destroy(self, request, *args, **kwargs):
 
         scheme = self.get_object()

From 7945ae9fe4b9f56d6d59c694c1f1bd336db927ab Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 31 Aug 2023 10:50:19 +0800
Subject: [PATCH 054/112] =?UTF-8?q?optimization:=20=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E5=90=8E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4&&=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85tab=E5=88=87=E6=8D=A2=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/task/TaskCreate/EditTaskScheme.vue  |  2 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  7 -------
 .../desktop/src/pages/task/TaskList/index.vue |  3 ++-
 .../TabGlobalVariables/VariableEdit.vue       | 20 +++++++++----------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
index 2e8f6cbe4c..fe44196f47 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/EditTaskScheme.vue
@@ -648,7 +648,7 @@
                         isCommon: this.isCommonProcess,
                         id: scheme.id
                     })
-                    if (!resp.result) return
+                    if (resp.result === false) return
                     const index = this.schemeList.findIndex(item => item.id === scheme.id)
                     this.schemeList.splice(index, 1)
                     // 删除方案后，画布按编辑前选中的方案来勾选节点
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 153afb6164..0599e4ddfa 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -996,12 +996,6 @@
                 if (['record', 'log'].includes(name)) {
                     this.onSelectExecuteRecord(this.theExecuteRecord)
                 }
-                const { top } = document.querySelector('.execute-info').getBoundingClientRect()
-                const scrollBoxDom = document.querySelector('.scroll-box')
-                const height = window.innerHeight - top
-                if (height < 700) {
-                    scrollBoxDom.scrollTo({ top: height, behavior: 'smooth' })
-                }
             },
             onSelectNode (node) {
                 this.loading = true
@@ -1663,7 +1657,6 @@
     }
     .execute-info {
         height: 100%;
-        min-height: 700px;
         display: flex;
         flex-direction: column;
         padding-bottom: 0;
diff --git a/frontend/desktop/src/pages/task/TaskList/index.vue b/frontend/desktop/src/pages/task/TaskList/index.vue
index 1ee371bb25..95e136608d 100644
--- a/frontend/desktop/src/pages/task/TaskList/index.vue
+++ b/frontend/desktop/src/pages/task/TaskList/index.vue
@@ -764,7 +764,8 @@
                 if (this.deletaLoading) return
                 this.deletaLoading = true
                 try {
-                    await this.deleteTask(taskId)
+                    const resp = await this.deleteTask(taskId)
+                    if (resp.result === false) return
                     // 最后一页最后一条删除后，往前翻一页
                     if (
                         this.pagination.current > 1
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
index ad12003a5e..ab0e058a1b 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
@@ -68,7 +68,7 @@
                     <pre class="variable-type-desc" v-if="variableDesc">{{ variableDesc }}</pre>
                 </div>
                 <!-- 验证规则 -->
-                <div v-show="['input', 'textarea'].includes(theEditingData.custom_type) && !isInternalVal" class="form-item clearfix">
+                <div v-show="theEditingData.custom_type === 'input' && !isInternalVal" class="form-item clearfix">
                     <label class="form-label">{{ $t('正则校验') }}</label>
                     <div class="form-content">
                         <bk-input
@@ -277,7 +277,7 @@
                 varTypeListLoading: false,
                 varTypeList: [], // 变量类型，input、textarea、datetime 等
                 varTypeData: {},
-                inputRegexp: '', // input，textarea类型正则
+                inputRegexp: '', // input类型正则
                 atomConfigLoading: false,
                 atomTypeKey: '',
                 stringLength: STRING_LENGTH,
@@ -564,7 +564,7 @@
                 if (is_meta && source_type === 'component_inputs' && config.meta_transform) {
                     config = config.meta_transform(meta)
                 }
-                if (['input', 'textarea'].includes(custom_type)) {
+                if (custom_type === 'input') {
                     config.attrs.validation.push({
                         type: 'regex',
                         args: this.getInputDefaultValueValidation(),
@@ -628,13 +628,13 @@
 
                 // 隐藏状态下，默认值为必填项
                 // 输入框显示类型为隐藏时，按照正则规则校验，去掉必填项校验
-                if (show_type === 'show' || (show_type === 'hide' && ['input', 'textarea'].includes(custom_type))) {
+                if (show_type === 'show' || (show_type === 'hide' && custom_type === 'input')) {
                     return validateSet.slice(1)
                 } else {
                     return validateSet
                 }
             },
-            // input/textarea 表单默认校验规则
+            // input 表单默认校验规则
             getInputDefaultValueValidation () {
                 let validation = this.theEditingData.validation
                 if (this.theEditingData.show_type === 'show') {
@@ -649,8 +649,8 @@
                     ? { set_module_ip_selector: tools.deepClone(this.renderData['ip_selector']) }
                     : tools.deepClone(this.renderData)
                 Object.assign(this.varTypeData, valData)
-                // 将input textarea类型正则存起来
-                if (['input', 'textarea'].includes(oldValue)) {
+                // 将input类型正则存起来
+                if (oldValue === 'input') {
                     this.inputRegexp = this.theEditingData.validation
                 }
                 let data
@@ -667,8 +667,8 @@
                 } else {
                     this.renderData = {}
                 }
-                // input textarea类型需要正则校验
-                if (['input', 'textarea'].includes(val)) {
+                // input类型需要正则校验
+                if (val === 'input') {
                     this.theEditingData.validation = this.inputRegexp || '^.+$'
                 } else {
                     this.theEditingData.validation = ''
@@ -709,7 +709,7 @@
                 const validateSet = this.getValidateSet()
                 this.$set(this.renderOption, 'validateSet', validateSet)
 
-                if (['input', 'textarea'].includes(this.theEditingData.custom_type)) {
+                if (this.theEditingData.custom_type === 'input') {
                     const config = tools.deepClone(this.renderConfig[0])
                     const regValidate = config.attrs.validation.find(item => item.type === 'regex')
                     regValidate.args = this.getInputDefaultValueValidation()

From 4dde79234d59687984d23dc301512aa54160b468 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 31 Aug 2023 16:27:50 +0800
Subject: [PATCH 055/112] =?UTF-8?q?sprintfix:=20=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8F=92=E4=BB=B6=20Proxy=20os=20=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atoms/nodeman/create_task/v4_0.js          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index 847d333e00..de8d830beb 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -25,6 +25,18 @@
 
 
     function init_columns(self, node_type, op_type) {
+
+        // Proxy 仅支持 Linux
+        let os_type_options = [
+            {value: "LINUX", text: gettext("LINUX")}
+        ];
+        if (node_type === "AGENT") {
+            os_type_options.push(...[
+                {value: "WINDOWS", text: gettext("WINDOWS")},
+                {value: "AIX", text: gettext("AIX")}
+            ]);
+        }
+
         let common_columns = [
             {
                 tag_code: "nodeman_bk_cloud_id",
@@ -93,11 +105,7 @@
                 attrs: {
                     name: gettext("操作系统类型"),
                     width: "180px",
-                    items: [
-                        {value: "LINUX", text: gettext("LINUX")},
-                        {value: "WINDOWS", text: gettext("WINDOWS")},
-                        {value: "AIX", text: gettext("AIX")}
-                    ],
+                    items: os_type_options,
                     default: "LINUX",
                     validation: [
                         {

From fa4acb5b32303fc940e54c7baf0facbba3303d28 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Fri, 1 Sep 2023 11:21:31 +0800
Subject: [PATCH 056/112] =?UTF-8?q?optimization:=20=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA=E6=98=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=B1=E7=88=B6=E4=BB=BB=E5=8A=A1=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/contrib/operate_record/constants.py    |  1 +
 .../collections/subprocess_plugin/v1_0_0.py   | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/gcloud/contrib/operate_record/constants.py b/gcloud/contrib/operate_record/constants.py
index 47ad5ff534..52c4fcef77 100644
--- a/gcloud/contrib/operate_record/constants.py
+++ b/gcloud/contrib/operate_record/constants.py
@@ -46,6 +46,7 @@ class OperateSource(Enum):
 
     app = _("app 页面")
     api = _("api 接口")
+    parent = _("父任务")
 
     # 模版来源
     project = _("项目流程")
diff --git a/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py b/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
index 7d0219f25e..d513790c48 100644
--- a/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
+++ b/pipeline_plugins/components/collections/subprocess_plugin/v1_0_0.py
@@ -30,6 +30,9 @@
 
 from gcloud.common_template.models import CommonTemplate
 from gcloud.constants import NON_COMMON_TEMPLATE_TYPES, PROJECT
+from gcloud.contrib.operate_record.constants import OperateSource, OperateType, RecordType
+from gcloud.contrib.operate_record.signal import operate_record_signal
+from gcloud.contrib.operate_record.utils import extract_extra_info
 from gcloud.core.models import EngineConfig, Project
 from gcloud.taskflow3.domains.auto_retry import AutoRetryNodeStrategyCreator
 from gcloud.taskflow3.models import TaskCallBackRecord, TaskFlowInstance, TaskFlowRelation, TimeoutNodeConfig
@@ -192,10 +195,33 @@ def execute(self, data, parent_data):
                 pipeline_tree=task.pipeline_instance.execution_data,
             )
 
+            # 记录操作流水
+            pipeline_constants = pipeline_instance.execution_data.get("constants")
+            extra_info = extract_extra_info(pipeline_constants)
+            operate_record_signal.send(
+                sender=RecordType.task.name,
+                operator="system",
+                operate_type=OperateType.create.name,
+                operate_source=OperateSource.parent.name,
+                instance_id=task.id,
+                project_id=task.project_id,
+                extra_info=extra_info,
+            )
+
         task.task_action("start", parent_task.executor)
         data.set_outputs("task_id", task.id)
         data.set_outputs("task_url", task.url)
         data.set_outputs("task_name", task.name)
+
+        # 记录操作流水
+        operate_record_signal.send(
+            sender=RecordType.task.name,
+            operator="system",
+            operate_type=OperateType.start.name,
+            operate_source=OperateSource.parent.name,
+            instance_id=task.id,
+            project_id=task.project_id,
+        )
         return True
 
     def schedule(self, data, parent_data, callback_data=None):

From c94c968b87370ba2d3ae96d1ec08035a9171e4c0 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Thu, 31 Aug 2023 21:39:26 +0800
Subject: [PATCH 057/112] =?UTF-8?q?bugfix:=20=E5=8F=AA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E8=8A=82=E7=82=B9=E7=9A=84=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6&=E6=94=AF=E6=8C=81=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E5=8F=82=E6=95=B0=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/tasktmpl3/domains/constants.py | 51 ++++++++++++---------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index 4b73d75a13..3913770074 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -85,35 +85,23 @@ def preview_node_inputs(
     def get_need_render_context_keys():
         keys = set()
         # 如果遇到子流程，到最后一层才会实际去解析需要渲染的变量
-        if subprocess_stack:
-            subprocess = subprocess_stack[0]
-            param_data = {key: info["value"] for key, info in pipeline["activities"][subprocess]["params"].items()}
-            for value in param_data.values():
-                if isinstance(value, str):
-                    for value in var_pattern.findall(value):
-                        keys.add("${" + value + "}")
-            return keys
-
         node_info = pipeline["activities"][node_id]
+        inputs_values = node_info.get("component", {}).get("inputs", {}).values()
+        for item in inputs_values:
+            if not item["need_render"]:
+                continue
+            if isinstance(item["value"], str):
+                for value in var_pattern.findall(item["value"]):
+                    keys.add("${" + value + "}")
+        return keys
 
-        if node_info["type"] == "SubProcess":
-            inputs_values = node_info.get("pipeline", {}).get("data", {}).get("inputs").values()
-            for item in inputs_values:
-                if isinstance(item["value"], str):
-                    for value in var_pattern.findall(item["value"]):
-                        keys.add("${" + value + "}")
-            return keys
-        else:
-            inputs_values = node_info.get("component", {}).get("inputs", {}).values()
-            for item in inputs_values:
-                if not item["need_render"]:
-                    continue
-                if isinstance(item["value"], str):
-                    for value in var_pattern.findall(item["value"]):
-                        keys.add("${" + value + "}")
-            return keys
-
-    need_render_context_keys = get_need_render_context_keys()
+    node_type = pipeline["activities"][node_id]["type"]
+    node_code = pipeline["activities"][node_id].get("component", {}).get("code")
+    # 只优化普通节点的渲染过程
+    if node_type == NodeType.ServiceActivity.value and node_code != "subprocess_plugin":
+        need_render_context_keys = get_need_render_context_keys()
+    else:
+        need_render_context_keys = list(pipeline["data"].get("inputs", {}).keys()) + list(parent_params.keys())
 
     context_values = [
         ContextValue(key=key, type=VAR_CONTEXT_MAPPING[info["type"]], value=info["value"], code=info.get("custom_type"))
@@ -143,9 +131,14 @@ def get_need_render_context_keys():
             parent_params=formatted_param_data,
         )
 
-    node_type = pipeline["activities"][node_id]["type"]
     if node_type == NodeType.ServiceActivity.value:
-        raw_inputs = pipeline["activities"][node_id]["component"]["inputs"]
+        # 如果是独立子流程
+        if node_code == "subprocess_plugin":
+            raw_inputs = pipeline["activities"][node_id]["component"]["inputs"]["subprocess"]["value"]["pipeline"][
+                "constants"
+            ]
+        else:
+            raw_inputs = pipeline["activities"][node_id]["component"]["inputs"]
     elif node_type == NodeType.SubProcess.value:
         raw_inputs = pipeline["activities"][node_id]["params"]
     else:

From 260675be5887dcde353b088894e7f8bf771d05d0 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Tue, 5 Sep 2023 15:32:55 +0800
Subject: [PATCH 058/112] =?UTF-8?q?bugfix:=20=E4=BC=98=E5=8C=96=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E8=BF=90=E8=A1=8C=E4=B9=8B=E5=90=8E=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=AD=90=E6=B5=81=E7=A8=8B=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/taskflow3/domains/dispatchers/node.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gcloud/taskflow3/domains/dispatchers/node.py b/gcloud/taskflow3/domains/dispatchers/node.py
index b310dc3777..0e6dbdb88a 100644
--- a/gcloud/taskflow3/domains/dispatchers/node.py
+++ b/gcloud/taskflow3/domains/dispatchers/node.py
@@ -475,6 +475,8 @@ def get_node_data_v2(
             node_id=self.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
         )
 
+        node_code = node_info.get("component", {}).get("code")
+
         if state:
             # 获取最新的执行数据
             if loop is None or int(loop) >= state[self.node_id]["loop"]:
@@ -502,6 +504,9 @@ def get_node_data_v2(
                 if node_info["type"] == "SubProcess":
                     # remove prefix '${' and subfix '}' in subprocess execution input
                     inputs = {k[2:-1]: v for k, v in data["inputs"].items()}
+                elif node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                    raw_inputs = data["inputs"]["subprocess"]["pipeline"]["constants"]
+                    inputs = {key[2:-1]: value.get("value") for key, value in raw_inputs.items()}
                 else:
                     inputs = data["inputs"]
                 outputs = data["outputs"]
@@ -576,6 +581,8 @@ def get_node_data_v2(
                 if node_info["type"] == "SubProcess":
                     # remove prefix '${' and subfix '}' in subprocess execution input
                     inputs = {k[2:-1]: v for k, v in preview_inputs.items()}
+                elif node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                    inputs = {k[2:-1]: v for k, v in preview_inputs.items()}
                 else:
                     inputs = preview_inputs
 

From d2aa6dee359b04115ab4b0e5cfb4b2a5bb82ff19 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 3 Aug 2023 15:03:25 +0800
Subject: [PATCH 059/112] =?UTF-8?q?feature:=20=E5=9B=BD=E5=AF=86=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/default.py                             | 36 ++++++++++++++++++
 config/sites/community/ver_settings.py        | 23 +++++++++++-
 config/sites/enterprise/ver_settings.py       | 25 ++++++++++++-
 env.py                                        |  4 ++
 env_v2.py                                     |  2 +
 env_v3.py                                     |  2 +
 .../desktop/src/assets/html/index-dev.html    |  3 ++
 frontend/desktop/src/assets/html/index.html   |  3 ++
 gcloud/core/context_processors.py             | 11 +++++-
 gcloud/utils/crypto.py                        | 37 ++++++++++++++++++-
 .../atoms/nodeman/create_task/v4_0.js         |  2 +
 pipeline_plugins/components/utils/common.py   | 16 +-------
 .../variables/collections/common.py           | 13 ++++---
 requirements.txt                              |  1 +
 14 files changed, 153 insertions(+), 25 deletions(-)

diff --git a/config/default.py b/config/default.py
index 8c01f8bdd3..5d302cd9e9 100644
--- a/config/default.py
+++ b/config/default.py
@@ -16,6 +16,8 @@
 from urllib.parse import urlparse
 
 from bamboo_engine.config import Settings as BambooSettings
+from bkcrypto.asymmetric.options import RSAAsymmetricOptions
+from bkcrypto.symmetric.options import AESSymmetricOptions, SM4SymmetricOptions
 from blueapps.conf.default_settings import *  # noqa
 from blueapps.conf.log import get_logging_config_dict
 from blueapps.opentelemetry.utils import inject_logging_trace_info
@@ -25,6 +27,8 @@
 import env
 from gcloud.exceptions import ApiRequestError
 
+from bkcrypto import constants as bkcrypto_constants
+
 # 这里是默认的 INSTALLED_APPS，大部分情况下，不需要改动
 # 如果你已经了解每个默认 APP 的作用，确实需要去掉某些 APP，请去掉下面的注释，然后修改
 # INSTALLED_APPS = (
@@ -789,3 +793,35 @@ def check_engine_admin_permission(request, *args, **kwargs):
 
 
 PIPELINE_ENGINE_ADMIN_API_PERMISSION = "config.default.check_engine_admin_permission"
+
+
+BKCRYPTO = {
+    "ASYMMETRIC_CIPHERS": {
+        "default": {
+            "get_key_config": "gcloud.utils.crypto.get_default_asymmetric_key_config",
+            "cipher_options": {
+                bkcrypto_constants.AsymmetricCipherType.RSA.value: RSAAsymmetricOptions(
+                    padding=bkcrypto_constants.RSACipherPadding.PKCS1_v1_5
+                )
+            },
+        },
+    },
+}
+
+# 加密
+if env.BKAPP_CRYPTO_TYPE == "SHANGMI":
+    BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value
+    BKCRYPTO.update(
+        {
+            "ASYMMETRIC_CIPHER_TYPE": BKCRYPTO_ASYMMETRIC_CIPHER_TYPE,
+            "SYMMETRIC_CIPHER_TYPE": bkcrypto_constants.SymmetricCipherType.SM4.value,
+        }
+    )
+else:
+    BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.RSA.value
+    BKCRYPTO.update(
+        {
+            "ASYMMETRIC_CIPHER_TYPE": BKCRYPTO_ASYMMETRIC_CIPHER_TYPE,
+            "SYMMETRIC_CIPHER_TYPE": bkcrypto_constants.SymmetricCipherType.AES.value,
+        }
+    )
diff --git a/config/sites/community/ver_settings.py b/config/sites/community/ver_settings.py
index f799638d9a..307c7af1ba 100644
--- a/config/sites/community/ver_settings.py
+++ b/config/sites/community/ver_settings.py
@@ -37,7 +37,6 @@
 LOah9mmRwLJdcfa3Js+jw2lOCmxzqauYZHVHg/hH7g==
 -----END RSA PRIVATE KEY-----
 """
-RSA_PRIV_KEY = base64.b64decode(env.RSA_PRIV_KEY).decode("utf-8") if env.RSA_PRIV_KEY else DEFAULT_RSA_PRIV_KEY
 
 # PUB_KEY for frontend, which can not use three quotes
 DEFAULT_RSA_PUB_KEY = (
@@ -49,8 +48,30 @@
     + "-----END PUBLIC KEY-----"
 )
 
+RSA_PRIV_KEY = base64.b64decode(env.RSA_PRIV_KEY).decode("utf-8") if env.RSA_PRIV_KEY else DEFAULT_RSA_PRIV_KEY
 RSA_PUB_KEY = base64.b64decode(env.RSA_PUB_KEY).decode("utf-8") if env.RSA_PUB_KEY else DEFAULT_RSA_PUB_KEY
 
+
+DEFAULT_SM2_PRIV_KEY = """
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICI+zMQDiQ5/xXmnGxGqLSD++Cp+I601cIFLKRd2yrGBoAoGCCqBHM9V
+AYItoUQDQgAE95+i3TAfODAzb9QhJmyUmxH/HocisveqkrafHJ25NO/uCtkb2yXH
+vrZcCDmoxeO+z5vp88jN/ulVsl9qEqm6vQ==
+-----END EC PRIVATE KEY-----
+"""
+
+
+DEFAULT_SM2_PUB_KEY = (
+    "-----BEGIN PUBLIC KEY-----\\n"
+    + "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE95+i3TAfODAzb9QhJmyUmxH/Hoci\\n"
+    + "sveqkrafHJ25NO/uCtkb2yXHvrZcCDmoxeO+z5vp88jN/ulVsl9qEqm6vQ==\\n"
+    + "-----END PUBLIC KEY-----"
+)
+
+
+SM2_PRIV_KEY = base64.b64decode(env.RSA_PRIV_KEY).decode("utf-8") if env.RSA_PRIV_KEY else DEFAULT_RSA_PRIV_KEY
+SM2_PUB_KEY = base64.b64decode(env.RSA_PUB_KEY).decode("utf-8") if env.RSA_PUB_KEY else DEFAULT_SM2_PUB_KEY
+
 # APIGW Auth
 APIGW_APP_CODE_KEY = "bk_app_code"
 APIGW_USER_USERNAME_KEY = "bk_username"
diff --git a/config/sites/enterprise/ver_settings.py b/config/sites/enterprise/ver_settings.py
index 4270ab010c..d109cf0de2 100644
--- a/config/sites/enterprise/ver_settings.py
+++ b/config/sites/enterprise/ver_settings.py
@@ -37,7 +37,6 @@
 T8ow3nMSbvx5X28wOjbk04tmfM/kVqcVhFWhDHjHZzlt
 -----END RSA PRIVATE KEY-----
 """
-RSA_PRIV_KEY = base64.b64decode(env.RSA_PRIV_KEY).decode("utf-8") if env.RSA_PRIV_KEY else DEFAULT_RSA_PRIV_KEY
 
 # PUB_KEY for frontend, which can not use three quotes
 DEFAULT_RSA_PUB_KEY = (
@@ -48,7 +47,31 @@
     + "iymoAVK67gfTOTvckQIDAQAB\\n"
     + "-----END PUBLIC KEY-----"
 )
+
 RSA_PUB_KEY = base64.b64decode(env.RSA_PUB_KEY).decode("utf-8") if env.RSA_PUB_KEY else DEFAULT_RSA_PUB_KEY
+RSA_PRIV_KEY = base64.b64decode(env.RSA_PRIV_KEY).decode("utf-8") if env.RSA_PRIV_KEY else DEFAULT_RSA_PRIV_KEY
+
+
+DEFAULT_SM2_PRIV_KEY = """
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIn5SYKHr3+m/XyC/ECzDJYuwUoTQHDUkIueKFXTjhSBoAoGCCqBHM9V
+AYItoUQDQgAEYxBE08d8yEEK2+DZ7F5RsNrUvCZ578lkYsXFDC1fW2IcRecNz8LG
+ZWSZGFfgYMeK1f3fIuYBAJVuna/V3FP4tA==
+-----END EC PRIVATE KEY-----
+"""
+
+
+DEFAULT_SM2_PUB_KEY = (
+    "-----BEGIN PUBLIC KEY-----\\n"
+    + "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEYxBE08d8yEEK2+DZ7F5RsNrUvCZ5\\n"
+    + "78lkYsXFDC1fW2IcRecNz8LGZWSZGFfgYMeK1f3fIuYBAJVuna/V3FP4tA==\\n"
+    + "-----END PUBLIC KEY-----"
+)
+
+
+SM2_PRIV_KEY = base64.b64decode(env.SM2_PRIV_KEY).decode("utf-8") if env.SM2_PRIV_KEY else DEFAULT_SM2_PRIV_KEY
+SM2_PUB_KEY = base64.b64decode(env.SM2_PUB_KEY).decode("utf-8") if env.SM2_PUB_KEY else DEFAULT_SM2_PUB_KEY
+
 
 # APIGW Auth
 APIGW_APP_CODE_KEY = "bk_app_code"
diff --git a/env.py b/env.py
index f77124aabd..43db006dd3 100644
--- a/env.py
+++ b/env.py
@@ -108,3 +108,7 @@
 
 # 获取 PaaS 注入的蓝鲸域名
 BKPAAS_BK_DOMAIN = os.getenv("BKPAAS_BK_DOMAIN", "") or os.getenv("BK_DOMAIN", "")
+
+
+# 获取加密类型
+BKAPP_CRYPTO_TYPE = os.getenv("BK_CRYPTO_TYPE") or os.getenv("BKAPP_CRYPTO_TYPE") or "CLASSIC"
diff --git a/env_v2.py b/env_v2.py
index 1e1c3d88d2..5d772a65cd 100644
--- a/env_v2.py
+++ b/env_v2.py
@@ -136,6 +136,8 @@
 # RSA KEYS, 保存的是密钥的base64加密形式, 使用base64.b64encode(KEY.encode("utf-8"))进行处理后保存为环境变量
 RSA_PRIV_KEY = os.getenv("BKAPP_RSA_PRIV_KEY", None)
 RSA_PUB_KEY = os.getenv("BKAPP_RSA_PUB_KEY", None)
+SM2_PRIV_KEY = os.getenv("BKAPP_SM2_PRIV_KEY", None)
+SM2_PUB_KEY = os.getenv("BKAPP_SM2_PUB_KEY", None)
 
 # 单业务下最大周期任务数量
 PERIODIC_TASK_PROJECT_MAX_NUMBER = int(os.getenv("BKAPP_PERIODIC_TASK_PROJECT_MAX_NUMBER", 50))
diff --git a/env_v3.py b/env_v3.py
index a3132e3f4a..44a0965753 100644
--- a/env_v3.py
+++ b/env_v3.py
@@ -167,6 +167,8 @@
 # RSA KEYS, 保存的是密钥的base64加密形式, 使用base64.b64encode(KEY.encode("utf-8"))进行处理后保存为环境变量
 RSA_PRIV_KEY = os.getenv("BKAPP_RSA_PRIV_KEY", None)
 RSA_PUB_KEY = os.getenv("BKAPP_RSA_PUB_KEY", None)
+SM2_PRIV_KEY = os.getenv("BKAPP_SM2_PRIV_KEY", None)
+SM2_PUB_KEY = os.getenv("BKAPP_SM2_PUB_KEY", None)
 
 # 单业务下最大周期任务数量
 PERIODIC_TASK_PROJECT_MAX_NUMBER = int(os.getenv("BKAPP_PERIODIC_TASK_PROJECT_MAX_NUMBER", 50))
diff --git a/frontend/desktop/src/assets/html/index-dev.html b/frontend/desktop/src/assets/html/index-dev.html
index 3723ea0d09..27058461c2 100644
--- a/frontend/desktop/src/assets/html/index-dev.html
+++ b/frontend/desktop/src/assets/html/index-dev.html
@@ -32,6 +32,9 @@
         // 是否开启导入 V1 模板的入口
         var IMPORT_V1_FLAG = Number('0');
         var RSA_PUB_KEY = '';
+        var ASYMMETRIC_CIPHER_TYPE = '';
+        var ASYMMETRIC_PUBLIC_KEY = '';
+        var ASYMMETRIC_PREFIX = '';
         var APP_CODE = 'bk_sops';
         var FILE_UPLOAD_ENTRY = '/package/upload/';
         var MAX_NODE_EXECUTE_TIMEOUT = 6000;
diff --git a/frontend/desktop/src/assets/html/index.html b/frontend/desktop/src/assets/html/index.html
index f0ef4bcb16..829cbe110d 100644
--- a/frontend/desktop/src/assets/html/index.html
+++ b/frontend/desktop/src/assets/html/index.html
@@ -42,6 +42,9 @@
         // 是否开启导入 V1 模板的入口
         var IMPORT_V1_FLAG ={{import_v1_flag}};
         var RSA_PUB_KEY = '{{RSA_PUB_KEY}}';
+        var ASYMMETRIC_CIPHER_TYPE = '{{ASYMMETRIC_CIPHER_TYPE}}';
+        var ASYMMETRIC_PUBLIC_KEY = '{{ASYMMETRIC_PUBLIC_KEY}}';
+        var ASYMMETRIC_PREFIX = '{{ASYMMETRIC_PREFIX}}';
         var APP_CODE = '{{APP_CODE}}';
         var FILE_UPLOAD_ENTRY = '{{FILE_UPLOAD_ENTRY}}';
         var MEMBER_SELECTOR_DATA_HOST = '{{MEMBER_SELECTOR_DATA_HOST}}';
diff --git a/gcloud/core/context_processors.py b/gcloud/core/context_processors.py
index c3d1720bc1..e7b14a986a 100644
--- a/gcloud/core/context_processors.py
+++ b/gcloud/core/context_processors.py
@@ -13,9 +13,10 @@
 context_processor for common(setting)
 ** 除setting外的其他context_processor内容，均采用组件的方式(string)
 """
-
+import json
 import logging
 
+from bkcrypto.asymmetric.configs import KeyConfig as AsymmetricKeyConfig
 from django.utils.translation import ugettext_lazy as _
 
 import env
@@ -23,6 +24,7 @@
 from gcloud.core.api_adapter import is_user_auditor, is_user_functor
 from gcloud.core.models import EnvironmentVariables
 from gcloud.core.project import get_default_project_for_user
+from gcloud.utils.crypto import get_default_asymmetric_key_config
 
 logger = logging.getLogger("root")
 
@@ -56,6 +58,9 @@ def mysetting(request):
     project_timezone = request.session.get("blueking_timezone", settings.TIME_ZONE)
     cur_pos = get_cur_pos_from_url(request)
     frontend_entry_url = "{}bk_sops".format(settings.STATIC_URL) if settings.RUN_VER == "open" else "/static/bk_sops"
+    default_asymmetric_key_config: AsymmetricKeyConfig = get_default_asymmetric_key_config(
+        settings.BKCRYPTO_ASYMMETRIC_CIPHER_TYPE
+    )
     ctx = {
         "MEDIA_URL": settings.MEDIA_URL,  # MEDIA_URL
         "STATIC_URL": settings.STATIC_URL,  # 本地静态文件访问
@@ -90,6 +95,10 @@ def mysetting(request):
         "NICK": request.user.username,  # 用户昵称
         "AVATAR": request.session.get("avatar", ""),  # 用户头像
         "CUR_POS": cur_pos,
+        "ASYMMETRIC_CIPHER_TYPE": settings.BKCRYPTO_ASYMMETRIC_CIPHER_TYPE,
+        "ASYMMETRIC_PUBLIC_KEY": json.dumps(default_asymmetric_key_config.public_key_string)[1:-1],
+        "ASYMMETRIC_PREFIX": f"{settings.BKCRYPTO_ASYMMETRIC_CIPHER_TYPE.lower()}_str:::",
+        # TODO 等待移除
         "RSA_PUB_KEY": settings.RSA_PUB_KEY,
         "STATIC_VER": settings.STATIC_VER[settings.RUN_MODE],
         "import_v1_flag": 1 if settings.IMPORT_V1_TEMPLATE_FLAG else 0,
diff --git a/gcloud/utils/crypto.py b/gcloud/utils/crypto.py
index b50266cbde..822a44446d 100644
--- a/gcloud/utils/crypto.py
+++ b/gcloud/utils/crypto.py
@@ -11,10 +11,44 @@
 specific language governing permissions and limitations under the License.
 """
 import base64
+import json
 
+from bkcrypto import constants as crypto_constants
+from bkcrypto.asymmetric.configs import KeyConfig as AsymmetricKeyConfig
+from Crypto import Util
 from Crypto.Cipher import PKCS1_v1_5 as PKCS1_v1_5_cipher
 from Crypto.PublicKey import RSA
-from Crypto import Util
+from django.conf import settings
+
+
+def get_default_asymmetric_key_config(cipher_type: str) -> AsymmetricKeyConfig:
+    """
+    获取项目默认非对称加密配置
+    :param cipher_type:
+    :return:
+    """
+
+    if cipher_type == crypto_constants.AsymmetricCipherType.SM2.value:
+        private_key_string: str = settings.SM2_PRIV_KEY
+        public_key_string: str = json.loads(f'"{settings.SM2_PUB_KEY}"')
+    elif cipher_type == crypto_constants.AsymmetricCipherType.RSA.value:
+        private_key_string: str = settings.RSA_PRIV_KEY
+        public_key_string: str = json.loads(f'"{settings.RSA_PUB_KEY}"')
+    else:
+        raise NotImplementedError(f"cipher_type -> {cipher_type}")
+
+    return AsymmetricKeyConfig(
+        private_key_string=private_key_string.strip("\n"), public_key_string=public_key_string.strip("\n")
+    )
+
+
+def get_nodeman_asymmetric_key_config(cipher_type: str) -> AsymmetricKeyConfig:
+    """
+    获取节点管理非对称加密配置
+    :param cipher_type:
+    :return:
+    """
+    pass
 
 
 def _get_block_size(key_obj, is_encrypt=True) -> int:
@@ -68,6 +102,7 @@ def decrypt_auth_key(encrypt_message, private_key):
     @param private_key: rsa私钥
     @return: 解密后的信息
     """
+    # TODO 要改的
     decrypt_message_bytes = b""
     private_key_obj = RSA.importKey(private_key.strip("\n"))
     encrypt_message_bytes = base64.b64decode(encrypt_message)
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index d0457cf9bf..cd1f2d3668 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -502,6 +502,8 @@
                                 {
                                     tag_code: "auth_key",
                                     type: "textarea",
+                                    // TODO 能不能加一个动态选项？如果具有加密前缀，默认展示 * 脱敏
+                                    // TODO 如果重新输入保存，可以拉公钥去做加密
                                     attrs: {
                                         name: gettext("认证密钥"),
                                         width: "400px",
diff --git a/pipeline_plugins/components/utils/common.py b/pipeline_plugins/components/utils/common.py
index eb29058bea..35a15c8ccd 100644
--- a/pipeline_plugins/components/utils/common.py
+++ b/pipeline_plugins/components/utils/common.py
@@ -11,15 +11,13 @@
 specific language governing permissions and limitations under the License.
 """
 import logging
+import random
 import re
 import time
-import random
 from copy import deepcopy
 
 from django.utils.translation import ugettext_lazy as _
 
-from pipeline.conf import settings
-from pipeline.utils.crypt import rsa_decrypt_password
 from api.utils.thread import ThreadPool
 
 logger = logging.getLogger("root")
@@ -43,18 +41,6 @@ def loose_strip(data):
         return data
 
 
-def try_decrypt_password(password):
-    """
-    @summary: 尝试解密操作，成功返回明文密码，错误则说明用户使用明文的密码，返回
-    @param password:
-    @return:
-    """
-    try:
-        return rsa_decrypt_password(password, settings.RSA_PRIV_KEY)
-    except Exception:
-        return password
-
-
 def chunk_table_data(column_dict, break_line):
     """
     @summary: 表格参数值支持以break_line为分隔符分隔的多条数据，对一行数据，当有一列有多条数据时（包含换行符），其他列要么也有相等个数的
diff --git a/pipeline_plugins/variables/collections/common.py b/pipeline_plugins/variables/collections/common.py
index 4e8d6494b7..1090af6caa 100644
--- a/pipeline_plugins/variables/collections/common.py
+++ b/pipeline_plugins/variables/collections/common.py
@@ -12,23 +12,23 @@
 """
 
 import datetime
-import logging
 import json
+import logging
 from typing import List
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+from pipeline.core.data.var import LazyVariable, RegisterVariableMeta, SpliceVariable
+from pipeline.core.flow.io import IntItemSchema, StringItemSchema
 
+from gcloud.conf import settings as gcloud_settings
 from gcloud.constants import Type
 from gcloud.core.models import StaffGroupSet
 from gcloud.exceptions import ApiRequestError
 from gcloud.utils.cmdb import get_notify_receivers
-from gcloud.conf import settings as gcloud_settings
-from pipeline.core.data.var import SpliceVariable, LazyVariable, RegisterVariableMeta
-from pipeline.core.flow.io import StringItemSchema, IntItemSchema
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
-from pipeline_plugins.variables.base import SelfExplainVariable, FieldExplain
+from pipeline_plugins.variables.base import FieldExplain, SelfExplainVariable
 
 logger = logging.getLogger("root")
 get_client_by_user = gcloud_settings.ESB_GET_CLIENT_BY_USER
@@ -92,6 +92,7 @@ def _self_explain(cls, **kwargs) -> List[FieldExplain]:
 
 
 class Password(LazyVariable, SelfExplainVariable):
+    # TODO 需要改的
     code = "password"
     name = _("密码")
     type = "general"
diff --git a/requirements.txt b/requirements.txt
index 48efaa1641..4959f8957d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,6 +19,7 @@ django-nose==1.4.5
 coverage==4.5.1
 python-magic==0.4.15
 cryptography==3.3.2
+bk-crypto-python-sdk==1.0.4
 gitdb2==2.0.6
 GitPython==2.1.11
 PyJWT==1.7.1

From b985013d92c595e83dd922374280b6f62a1597c0 Mon Sep 17 00:00:00 2001
From: Luo Fan <44999219+luofann@users.noreply.github.com>
Date: Fri, 4 Aug 2023 17:42:40 +0800
Subject: [PATCH 060/112] =?UTF-8?q?feature:=20=E6=A0=87=E5=87=86=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=89=8D=E7=AB=AF=E5=9B=BD=E5=AF=86=E6=94=B9=E9=80=A0?=
 =?UTF-8?q?=20(#6965)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/develop/tag_usage_dev.md                 |   1 +
 en_docs/develop/tag_usage_dev.md              |   2 +
 frontend/desktop/package.json                 |   3 +-
 .../components/common/RenderForm/FormItem.vue |  10 +-
 .../common/RenderForm/RenderForm.vue          |  10 +-
 .../common/RenderForm/tags/TagPassword.vue    | 197 +++++++++++++-----
 frontend/desktop/src/config/i18n/cn.js        |   4 +-
 frontend/desktop/src/config/i18n/en.js        |   4 +-
 frontend/desktop/src/store/index.js           |   1 -
 9 files changed, 177 insertions(+), 55 deletions(-)

diff --git a/docs/develop/tag_usage_dev.md b/docs/develop/tag_usage_dev.md
index 2c43424dab..2f1451f674 100644
--- a/docs/develop/tag_usage_dev.md
+++ b/docs/develop/tag_usage_dev.md
@@ -313,6 +313,7 @@ ip 选择器，支持静态 ip 或动态 ip 的单选和多选。
 
   - `pubKey`: 加密公钥
   - `disabled`：设置是否禁用组件
+  - `canUseVar`: 是否可以使用全局变量，默认为true
   - `value`：加密后的密码值
 
 **方法**
diff --git a/en_docs/develop/tag_usage_dev.md b/en_docs/develop/tag_usage_dev.md
index c79e80508f..cc9649b9a7 100644
--- a/en_docs/develop/tag_usage_dev.md
+++ b/en_docs/develop/tag_usage_dev.md
@@ -313,7 +313,9 @@ Password input box.
 
 **Attributes**
 
+  - `pubKey`: crypto public key
   - `disabled`: set whether this component is disabled.
+  - `canUseVar`: whether global variables can be used, which defaults to true
   - `value`: the encrypted password value
 
 **Methods**
diff --git a/frontend/desktop/package.json b/frontend/desktop/package.json
index 3fff3b3e8f..475b52a17d 100644
--- a/frontend/desktop/package.json
+++ b/frontend/desktop/package.json
@@ -12,8 +12,9 @@
   "license": "ISC",
   "dependencies": {
     "@blueking/bkcharts": "^2.0.11-alpha.5",
-    "@blueking/user-selector": "^1.0.5-beta.2",
     "@blueking/bkui-form": "0.0.35",
+    "@blueking/crypto-js-sdk": "0.0.5",
+    "@blueking/user-selector": "^1.0.5-beta.2",
     "@vue/babel-preset-jsx": "^1.3.0",
     "ajv": "^6.10.2",
     "art-template": "^4.13.0",
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index da957c04b7..92a8f2a1f5 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -369,7 +369,6 @@
                     case 'radio':
                     case 'text':
                     case 'datetime':
-                    case 'password':
                     case 'memberSelector':
                     case 'logDisplay':
                     case 'code_editor':
@@ -465,6 +464,15 @@
                             }
                         }
                         break
+                    case 'password':
+                        valueFormat = {
+                            type: ['String', 'Object'],
+                            value: {
+                                tag: 'value',
+                                value: ''
+                            }
+                        }
+                        break
                     default:
                         valueFormat = {
                             type: 'String',
diff --git a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
index 0a6a6467c6..8404f68c22 100644
--- a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
+++ b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
@@ -233,7 +233,6 @@
                         case 'radio':
                         case 'text':
                         case 'datetime':
-                        case 'password':
                         case 'member_selector':
                         case 'section':
                         case 'code_editor':
@@ -291,6 +290,15 @@
                                 separator: ','
                             }
                             break
+                        case 'password':
+                            val = {
+                                type: 'object',
+                                value: {
+                                    tag: 'value',
+                                    value: ''
+                                }
+                            }
+                            break
                         default:
                             val = ''
                     }
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 23a4efe4ff..863b55d139 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -11,25 +11,32 @@
 */
 <template>
     <div class="tag-password">
-        <div v-if="formMode">
-            <el-input
+        <div v-if="formMode" class="password-edit-wrapper">
+            <bk-select v-if="canUseVar" slot="prepend" class="select-type" :clearable="false" :value="localVal.tag" @selected="handleSelectType">
+                <bk-option id="value" :name="$t('password_手动输入')"></bk-option>
+                <bk-option id="variable" :name="$t('password_使用密码变量')"></bk-option>
+            </bk-select>
+            <input
+                v-if="localVal.tag === 'value'"
+                class="value-input"
                 type="password"
-                :disabled="!editable || disabled"
-                :placeholder="i18n.placeholder"
-                v-model="password"
-                @focus="clearPassword"
-                @blur="encryptPassword">
-            </el-input>
+                :value="inputText"
+                :placeholder="inputPlaceholder"
+                @input="handleInput"
+                @focus="handleFocus"
+                @blur="handleBlur" />
+            <bk-select v-else class="select-var" :value="localVal.value" @selected="handleSelectVariable">
+                <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.name"></bk-option>
+            </bk-select>
             <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
         </div>
-        <span v-else class="rf-view-value">{{(value.password === 'undefined' || value.password === '') ? '--' : passwordPlaceholder}}</span>
+        <span v-else class="rf-view-value">{{(value.password === 'undefined' || value.password === '') ? '--' : '******'}}</span>
     </div>
 </template>
-
 <script>
+    import cryptoJsSdk from '@blueking/crypto-js-sdk'
     import '@/utils/i18n.js'
     import i18n from '@/config/i18n/index.js'
-    import { mapState } from 'vuex'
     import EncryptRSA from '@/utils/encryptRSA.js'
     import { getFormMixins } from '../formMixins.js'
 
@@ -39,6 +46,11 @@
             required: false,
             default: ''
         },
+        canUseVar: {
+            type: Boolean,
+            required: false,
+            default: true
+        },
         disabled: {
             type: Boolean,
             required: false,
@@ -46,67 +58,154 @@
             desc: i18n.t('禁用组件')
         },
         value: {
-            type: [String, Boolean],
+            type: [String, Object],
             required: false,
             default: ''
         }
     }
+
     export default {
         name: 'TagPassword',
         mixins: [getFormMixins(attrs)],
         data () {
             return {
-                encrypted: false,
-                passwordPlaceholder: '*****',
-                i18n: {
-                    placeholder: i18n.t('要修改密码请点击后重新输入密码')
-                }
+                localVal: {
+                    tag: 'value',
+                    value: ''
+                },
+                inputText: '',
+                inputPlaceholder: '',
+                ASYMMETRIC_CIPHER_TYPE: window.ASYMMETRIC_CIPHER_TYPE,
+                ASYMMETRIC_PUBLIC_KEY: window.ASYMMETRIC_PUBLIC_KEY,
+                ASYMMETRIC_PREFIX: window.ASYMMETRIC_PREFIX
             }
         },
         computed: {
-            ...mapState({
-                'rsa_pub_key': state => state.rsa_pub_key
-            }),
-            password: {
-                get () {
-                    return this.encrypted ? this.tempValue : this.value
+            variables () {
+                const constants = $.context.getConstants() || {}
+                return Object.keys(constants).filter(key => {
+                    const item = constants[key]
+                    return item.custom_type === 'password' && key !== this.tagCode
+                }).map(key => {
+                    const item = constants[key]
+                    return { id: key, name: item.name }
+                })
+            }
+        },
+        watch: {
+            value: {
+                handler (val) {
+                    if (Object.prototype.toString.call(val) === '[object Object]') {
+                        this.localVal = { ...val }
+                    } else {
+                        this.localVal = {
+                            tag: 'value',
+                            value: val
+                        }
+                    }
                 },
-                set (val) {
-                    this.tempValue = val
-                    this.updateForm(val)
-                }
+                immediate: true
+            }
+        },
+        mounted () {
+            if (this.localVal?.tag === 'value') {
+                this.inputText = this.localVal.value ? '******' : ''
             }
         },
         methods: {
-            _tag_init () {
-                if (this.value) {
-                    this.encrypted = true
-                    this.tempValue = this.passwordPlaceholder
+            handleSelectType (val) {
+                this.localVal = {
+                    tag: val,
+                    value: ''
                 }
+                this.inputText = ''
+                this.change()
             },
-            clearPassword () {
-                this.password = ''
-                this.tempValue = ''
-                this.encrypted = false
+            handleInput (e) {
+                this.localVal.value = e.target.value
+                this.inputPlaceholder = ''
+            },
+            handleFocus () {
+                if (this.localVal.value.length > 0) {
+                    this.inputPlaceholder = i18n.t('要修改密码请点击后重新输入密码')
+                }
+                this.localVal.value = ''
+                this.inputText = ''
+                this.change()
+            },
+            // 输入框失焦后执行加密逻辑
+            handleBlur () {
+                this.inputText = this.localVal.value
+                const encryptedVal = this.encryptPassword()
+                this.localVal.value = encryptedVal
+                this.change()
+            },
+            handleSelectVariable (val) {
+                this.localVal.value = val
+                this.change()
             },
             encryptPassword () {
-                let val
-                const pubKey = this.pubKey || this.rsa_pub_key
-                if (this.password === this.passwordPlaceholder) {
-                    return
+                if (!this.localVal.value) {
+                    return ''
                 }
-                if (this.password === '' || this.password === undefined) {
-                    val = ''
-                    return
+                const pubKey = this.pubKey || this.ASYMMETRIC_PUBLIC_KEY
+                if (this.ASYMMETRIC_CIPHER_TYPE === 'RSA') {
+                    const crypt = new EncryptRSA()
+                    crypt.setPublicKey(pubKey)
+                    const encryptedStr = crypt.encryptChunk(this.localVal.value)
+                    return `${this.ASYMMETRIC_PREFIX}${encryptedStr}`
+                } else {
+                    const sm2 = new cryptoJsSdk.SM2()
+                    const pkey = cryptoJsSdk.helper.asn1.decode(pubKey)
+                    const cipher = sm2.encrypt(pkey, cryptoJsSdk.helper.encode.strToHex(this.localVal.value))
+                    const base64Ret = cryptoJsSdk.helper.encode.hexToBase64(cipher)
+                    return base64Ret
                 }
-                const crypt = new EncryptRSA()
-                crypt.setPublicKey(pubKey)
-                val = crypt.encryptChunk(this.password)
-
-                this.encrypted = true
-                this.tempValue = this.password
-                this.$emit('change', [this.tagCode], val)
+            },
+            change () {
+                this.$emit('change', [this.tagCode], this.localVal)
             }
         }
     }
 </script>
+<style lang="scss" scoped>
+    .password-edit-wrapper {
+        display: flex;
+        align-items: center;
+        .select-type {
+            flex: 0 0 120px;
+            border-right: none;
+            border-top-right-radius: 0;
+            border-bottom-right-radius: 0;
+        }
+        .value-input {
+            flex: 1;
+            padding: 0 10px;
+            width: 100%;
+            height: 32px;
+            line-height: 32px;
+            color: #63656e;
+            background-color: #fff;
+            border-top-right-radius: 2px;
+            border-bottom-right-radius: 2px;
+            font-size: 12px;
+            border: 1px solid #c4c6cc;
+            vertical-align: middle;
+            text-align: left;
+            outline: none;
+            resize: none;
+            &:focus {
+                border-color: #3a84ff;
+                background-color: #ffffff;
+            }
+        }
+        .select-var {
+            flex: 1;
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+        }
+        .bk-select {
+            height: 32px;
+        }
+    }
+</style>
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index a25f04a413..eea6b3c4d1 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1749,7 +1749,9 @@ const cn = {
     '添加默认方案成功': '添加默认方案成功',
     '取消默认方案成功': '取消默认方案成功',
     '确认删除执行方案【n】?': '确认删除执行方案【{n}】？',
-    '取消设为默认方案': '取消设为默认方案'
+    '取消设为默认方案': '取消设为默认方案',
+    'password_手动输入': '手动输入',
+    'password_使用密码变量': '使用密码变量'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 87da068c89..cb6a2d0e6f 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1782,7 +1782,9 @@ const en = {
     '添加默认方案成功': 'Default Node-Group Added',
     '取消默认方案成功': 'Default Node-Group Cancelled',
     '确认删除执行方案【n】?': 'Confirm to delete node-group [ {n} ] ?',
-    '取消设为默认方案': 'Unset as Default'
+    '取消设为默认方案': 'Unset as Default',
+    'password_手动输入': 'custom input',
+    'password_使用密码变量': 'use password var.'
 }
 
 export default en
diff --git a/frontend/desktop/src/store/index.js b/frontend/desktop/src/store/index.js
index 81ead32516..06c684759b 100644
--- a/frontend/desktop/src/store/index.js
+++ b/frontend/desktop/src/store/index.js
@@ -38,7 +38,6 @@ const store = new Vuex.Store({
         components: [],
         isSuperUser: window.IS_SUPERUSER === 1,
         v1_import_flag: window.IMPORT_V1_FLAG,
-        rsa_pub_key: window.RSA_PUB_KEY,
         permissionMeta: {
             system: [],
             resources: [],

From f15b60387af76c56bfb0d12b813a5771a60f11aa Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Mon, 14 Aug 2023 11:49:58 +0800
Subject: [PATCH 061/112] =?UTF-8?q?optimization:=20password=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81texarea=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/develop/tag_usage_dev.md                 |  1 +
 en_docs/develop/tag_usage_dev.md              |  1 +
 .../common/RenderForm/RenderForm.vue          |  7 +-
 .../common/RenderForm/tags/TagPassword.vue    | 66 +++++++++++++++----
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/docs/develop/tag_usage_dev.md b/docs/develop/tag_usage_dev.md
index 2f1451f674..91d69ab65f 100644
--- a/docs/develop/tag_usage_dev.md
+++ b/docs/develop/tag_usage_dev.md
@@ -314,6 +314,7 @@ ip 选择器，支持静态 ip 或动态 ip 的单选和多选。
   - `pubKey`: 加密公钥
   - `disabled`：设置是否禁用组件
   - `canUseVar`: 是否可以使用全局变量，默认为true
+  - `textareaMode`: 手动输入密码时，表单类型为textarea，默认为false
   - `value`：加密后的密码值
 
 **方法**
diff --git a/en_docs/develop/tag_usage_dev.md b/en_docs/develop/tag_usage_dev.md
index cc9649b9a7..2d0568e069 100644
--- a/en_docs/develop/tag_usage_dev.md
+++ b/en_docs/develop/tag_usage_dev.md
@@ -316,6 +316,7 @@ Password input box.
   - `pubKey`: crypto public key
   - `disabled`: set whether this component is disabled.
   - `canUseVar`: whether global variables can be used, which defaults to true
+  - `textareaMode`: When entering a password manually, the form type is textarea and the default is false
   - `value`: the encrypted password value
 
 **Methods**
diff --git a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
index 8404f68c22..07aff3fa97 100644
--- a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
+++ b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
@@ -292,11 +292,8 @@
                             break
                         case 'password':
                             val = {
-                                type: 'object',
-                                value: {
-                                    tag: 'value',
-                                    value: ''
-                                }
+                                tag: 'value',
+                                value: ''
                             }
                             break
                         default:
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 863b55d139..4f77febd5c 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -16,15 +16,28 @@
                 <bk-option id="value" :name="$t('password_手动输入')"></bk-option>
                 <bk-option id="variable" :name="$t('password_使用密码变量')"></bk-option>
             </bk-select>
-            <input
-                v-if="localVal.tag === 'value'"
-                class="value-input"
-                type="password"
-                :value="inputText"
-                :placeholder="inputPlaceholder"
-                @input="handleInput"
-                @focus="handleFocus"
-                @blur="handleBlur" />
+            <template v-if="localVal.tag === 'value'">
+                <input
+                    v-if="!textareaMode"
+                    class="value-input"
+                    type="password"
+                    :value="inputText"
+                    :placeholder="inputPlaceholder"
+                    @input="handleInput"
+                    @focus="handleFocus"
+                    @blur="handleBlur" />
+                <textarea
+                    v-else
+                    class="value-textarea"
+                    type="textarea"
+                    rows="4"
+                    :value="inputText"
+                    :placeholder="inputPlaceholder"
+                    @input="handleTextareaInput"
+                    @focus="handleFocus"
+                    @blur="handleBlur">
+                </textarea>
+            </template>
             <bk-select v-else class="select-var" :value="localVal.value" @selected="handleSelectVariable">
                 <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.name"></bk-option>
             </bk-select>
@@ -51,6 +64,11 @@
             required: false,
             default: true
         },
+        textareaMode: {
+            type: Boolean,
+            required: false,
+            default: false
+        },
         disabled: {
             type: Boolean,
             required: false,
@@ -125,6 +143,12 @@
                 this.localVal.value = e.target.value
                 this.inputPlaceholder = ''
             },
+            handleTextareaInput (e) {
+                console.log('textarea input: ', e.target.value)
+                this.localVal.value = e.target.value
+                this.inputPlaceholder = ''
+                e.target.value = e.target.value.replace(/[^\n]/g, '·')
+            },
             handleFocus () {
                 if (this.localVal.value.length > 0) {
                     this.inputPlaceholder = i18n.t('要修改密码请点击后重新输入密码')
@@ -135,7 +159,7 @@
             },
             // 输入框失焦后执行加密逻辑
             handleBlur () {
-                this.inputText = this.localVal.value
+                this.inputText = this.textareaMode ? this.localVal.value.replace(/[^\n]/g, '·') : this.localVal.value
                 const encryptedVal = this.encryptPassword()
                 this.localVal.value = encryptedVal
                 this.change()
@@ -171,7 +195,7 @@
 <style lang="scss" scoped>
     .password-edit-wrapper {
         display: flex;
-        align-items: center;
+        align-items: flex-start;
         .select-type {
             flex: 0 0 120px;
             border-right: none;
@@ -199,6 +223,26 @@
                 background-color: #ffffff;
             }
         }
+        .value-textarea {
+            flex: 1;
+            padding: 6px 10px;
+            width: 100%;
+            line-height: 16px;
+            color: #63656e;
+            background-color: #fff;
+            border-top-right-radius: 2px;
+            border-bottom-right-radius: 2px;
+            font-size: 12px;
+            border: 1px solid #c4c6cc;
+            text-align: left;
+            outline: none;
+            resize: none;
+            // -webkit-text-security: disc !important;
+            &:focus {
+                border-color: #3a84ff;
+                background-color: #ffffff;
+            }
+        }
         .select-var {
             flex: 1;
             border-top-left-radius: 0;

From 76ac804471d4b96309796629b365963705f0171d Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 10 Aug 2023 10:25:18 +0800
Subject: [PATCH 062/112] =?UTF-8?q?feature:=20=E8=8A=82=E7=82=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=8C=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1=E3=80=8D?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collections/sites/open/nodeman/base.py    |  71 +-
 .../sites/open/nodeman/create_task/v3_0.py    |  74 +-
 .../sites/open/nodeman/create_task/v4_0.py    | 193 ++---
 .../atoms/nodeman/create_task/v4_0.js         | 812 +++++++-----------
 .../test_nodeman_v3_create_task.py            |   6 +-
 .../test_nodeman_v4_create_task.py            | 142 ++-
 6 files changed, 608 insertions(+), 690 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/base.py b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
index 7f69d0d995..93e7133144 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/base.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
@@ -13,7 +13,7 @@
 import ujson as json
 from django.utils.translation import ugettext_lazy as _
 from pipeline.core.flow.activity import Service, StaticIntervalGenerator
-from pipeline.core.flow.io import IntItemSchema, StringItemSchema
+from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
@@ -140,11 +140,11 @@ def get_ip_list(self, ip_str):
     def get_host_id_list(self, ip_str, executor, bk_cloud_id, bk_biz_id):
         # 如果开启了ipv6的逻辑，则执行
         if settings.ENABLE_IPV6:
-            ipv6_list, ipv4_list, _, _ = extract_ip_from_ip_str(ip_str)
+            ipv6_list, ipv4_list, *_ = extract_ip_from_ip_str(ip_str)
             ip_list = ipv4_list + ipv6_list
             bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
-
-            return list(bk_host_id_dict_ipv6.values())
+            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
+            return list(set(bk_host_id_dict_ipv6.values()) | set(bk_host_id_dict.values()))
 
         ip_list = get_ip_by_regex(ip_str)
         bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
@@ -282,3 +282,66 @@ def schedule(self, data, parent_data, callback_data=None):
             data.set_outputs("ex_data", error_log)
             self.finish_schedule()
             return False
+
+
+class NodeManNewBaseService(NodeManBaseService):
+    def inputs_format(self):
+        return [
+            self.InputItem(
+                name=_("业务 ID"),
+                key="bk_biz_id",
+                type="int",
+                schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
+            ),
+            self.InputItem(
+                name=_("节点类型"),
+                key="nodeman_node_type",
+                type="string",
+                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
+            ),
+            self.InputItem(
+                name=_("操作详情"),
+                key="nodeman_op_info",
+                type="object",
+                schema=ObjectItemSchema(
+                    description=_("操作内容信息"),
+                    property_schemas={
+                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
+                        "nodeman_op_type": StringItemSchema(
+                            description=_(
+                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
+                            )
+                        ),
+                        "nodeman_hosts": ArrayItemSchema(
+                            description=_("需要被操作的主机信息(安装与重装时需要)"),
+                            item_schema=ObjectItemSchema(
+                                description=_("主机相关信息"),
+                                property_schemas={
+                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
+                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
+                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
+                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
+                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
+                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
+                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
+                                    "port": StringItemSchema(description=_("端口号")),
+                                    "account": StringItemSchema(description=_("登录帐号")),
+                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
+                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
+                                },
+                            ),
+                        ),
+                        "nodeman_other_hosts": ArrayItemSchema(
+                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
+                            item_schema=ObjectItemSchema(
+                                description=_("主机相关信息"),
+                                property_schemas={
+                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
+                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
+                                },
+                            ),
+                        ),
+                    },
+                ),
+            ),
+        ]
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
index 610864ac50..c3c0cb514a 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
@@ -14,13 +14,12 @@
 
 from django.utils.translation import ugettext_lazy as _
 from pipeline.component_framework.component import Component
-from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
 from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
-    NodeManBaseService,
+    NodeManNewBaseService,
     get_host_id_by_inner_ip,
     get_host_id_by_inner_ipv6,
     get_nodeman_rsa_public_key,
@@ -45,7 +44,7 @@
 HOST_EXTRA_PARAMS_IPV6 = ["inner_ipv6", "outer_ipv6"]
 
 
-class NodemanCreateTaskService(NodeManBaseService):
+class NodemanCreateTaskService(NodeManNewBaseService):
     def execute(self, data, parent_data):
         executor = parent_data.inputs.executor
         client = BKNodeManClient(username=executor)
@@ -53,15 +52,6 @@ def execute(self, data, parent_data):
 
         node_type = data.inputs.nodeman_node_type
 
-        nodeman_ticket = data.get_one_of_inputs("nodeman_ticket", {})
-        nodeman_tjj_ticket = nodeman_ticket.get("nodeman_tjj_ticket", "")
-        if nodeman_tjj_ticket:
-            try:
-                nodeman_tjj_ticket = decrypt_auth_key(nodeman_tjj_ticket, settings.RSA_PRIV_KEY)
-            except Exception:
-                # password is not encrypted
-                pass
-
         nodeman_op_info = data.inputs.nodeman_op_info
         op_type = nodeman_op_info.get("nodeman_op_type", "")
         nodeman_hosts = nodeman_op_info.get("nodeman_hosts", [])
@@ -190,8 +180,6 @@ def execute(self, data, parent_data):
 
             kwargs = {"job_type": job_name, "hosts": all_hosts, "action": "job_install"}
 
-            if nodeman_tjj_ticket:
-                kwargs.update({"tcoa_ticket": nodeman_tjj_ticket})
         else:
             data.set_outputs("ex_data", _("无效的操作请求:{}".format(job_name)))
             return False
@@ -201,64 +189,6 @@ def execute(self, data, parent_data):
 
         return self.get_job_result(result, data, action, kwargs)
 
-    def inputs_format(self):
-        return [
-            self.InputItem(
-                name=_("业务 ID"), key="bk_biz_id", type="int", schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
-            ),
-            self.InputItem(
-                name=_("节点类型"),
-                key="nodeman_node_type",
-                type="string",
-                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
-            ),
-            self.InputItem(
-                name=_("操作详情"),
-                key="nodeman_op_info",
-                type="object",
-                schema=ObjectItemSchema(
-                    description=_("操作内容信息"),
-                    property_schemas={
-                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
-                        "nodeman_op_type": StringItemSchema(
-                            description=_(
-                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
-                            )
-                        ),
-                        "nodeman_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(安装与重装时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
-                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
-                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
-                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
-                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
-                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
-                                    "port": StringItemSchema(description=_("端口号")),
-                                    "account": StringItemSchema(description=_("登录帐号")),
-                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
-                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
-                                },
-                            ),
-                        ),
-                        "nodeman_other_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
-                                },
-                            ),
-                        ),
-                    },
-                ),
-            ),
-        ]
-
 
 class NodemanCreateTaskComponent(Component):
     name = _("新建任务")
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
index 43eeb95e4c..bf68a50efd 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
@@ -10,9 +10,10 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+from copy import deepcopy
+
 from django.utils.translation import ugettext_lazy as _
 from pipeline.component_framework.component import Component
-from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
@@ -20,18 +21,34 @@
 from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
-    NodeManBaseService,
+    NodeManNewBaseService,
     get_nodeman_rsa_public_key,
 )
 
 __group_name__ = _("节点管理(Nodeman)")
 VERSION = "v4.0"
 
-# 安装类任务(job_install)
-INSTALL_JOB = ["INSTALL_PROXY", "INSTALL_AGENT", "REINSTALL_PROXY", "REINSTALL_AGENT", "UNINSTALL_AGENT"]
+# 无需认证信息的操作
+NOT_NEED_AUTH_JOB = ["RELOAD_AGENT", "RELOAD_PROXY"]
+
+
+# 无需额外配置信息的操作
+NOT_NEED_EXTRA_CONFIG_JOB = ["UNINSTALL_AGENT"]
 
-# 操作类任务(job_operate)
-OPERATE_JOB = ["UPGRADE_AGENT", "UNINSTALL_PROXY"]
+# 依赖节点管理 job/install 接口的操作
+INSTALL_JOB = (
+    [
+        "INSTALL_PROXY",
+        "INSTALL_AGENT",
+        "REINSTALL_PROXY",
+        "REINSTALL_AGENT",
+    ]
+    + NOT_NEED_EXTRA_CONFIG_JOB
+    + NOT_NEED_AUTH_JOB
+)
+
+# 依赖节点管理 job/details 接口的操作
+OPERATE_JOB = ["UPGRADE_AGENT", "UPGRADE_PROXY", "UNINSTALL_PROXY", "RESTART_AGENT", "RESTART_PROXY"]
 
 # 主机其它参数
 HOST_EXTRA_PARAMS = ["outer_ip", "login_ip", "data_ip", "inner_ipv6", "outer_ipv6"]
@@ -40,21 +57,12 @@
 HOST_EXTRA_PARAMS_IPV6 = ["inner_ipv6", "outer_ipv6"]
 
 
-class NodemanCreateTaskService(NodeManBaseService):
+class NodemanCreateTaskService(NodeManNewBaseService):
     def execute(self, data, parent_data):
         executor = parent_data.inputs.executor
         client = BKNodeManClient(username=executor)
         bk_biz_id = data.inputs.bk_biz_id
 
-        nodeman_ticket = data.get_one_of_inputs("nodeman_ticket", {})
-        nodeman_tjj_ticket = nodeman_ticket.get("nodeman_tjj_ticket", "")
-        if nodeman_tjj_ticket:
-            try:
-                nodeman_tjj_ticket = decrypt_auth_key(nodeman_tjj_ticket, settings.RSA_PRIV_KEY)
-            except Exception:
-                # password is not encrypted
-                pass
-
         nodeman_op_info = data.inputs.nodeman_op_info
         node_type = nodeman_op_info.get("nodeman_node_type")
         op_type = nodeman_op_info.get("nodeman_op_type", "")
@@ -85,10 +93,6 @@ def execute(self, data, parent_data):
             all_hosts, row_host_params_list = [], []
             for host in nodeman_hosts:
                 bk_cloud_id = host["nodeman_bk_cloud_id"]
-                ap_id = host["nodeman_ap_id"]
-                auth_type = host["auth_type"]
-                auth_key = host["auth_key"]
-
                 use_inner_ip = True if host.get("inner_ip") else False
                 # use_inner_ip 判定用户输入的的是ipv4还是ipv6
                 inner_ip_list = self.get_ip_list(
@@ -101,46 +105,71 @@ def execute(self, data, parent_data):
                     data.set_outputs("ex_data", _("请确认内网Ip是否合法host_info:{host}".format(host=host["inner_ip"])))
                     return False
 
-                # 处理表格中每行的key/psw
-                try:
-                    auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
-                except Exception:
-                    # password is not encrypted
-                    pass
-                # auth_key加密
-                success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
-                if not success:
-                    data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
-                    return False
-                auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+                auth_params = {}
+                if job_name not in NOT_NEED_AUTH_JOB:
+
+                    # 认证信息
+                    auth_params.update(
+                        {
+                            "port": host["port"],
+                            "auth_type": host["auth_type"],
+                            "account": host["account"],
+                        }
+                    )
+
+                    auth_key = host["auth_key"]
+
+                    # 处理表格中每行的key/psw
+                    try:
+                        auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
+                    except Exception:
+                        # password is not encrypted
+                        pass
+
+                    # auth_key加密
+                    success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
+                    if not success:
+                        data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+                        return False
+                    auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+
+                    if auth_params["auth_type"] == "PASSWORD":
+                        auth_params["password"] = auth_key
+                    else:
+                        auth_params["key"] = auth_key
+
+                # 额外配置参数
+                extra_config_params = {"peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 0)}
+                speed_limit = host.get("speed_limit")
+                if speed_limit:
+                    extra_config_params.update({"bt_speed_limit": int(speed_limit)})
+
                 # 表格每行基础参数
                 base_params = {
+                    **auth_params,
                     "bk_biz_id": bk_biz_id,
                     "bk_cloud_id": bk_cloud_id,
+                    "ap_id": host["nodeman_ap_id"],
                     "os_type": host["os_type"],
-                    "port": host["port"],
-                    "account": host["account"],
-                    "auth_type": auth_type,
-                    "ap_id": ap_id,
                     "is_manual": False,
-                    "peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 1),
                 }
-                speed_limit = host.get("speed_limit")
-                if speed_limit:
-                    base_params.update({"bt_speed_limit": int(speed_limit)})
 
                 # 支持表格中一行多ip操作, 拼装表格内的inner_ip参数
                 for index, inner_ip in enumerate(inner_ip_list):
-                    one = {}
+
+                    row_host_info = deepcopy(base_params)
                     if use_inner_ip:
-                        one = {"inner_ip": inner_ip}
-                    if auth_type == "PASSWORD":
-                        one["password"] = auth_key
-                    else:
-                        one["key"] = auth_key
+                        row_host_info.update({"inner_ip": inner_ip})
+
+                    # 注入额外 Agent 配置信息
+                    if job_name not in NOT_NEED_EXTRA_CONFIG_JOB:
+                        row_host_info.update(extra_config_params)
 
-                    # 重装必须要bk_host_id
-                    if job_name in ["REINSTALL_PROXY", "REINSTALL_AGENT", "UNINSTALL_AGENT"]:
+                    # 除了安装，其他操作需要 bk_host_id
+                    if (
+                        job_name
+                        in ["REINSTALL_PROXY", "REINSTALL_AGENT"] + NOT_NEED_AUTH_JOB + NOT_NEED_EXTRA_CONFIG_JOB
+                    ):
                         supplier_account = supplier_account_for_business(bk_biz_id)
                         host_fields = ["bk_host_id", "bk_host_innerip"]
                         # 如果开启了ipv6，并且用户输入的是ipv6的地址
@@ -156,7 +185,7 @@ def execute(self, data, parent_data):
                             )
                             bk_host_id_dict = {host["bk_host_innerip"]: host["bk_host_id"] for host in host_list}
                         try:
-                            one["bk_host_id"] = bk_host_id_dict[inner_ip]
+                            row_host_info["bk_host_id"] = bk_host_id_dict[inner_ip]
                         except KeyError:
                             data.set_outputs("ex_data", _("获取bk_host_id失败:{},请确认管控区域是否正确".format(inner_ip)))
                             return False
@@ -169,14 +198,12 @@ def execute(self, data, parent_data):
                         if host.get(ip_type, False):
                             others_ip_list = self.get_ip_list(host[ip_type])
                             if len(others_ip_list) == len(inner_ip_list):
-                                one[ip_type] = others_ip_list[index]
+                                row_host_info[ip_type] = others_ip_list[index]
                             else:
                                 data.set_outputs("ex_data", _("获取{}的{}失败,请确认是否与inner_ip一一对应".format(inner_ip, ip_type)))
                                 return False
 
-                    one.update(base_params)
-
-                    row_host_params_list.append(one)
+                    row_host_params_list.append(row_host_info)
 
             all_hosts.extend(row_host_params_list)
 
@@ -185,8 +212,6 @@ def execute(self, data, parent_data):
             if job_name in ["INSTALL_PROXY", "INSTALL_AGENT", "REINSTALL_PROXY", "REINSTALL_AGENT"]:
                 kwargs.update({"is_install_latest_plugins": nodeman_install_latest_plugins})
 
-            if nodeman_tjj_ticket:
-                kwargs.update({"tcoa_ticket": nodeman_tjj_ticket})
         else:
             data.set_outputs("ex_data", _("无效的操作请求:{}".format(job_name)))
             return False
@@ -196,64 +221,6 @@ def execute(self, data, parent_data):
 
         return self.get_job_result(result, data, action, kwargs)
 
-    def inputs_format(self):
-        return [
-            self.InputItem(
-                name=_("业务 ID"), key="bk_biz_id", type="int", schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
-            ),
-            self.InputItem(
-                name=_("节点类型"),
-                key="nodeman_node_type",
-                type="string",
-                schema=StringItemSchema(description=_("AGENT（表示直连区域安装 Agent）、 PROXY（表示安装 Proxy）")),
-            ),
-            self.InputItem(
-                name=_("操作详情"),
-                key="nodeman_op_info",
-                type="object",
-                schema=ObjectItemSchema(
-                    description=_("操作内容信息"),
-                    property_schemas={
-                        "nodeman_ap_id": StringItemSchema(description=_("接入点 ID")),
-                        "nodeman_op_type": StringItemSchema(
-                            description=_(
-                                "任务操作类型，可以是 INSTALL（安装）、  REINSTALL（重装）、" " UNINSTALL （卸载）、 REMOVE （移除）或 UPGRADE （升级）"
-                            )
-                        ),
-                        "nodeman_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(安装与重装时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ap_id": StringItemSchema(description=_("接入点")),
-                                    "inner_ip": StringItemSchema(description=_("内网 IP")),
-                                    "login_ip": StringItemSchema(description=_("主机登录 IP，可以为空，适配复杂网络时填写")),
-                                    "data_ip": StringItemSchema(description=_("主机数据 IP，可以为空，适配复杂网络时填写")),
-                                    "outer_ip": StringItemSchema(description=_("外网 IP, 可以为空")),
-                                    "os_type": StringItemSchema(description=_("操作系统类型，可以是 LINUX, WINDOWS, 或 AIX")),
-                                    "port": StringItemSchema(description=_("端口号")),
-                                    "account": StringItemSchema(description=_("登录帐号")),
-                                    "auth_type": StringItemSchema(description=_("认证方式，可以是 PASSWORD 或 KEY")),
-                                    "auth_key": StringItemSchema(description=_("认证密钥,根据认证方式，是登录密码或者登陆密钥")),
-                                },
-                            ),
-                        ),
-                        "nodeman_other_hosts": ArrayItemSchema(
-                            description=_("需要被操作的主机信息(升级，卸载，移除时需要)"),
-                            item_schema=ObjectItemSchema(
-                                description=_("主机相关信息"),
-                                property_schemas={
-                                    "nodeman_bk_cloud_id": StringItemSchema(description=_("管控区域ID")),
-                                    "nodeman_ip_str": StringItemSchema(description=_("IP")),
-                                },
-                            ),
-                        ),
-                    },
-                ),
-            ),
-        ]
-
 
 class NodemanCreateTaskComponent(Component):
     name = _("新建任务")
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index cd1f2d3668..86dd4b1df5 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -13,14 +13,289 @@
 (function () {
     function is_display_tag(self, op_type, value) {
         if (op_type.indexOf(value) !== -1) {
-            self.show()
+            self.show();
         } else {
-            self.hide()
+            self.hide();
         }
     }
 
-    let node_type = "AGENT"
-    let NODEMAN_TJJ_IS_HIDDEN = true
+    function is_install_op(self, value) {
+        is_display_tag(self, ["INSTALL", "REINSTALL"], value);
+    }
+
+
+    function init_columns(self, node_type, op_type) {
+        let common_columns = [
+            {
+                tag_code: "nodeman_bk_cloud_id",
+                type: "select",
+                attrs: {
+                    name: gettext("管控区域ID"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_cloud_area/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        resp.data.unshift({"text": gettext("直连区域"), "value": 0});
+                        return resp.data;
+                    },
+                    validation: [
+                        {
+                            type: "required",
+                        }
+                    ]
+                }
+            },
+            {
+                tag_code: "nodeman_ap_id",
+                type: "select",
+                attrs: {
+                    name: gettext("接入点"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_ap_list/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        return resp.data;
+                    },
+                    validation: []
+                }
+            },
+            {
+                tag_code: "inner_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP"),
+                    placeholder: gettext("多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "inner_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，内网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "os_type",
+                type: "select",
+                attrs: {
+                    name: gettext("操作系统类型"),
+                    width: "180px",
+                    items: [
+                        {value: "LINUX", text: gettext("LINUX")},
+                        {value: "WINDOWS", text: gettext("WINDOWS")},
+                        {value: "AIX", text: gettext("AIX")}
+                    ],
+                    default: "LINUX",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+        ];
+
+        let proxy_columns = [
+            {
+                tag_code: "outer_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP"),
+                    placeholder: gettext("可选,如填写需与内网ip一一对应,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                    validation: []
+                },
+            },
+            {
+                tag_code: "data_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("数据IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "outer_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，外网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                },
+            },
+        ];
+
+        let auth_columns = [
+            {
+                tag_code: "login_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("登录IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "account",
+                type: "input",
+                attrs: {
+                    name: gettext("登录账号"),
+                    width: "180px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "port",
+                type: "input",
+                attrs: {
+                    name: gettext("端口号"),
+                    width: "100px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_type",
+                type: "select",
+                attrs: {
+                    name: gettext("认证方式"),
+                    width: "180px",
+                    items: [
+                        {value: "PASSWORD", text: gettext("PASSWORD")},
+                        {value: "KEY", text: gettext("KEY")},
+                        {value: "TJJ_PASSWORD", text: gettext("TJJ")}
+
+                    ],
+                    default: "PASSWORD",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_key",
+                type: "textarea",
+                // TODO 能不能加一个动态选项？如果具有加密前缀，默认展示 * 脱敏
+                // TODO 如果重新输入保存，可以拉公钥去做加密
+                attrs: {
+                    name: gettext("认证密钥"),
+                    width: "400px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value, parent_value) {
+                                let auth_type = parent_value.auth_type;
+                                let result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (auth_type !== "TJJ_PASSWORD" && !value.length) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入认证密钥");
+                                }
+                                return result;
+                            }
+                        }
+                    ],
+                    showPassword: true
+                },
+            },
+        ];
+
+        let config_columns = [
+            {
+                tag_code: "peer_exchange_switch_for_agent",
+                type: "radio",
+                attrs: {
+                    name: gettext("BT节点探测"),
+                    items: [
+                        {value: 1, name: gettext("是")},
+                        {value: 0, name: gettext("否")}
+                    ],
+                    default: 0,
+                    validation: [
+                        {
+                            type: "required"
+                        },
+                    ]
+                },
+            },
+            {
+                tag_code: "speed_limit",
+                type: "input",
+                attrs: {
+                    name: gettext("传输限速 M/s"),
+                    width: "100px",
+                    placeholder: gettext("请输入"),
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value) {
+                                var result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (value && !Number(value)) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入数字");
+                                }
+                                return result;
+                            }
+                        }
+                    ]
+                },
+            },
+        ];
+
+        self.columns = common_columns;
+
+        // 如果是 Proxy，补充 Proxy 信息
+        if (node_type === "PROXY") {
+            self.columns.push(...proxy_columns);
+        }
+        // 安装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+            self.columns.push(...auth_columns);
+        }
+        // 非卸载场景需要配置信息
+        if (op_type !== "UNINSTALL") {
+            self.columns.push(...config_columns);
+        }
+        console.log(node_type, op_type);
+    };
+
+    let NODEMAN_TJJ_IS_HIDDEN = true;
+
     $.ajax({
         url: $.context.get('site_url') + 'pipeline/nodeman_is_support_tjj/',
         type: 'GET',
@@ -28,13 +303,13 @@
         async: false,
         success: function (resp) {
             if (resp.data) {
-                NODEMAN_TJJ_IS_HIDDEN = false
+                NODEMAN_TJJ_IS_HIDDEN = false;
             }
         },
         error: function () {
             show_msg('request nodeman is support tjj error', 'error');
         }
-    })
+    });
     $.atoms.nodeman_create_task = [
         {
             tag_code: "bk_biz_id",
@@ -63,116 +338,10 @@
                     if (this.value) {
                         return
                     }
-                    this._set_value($.context.getBkBizId())
+                    this._set_value($.context.getBkBizId());
                 }
             }
         },
-        {
-            tag_code: "nodeman_ticket",
-            type: "combine",
-            attrs: {
-                name: gettext("ticket信息"),
-                hookable: true,
-                hidden: NODEMAN_TJJ_IS_HIDDEN,
-                children: [{
-                    tag_code: "nodeman_ticket_save",
-                    type: "radio",
-                    attrs: {
-                        name: gettext("ticket获取方式"),
-                        hookable: true,
-                        hidden: false,
-                        value: 2,
-                        disabled: false,
-                        default: 2,
-                        items: [
-                            {
-                                name: gettext("获取ticket"),
-                                value: 0
-                            },
-                            {
-                                name: gettext("实时获取ticket"),
-                                value: 1
-                            },
-                            {
-                                name: gettext("不使用ticket"),
-                                value: 2
-                            }
-                        ],
-                    },
-                },
-                    {
-                        type: "text",
-                        tag_code: "nodeman_tjj_tip",
-                        attrs: {
-                            name: gettext("说明"),
-                            hookable: true,
-                            hidden: false,
-                            raw: false,
-                            value: gettext("TJJ认证需要获取用户的ticket,请选择ticket获取方式")
-                        },
-                        events: [
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "change",
-                                action: function (value) {
-                                    if (value === 0) {
-                                        this._set_value(gettext("此选项将保存ticket到模板,插件长时间未执行可能发生ticket过期失效导致认证失败"))
-                                    }
-                                    if (value === 1) {
-                                        this._set_value(gettext("此选项将在任务执行前获取ticket,选择此选项需要(ticket使用方式)勾选为全局变量"))
-                                    }
-                                    if (value === 2) {
-                                        this._set_value(gettext("TJJ认证需要获取用户的ticket,请选择ticket获取方式"))
-                                    }
-                                }
-                            },]
-                    },
-                    {
-                        tag_code: "nodeman_tjj_ticket",
-                        type: "password",
-                        attrs: {
-                            name: "TJJ认证ticket",
-                            hookable: true,
-                            hidden: true,
-                            placeholder: "用户ticket",
-                            disabled: true,
-                            validation: []
-                        },
-                        events: [
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "change",
-                                action: function (value) {
-                                    if (value === 2) {
-                                        this._set_value("")
-                                        return
-                                    }
-                                    let a = /TCOA_TICKET=\S+/
-                                    let cookieStr = document.cookie
-                                    let ticket = cookieStr.match(a)[0].split(";")[0].split("=")[1]
-                                    this._set_value(ticket)
-                                }
-                            },
-                            {
-                                source: "nodeman_ticket_save",
-                                type: "init",
-                                action: function (value) {
-                                    if (value === 1) {
-                                        let a = /TCOA_TICKET=\S+/
-                                        let cookieStr = document.cookie
-                                        let ticket = cookieStr.match(a)[0].split(";")[0].split("=")[1]
-                                        this._set_value(ticket)
-                                    }
-                                    if (value === 2) {
-                                        this._set_value("")
-                                    }
-                                }
-                            }
-
-                        ],
-                    }]
-            },
-        },
         {
             tag_code: "nodeman_op_info",
             type: "combine",
@@ -195,6 +364,16 @@
                                 {
                                     type: "required"
                                 }
+                            ],
+                            events: [
+                                {
+                                    source: "nodeman_node_type",
+                                    type: "init",
+                                    action: function (value) {
+                                        // 统一以 change 事件抛出
+                                        this.emit_event(this.tagCode, "change", this.value);
+                                    }
+                                },
                             ]
                         }
                     },
@@ -208,6 +387,8 @@
                                 {value: "REINSTALL", text: gettext("重新安装")},
                                 {value: "UNINSTALL", text: gettext("卸载")},
                                 {value: "UPGRADE", text: gettext("升级")},
+                                {value: "RESTART", text: gettext("重启")},
+                                {value: "RELOAD", text: gettext("配置重载")},
                             ],
                             default: "INSTALL",
                             validation: [
@@ -218,51 +399,10 @@
                         },
                         events: [
                             {
-                                source: "nodeman_node_type",
+                                source: "nodeman_op_type",
                                 type: "init",
                                 action: function (value) {
-                                    node_type = value
-                                    if (value == "AGENT") {
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                            {value: "UPGRADE", text: gettext("升级")},
-                                        ]
-                                    } else {
-                                        if (this.value == "UPGRADE") {
-                                            this._set_value("INSTALL")
-                                        }
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                        ]
-                                    }
-                                }
-                            },
-                            {
-                                source: "nodeman_node_type",
-                                type: "change",
-                                action: function (value) {
-                                    node_type = value
-                                    if (value == "AGENT") {
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                            {value: "UPGRADE", text: gettext("升级")},
-                                        ]
-                                    } else {
-                                        if (this.value == "UPGRADE") {
-                                            this._set_value("INSTALL")
-                                        }
-                                        this.items = [
-                                            {value: "INSTALL", text: gettext("安裝")},
-                                            {value: "REINSTALL", text: gettext("重新安装")},
-                                            {value: "UNINSTALL", text: gettext("卸载")},
-                                        ]
-                                    }
+                                    this.emit_event(this.tagCode, "change", this.value);
                                 }
                             },
                         ]
@@ -284,20 +424,11 @@
                             ]
                         },
                         events: [
-                            {
-                                source: "nodeman_op_type",
-                                type: "init",
-                                action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    is_display_tag(this, op_type, value)
-                                }
-                            },
                             {
                                 source: "nodeman_op_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    is_display_tag(this, op_type, value)
+                                    is_install_op(this, value);
                                 }
                             },
                         ]
@@ -313,7 +444,7 @@
                                     type: "add_row",
                                     text: gettext("添加"),
                                     callback: function () {
-                                        this.add_row()
+                                        this.add_row();
                                     }
                                 },
                                 {
@@ -324,307 +455,29 @@
                                     type: "export",
                                     text: gettext("导出"),
                                     callback: function () {
-                                        this.export2Excel()
+                                        this.export2Excel();
                                     }
                                 },
 
                             ],
-                            columns: [
-                                {
-                                    tag_code: "nodeman_bk_cloud_id",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("管控区域ID"),
-                                        width: "180px",
-                                        remote: true,
-                                        items: [],
-                                        remote_url: $.context.get("site_url") + "pipeline/nodeman_get_cloud_area/",
-                                        remote_data_init: function (resp) {
-                                            if (resp.result === false) {
-                                                show_msg(resp.message, "error");
-                                            }
-                                            resp.data.unshift({"text": gettext("直连区域"), "value": 0})
-                                            return resp.data;
-                                        },
-                                        validation: [
-                                            {
-                                                type: "required",
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "nodeman_ap_id",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("接入点"),
-                                        width: "180px",
-                                        remote: true,
-                                        items: [],
-                                        remote_url: $.context.get("site_url") + "pipeline/nodeman_get_ap_list/",
-                                        remote_data_init: function (resp) {
-                                            if (resp.result === false) {
-                                                show_msg(resp.message, "error");
-                                            }
-                                            return resp.data;
-                                        },
-                                        validation: []
-                                    }
-                                },
-                                {
-                                    tag_code: "inner_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("内网IP"),
-                                        placeholder: gettext("多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true
-                                    }
-                                },
-                                {
-                                    tag_code: "outer_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("外网IP"),
-                                        placeholder: gettext("可选,如填写需与内网ip一一对应,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true,
-                                        validation: []
-                                    }
-                                },
-                                {
-                                    tag_code: "login_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("登录IP"),
-                                        placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true
-                                    }
-                                },
-                                {
-                                    tag_code: "data_ip",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("数据IP"),
-                                        placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "inner_ipv6",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("内网IP(IPV6)"),
-                                        placeholder: gettext("可为空，如纯ipv6主机，内网ipv和外网IP(IPV6)两个必须填一个"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "outer_ipv6",
-                                    type: "textarea",
-                                    attrs: {
-                                        name: gettext("外网IP(IPV6)"),
-                                        placeholder: gettext("可为空，如纯ipv6主机，外网ipv和外网IP(IPV6)两个必须填一个"),
-                                        width: "180px",
-                                        editable: true,
-                                    }
-                                },
-                                {
-                                    tag_code: "os_type",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("操作系统类型"),
-                                        width: "180px",
-                                        items: [
-                                            {value: "LINUX", text: gettext("LINUX")},
-                                            {value: "WINDOWS", text: gettext("WINDOWS")},
-                                            {value: "AIX", text: gettext("AIX")}
-                                        ],
-                                        default: "LINUX",
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "account",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("登录账号"),
-                                        width: "180px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "port",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("端口号"),
-                                        width: "100px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "auth_type",
-                                    type: "select",
-                                    attrs: {
-                                        name: gettext("认证方式"),
-                                        width: "180px",
-                                        items: [
-                                            {value: "PASSWORD", text: gettext("PASSWORD")},
-                                            {value: "KEY", text: gettext("KEY")},
-                                            {value: "TJJ_PASSWORD", text: gettext("TJJ")}
-
-                                        ],
-                                        default: "PASSWORD",
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    tag_code: "auth_key",
-                                    type: "textarea",
-                                    // TODO 能不能加一个动态选项？如果具有加密前缀，默认展示 * 脱敏
-                                    // TODO 如果重新输入保存，可以拉公钥去做加密
-                                    attrs: {
-                                        name: gettext("认证密钥"),
-                                        width: "400px",
-                                        editable: true,
-                                        validation: [
-                                            {
-                                                type: "custom",
-                                                args: function (value, parent_value) {
-                                                    let auth_type = parent_value.auth_type
-                                                    let result = {
-                                                        result: true,
-                                                        error_message: ""
-                                                    }
-                                                    if (auth_type !== "TJJ_PASSWORD" && !value.length) {
-                                                        result.result = false;
-                                                        result.error_message = gettext("请输入认证密钥");
-                                                    }
-                                                    return result
-                                                }
-                                            }
-                                        ],
-                                        showPassword: true
-                                    },
-                                    events: []
-                                },
-                                {
-                                    tag_code: "peer_exchange_switch_for_agent",
-                                    type: "radio",
-                                    attrs: {
-                                        name: gettext("BT节点探测"),
-                                        items: [
-                                            {value: 1, name: gettext("是")},
-                                            {value: 0, name: gettext("否")}
-                                        ],
-                                        default: 1,
-                                        validation: [
-                                            {
-                                                type: "required"
-                                            },
-                                        ]
-                                    },
-                                    events: [
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "init",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "change",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                    ]
-                                },
-                                {
-                                    tag_code: "speed_limit",
-                                    type: "input",
-                                    attrs: {
-                                        name: gettext("传输限速 M/s"),
-                                        width: "100px",
-                                        placeholder: gettext("请输入"),
-                                        validation: [
-                                            {
-                                                type: "custom",
-                                                args: function (value) {
-                                                    var result = {
-                                                        result: true,
-                                                        error_message: ""
-                                                    }
-                                                    if (value && !Number(value)) {
-                                                        result.result = false;
-                                                        result.error_message = gettext("请输入数字");
-                                                    }
-                                                    return result;
-                                                }
-                                            }
-                                        ]
-                                    },
-                                    events: [
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "init",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                        {
-                                            source: "nodeman_op_type",
-                                            type: "change",
-                                            action: function (value) {
-                                                let op_type = ["INSTALL", "REINSTALL"]
-                                                is_display_tag(this, op_type, value)
-                                            }
-                                        },
-                                    ]
-                                },
-                            ],
+                            columns: [],
                             hookable: true,
                             validation: [
                                 {
                                     type: "custom",
                                     args: function (value) {
-                                        let self = this
+                                        let self = this;
                                         let result = {
                                             result: true,
                                             error_message: ""
-                                        }
+                                        };
                                         let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
-                                        let install_type = ["INSTALL", "REINSTALL"]
+                                        let install_type = ["INSTALL", "REINSTALL"];
                                         if (install_type.indexOf(op_type) !== -1 && value === "") {
                                             result.result = false;
                                             result.error_message = gettext("请完善主机信息");
                                         }
-                                        return result
+                                        return result;
 
                                     }
                                 }
@@ -633,24 +486,27 @@
                         events: [
                             {
                                 source: "nodeman_op_type",
-                                type: "init",
+                                type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    if (node_type == "AGENT") {
-                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL"]
+                                    let node_type = this.get_parent().get_child("nodeman_node_type").value;
+                                    init_columns(this, node_type, value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (node_type === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, value);
                                 }
                             },
                             {
-                                source: "nodeman_op_type",
+                                source: "nodeman_node_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["INSTALL", "REINSTALL"]
-                                    if (node_type == "AGENT") {
-                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL"]
+                                    init_columns(this, value, this.get_parent().get_child("nodeman_op_type").value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (value === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
                                 }
                             },
                         ]
@@ -666,7 +522,7 @@
                                     type: "add_row",
                                     text: gettext("添加"),
                                     callback: function () {
-                                        this.add_row()
+                                        this.add_row();
                                     }
                                 },
                                 {
@@ -677,7 +533,7 @@
                                     type: "export",
                                     text: gettext("导出"),
                                     callback: function () {
-                                        this.export2Excel()
+                                        this.export2Excel();
                                     }
                                 },
 
@@ -717,18 +573,18 @@
                                 {
                                     type: "custom",
                                     args: function (value) {
-                                        let self = this
+                                        let self = this;
                                         let result = {
                                             result: true,
                                             error_message: ""
-                                        }
+                                        };
                                         let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
-                                        let install_type = ["UNINSTALL", "UPGRADE"]
+                                        let install_type = ["UNINSTALL", "UPGRADE"];
                                         if (install_type.indexOf(op_type) !== -1 && value === "") {
                                             result.result = false;
                                             result.error_message = gettext("请完善主机信息");
                                         }
-                                        return result
+                                        return result;
 
                                     }
                                 }
@@ -737,24 +593,24 @@
                         events: [
                             {
                                 source: "nodeman_op_type",
-                                type: "init",
+                                type: "change",
                                 action: function (value) {
-                                    let op_type = ["UPGRADE"]
-                                    if (node_type == "PROXY") {
-                                        op_type = ["UPGRADE", "UNINSTALL"]
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (this.get_parent().get_child("nodeman_node_type").value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, value);
                                 }
                             },
                             {
-                                source: "nodeman_op_type",
+                                source: "nodeman_node_type",
                                 type: "change",
                                 action: function (value) {
-                                    let op_type = ["UPGRADE"]
-                                    if (node_type == "PROXY") {
-                                        op_type = ["UPGRADE", "UNINSTALL"]
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
                                     }
-                                    is_display_tag(this, op_type, value)
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
                                 }
                             },
                         ]
@@ -762,5 +618,5 @@
                 ],
             },
         },
-    ]
+    ];
 })();
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
index 04e0eee81b..5836b6ad1f 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
@@ -13,16 +13,16 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
     ComponentTestCase,
     ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v3_0 import NodemanCreateTaskComponent
 
 
@@ -743,7 +743,6 @@ def __init__(
     inputs={
         "bk_biz_id": "1",
         "nodeman_node_type": "AGENT",
-        "nodeman_ticket": {"nodeman_tjj_ticket": "xxxxx"},
         "nodeman_op_info": {
             "nodeman_op_type": "INSTALL",
             "nodeman_ip_str": "",
@@ -798,7 +797,6 @@ def __init__(
                                 "data_ip": "1.1.1.1",
                             }
                         ],
-                        "tcoa_ticket": "xxxxx",
                     }
                 )
             ],
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
index e5dca2876d..8ff67501a0 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
@@ -13,16 +13,16 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
     ComponentTestCase,
     ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v4_0 import NodemanCreateTaskComponent
 
 
@@ -31,6 +31,7 @@ def cases(self):
         return [
             INSTALL_SUCCESS_CASE,
             REINSTALL_SUCCESS_CASE,
+            RELOAD_SUCCESS_CASE,
             INSTALL_FAIL_CASE,
             OPERATE_SUCCESS_CASE,
             OPERATE_FAIL_CASE,
@@ -241,7 +242,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -332,7 +333,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -349,7 +350,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "4.4.4.4",
                                 "login_ip": "6.6.6.6",
@@ -366,7 +367,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "5.5.5.5",
                                 "login_ip": "7.7.7.7",
@@ -400,6 +401,111 @@ def __init__(
     ],
 )
 
+RELOAD_SUCCESS_CASE = ComponentTestCase(
+    name="nodeman v4.0 reinstall task success case",
+    inputs={
+        "bk_biz_id": "1",
+        "nodeman_op_info": {
+            "nodeman_op_type": "RELOAD",
+            "nodeman_node_type": "AGENT",
+            "nodeman_hosts": [
+                {
+                    "bk_biz_id": "1",
+                    "nodeman_bk_cloud_id": "1",
+                    "nodeman_ap_id": "1",
+                    "inner_ip": "1.1.1.1",
+                    "os_type": "LINUX",
+                    "peer_exchange_switch_for_agent": 0,
+                    "speed_limit": "100",
+                },
+                {
+                    "bk_biz_id": "1",
+                    "nodeman_bk_cloud_id": "1",
+                    "nodeman_ap_id": "1",
+                    "os_type": "LINUX",
+                    "inner_ip": "2.2.2.2,3.3.3.3",
+                    "peer_exchange_switch_for_agent": 0,
+                    "speed_limit": "100",
+                },
+            ],
+        },
+    },
+    parent_data={"executor": "tester"},
+    execute_assertion=ExecuteAssertion(success=True, outputs={"job_id": "1"}),
+    schedule_assertion=ScheduleAssertion(
+        success=True,
+        callback_data=None,
+        schedule_finished=True,
+        outputs={"fail_num": 0, "job_id": "1", "success_num": 1},
+    ),
+    execute_call_assertion=[
+        CallAssertion(
+            func=INSTALL_OR_OPERATE_SUCCESS_CLIENT.job_install,
+            calls=[
+                Call(
+                    **{
+                        "job_type": "RELOAD_AGENT",
+                        "hosts": [
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "1.1.1.1",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 1,
+                            },
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "2.2.2.2",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 2,
+                            },
+                            {
+                                "bk_biz_id": "1",
+                                "bk_cloud_id": "1",
+                                "os_type": "LINUX",
+                                "inner_ip": "3.3.3.3",
+                                "ap_id": "1",
+                                "is_manual": False,  # 不手动操作
+                                "bt_speed_limit": 100,
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "bk_host_id": 3,
+                            },
+                        ],
+                    }
+                )
+            ],
+        ),
+    ],
+    schedule_call_assertion=[
+        CallAssertion(
+            func=INSTALL_OR_OPERATE_SUCCESS_CLIENT.job_details,
+            calls=[Call(**{"job_id": "1"})],
+        ),
+    ],
+    patchers=[
+        Patcher(target=GET_CLIENT_BY_USER, return_value=INSTALL_OR_OPERATE_SUCCESS_CLIENT),
+        Patcher(target=BASE_GET_CLIENT_BY_USER, return_value=INSTALL_OR_OPERATE_SUCCESS_CLIENT),
+        Patcher(
+            target=GET_BUSINESS_HOST,
+            return_value=[
+                {"bk_host_innerip": "1.1.1.1", "bk_host_id": 1},
+                {"bk_host_innerip": "2.2.2.2", "bk_host_id": 2},
+                {"bk_host_innerip": "3.3.3.3", "bk_host_id": 3},
+            ],
+        ),
+        Patcher(target=ENCRYPT_AUTH_KEY, return_value="encrypt_auth_key"),
+    ],
+)
+
 INSTALL_FAIL_CASE = ComponentTestCase(
     name="nodeman v4.0 install task failed case",
     inputs={
@@ -447,7 +553,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -635,7 +741,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "3.3.3.3",
                                 "login_ip": "5.5.5.5",
@@ -652,7 +758,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "4.4.4.4",
                                 "login_ip": "6.6.6.6",
@@ -669,7 +775,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "3.3.3.3",
                                 "login_ip": "5.5.5.5",
@@ -686,7 +792,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "data_ip": "7.7.7.7",
                                 "bk_host_id": 1,
@@ -720,7 +826,6 @@ def __init__(
     inputs={
         "bk_biz_id": "1",
         "nodeman_node_type": "AGENT",
-        "nodeman_ticket": {"nodeman_tjj_ticket": "xxxxx"},
         "nodeman_op_info": {
             "nodeman_op_type": "INSTALL",
             "nodeman_node_type": "AGENT",
@@ -734,7 +839,7 @@ def __init__(
                     "os_type": "LINUX",
                     "port": "22",
                     "account": "test",
-                    "auth_type": "PASSWORD",
+                    "auth_type": "TJJ_PASSWORD",
                     "auth_key": "123",
                     "outer_ip": "1.1.1.1",
                     "login_ip": "1.1.1.1",
@@ -767,17 +872,16 @@ def __init__(
                                 "os_type": "LINUX",
                                 "port": "22",
                                 "account": "test",
-                                "auth_type": "PASSWORD",
+                                "auth_type": "TJJ_PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
-                                "password": "encrypt_auth_key",
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
+                                "key": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
                                 "data_ip": "1.1.1.1",
                             }
                         ],
-                        "tcoa_ticket": "xxxxx",
                     }
                 )
             ],
@@ -910,7 +1014,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "1",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "1.1.1.1",
                                 "login_ip": "1.1.1.1",
@@ -926,7 +1030,7 @@ def __init__(
                                 "auth_type": "PASSWORD",
                                 "ap_id": "2",
                                 "is_manual": False,  # 不手动操作
-                                "peer_exchange_switch_for_agent": 1,  # 不加速
+                                "peer_exchange_switch_for_agent": 0,  # 不加速
                                 "password": "encrypt_auth_key",
                                 "outer_ip": "2.2.2.2",
                                 "login_ip": "2.2.2.2",

From cda7a21134b3f1545fd955cd2fc46682caf8f8ef Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 10 Aug 2023 14:49:17 +0800
Subject: [PATCH 063/112] minor: review fix

---
 .../components/collections/sites/open/nodeman/base.py        | 5 ++---
 .../collections/sites/open/nodeman/create_task/v4_0.py       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/base.py b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
index 93e7133144..778f7bf9f5 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/base.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
@@ -141,9 +141,8 @@ def get_host_id_list(self, ip_str, executor, bk_cloud_id, bk_biz_id):
         # 如果开启了ipv6的逻辑，则执行
         if settings.ENABLE_IPV6:
             ipv6_list, ipv4_list, *_ = extract_ip_from_ip_str(ip_str)
-            ip_list = ipv4_list + ipv6_list
-            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
-            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
+            bk_host_id_dict_ipv6 = get_host_id_by_inner_ipv6(executor, self.logger, bk_cloud_id, bk_biz_id, ipv6_list)
+            bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ipv4_list)
             return list(set(bk_host_id_dict_ipv6.values()) | set(bk_host_id_dict.values()))
 
         ip_list = get_ip_by_regex(ip_str)
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
index bf68a50efd..c07311b5d8 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
@@ -123,7 +123,7 @@ def execute(self, data, parent_data):
                     try:
                         auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
                     except Exception:
-                        # password is not encrypted
+                        self.logger.info("try to decrypt password error, use plaintext.")
                         pass
 
                     # auth_key加密

From b37e29d73cc946cfe632d3360e03243e57a78880 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 17 Aug 2023 21:30:25 +0800
Subject: [PATCH 064/112] =?UTF-8?q?feature:=20=E5=9B=BD=E5=AF=86=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/default.py                             |   4 +-
 gcloud/tests/utils/test_crypto.py             |  62 ++
 gcloud/utils/crypto.py                        |  89 +--
 .../all_biz_execute_job_plan/base_service.py  |  19 +-
 .../job/execute_task/execute_task_base.py     |   9 +-
 .../collections/sites/open/nodeman/base.py    |  52 +-
 .../sites/open/nodeman/create_task/v2_0.py    |  36 +-
 .../sites/open/nodeman/create_task/v3_0.py    |  20 +-
 .../sites/open/nodeman/create_task/v4_0.py    |  25 +-
 .../sites/open/nodeman/create_task/v5_0.py    |  39 ++
 .../wechat_work_send_message/v1_0.py          |  21 +-
 .../wechat_work_send_message/v2_0.py          |  37 ++
 .../atoms/nodeman/create_task/v4_0.js         |   1 -
 .../atoms/nodeman/create_task/v5_0.js         | 619 ++++++++++++++++++
 .../wechat_work_send_message/v2_0.js          |  59 ++
 pipeline_plugins/components/utils/common.py   |  11 +
 .../test_nodeman_v2_create_task.py            |  10 +-
 .../test_nodeman_v3_create_task.py            |   4 +-
 .../test_nodeman_v4_create_task.py            |   4 +-
 .../test_wechat_work_send_message_v1_0.py     |  46 +-
 pipeline_plugins/tests/utils/test_utils.py    |  14 +-
 .../variables/collections/common.py           |   1 -
 .../variables/static/variables/password.js    |   4 +-
 requirements.txt                              |   2 +-
 24 files changed, 1023 insertions(+), 165 deletions(-)
 create mode 100644 gcloud/tests/utils/test_crypto.py
 create mode 100644 pipeline_plugins/components/collections/sites/open/nodeman/create_task/v5_0.py
 create mode 100644 pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v2_0.py
 create mode 100644 pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
 create mode 100644 pipeline_plugins/components/static/components/atoms/wechat_work/wechat_work_send_message/v2_0.js

diff --git a/config/default.py b/config/default.py
index 5d302cd9e9..e6526cc32f 100644
--- a/config/default.py
+++ b/config/default.py
@@ -16,8 +16,8 @@
 from urllib.parse import urlparse
 
 from bamboo_engine.config import Settings as BambooSettings
+from bkcrypto import constants as bkcrypto_constants
 from bkcrypto.asymmetric.options import RSAAsymmetricOptions
-from bkcrypto.symmetric.options import AESSymmetricOptions, SM4SymmetricOptions
 from blueapps.conf.default_settings import *  # noqa
 from blueapps.conf.log import get_logging_config_dict
 from blueapps.opentelemetry.utils import inject_logging_trace_info
@@ -27,8 +27,6 @@
 import env
 from gcloud.exceptions import ApiRequestError
 
-from bkcrypto import constants as bkcrypto_constants
-
 # 这里是默认的 INSTALLED_APPS，大部分情况下，不需要改动
 # 如果你已经了解每个默认 APP 的作用，确实需要去掉某些 APP，请去掉下面的注释，然后修改
 # INSTALLED_APPS = (
diff --git a/gcloud/tests/utils/test_crypto.py b/gcloud/tests/utils/test_crypto.py
new file mode 100644
index 0000000000..3370aa17ae
--- /dev/null
+++ b/gcloud/tests/utils/test_crypto.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+"""
+Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community
+Edition) available.
+Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://opensource.org/licenses/MIT
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+"""
+import random
+
+from bkcrypto import constants as bkcrypto_constants
+from bkcrypto.asymmetric.ciphers import BaseAsymmetricCipher
+from bkcrypto.asymmetric.options import RSAAsymmetricOptions
+from bkcrypto.contrib.django.ciphers import get_asymmetric_cipher
+from bkcrypto.contrib.django.selectors import AsymmetricCipherSelector
+from django.test import TestCase
+
+from gcloud.utils import crypto
+
+
+class CryptoTestCase(TestCase):
+
+    plaintext: str = None
+    legacy_cipher: BaseAsymmetricCipher = None
+
+    def setUp(self) -> None:
+        self.plaintext = "123" * random.randint(1, 100)
+        self.legacy_cipher = get_asymmetric_cipher(
+            cipher_type=bkcrypto_constants.AsymmetricCipherType.RSA.value,
+            cipher_options={
+                bkcrypto_constants.AsymmetricCipherType.RSA.value: RSAAsymmetricOptions(
+                    public_key_string=crypto.get_default_asymmetric_key_config(
+                        cipher_type=bkcrypto_constants.AsymmetricCipherType.RSA.value
+                    ).public_key_string,
+                    padding=bkcrypto_constants.RSACipherPadding.PKCS1_v1_5,
+                )
+            },
+        )
+
+    def test_ciphertext_without_prefix(self):
+        """测试不带前缀的密文，模拟存量数据场景"""
+        self.assertEqual(crypto.decrypt(ciphertext=self.legacy_cipher.encrypt(self.plaintext)), self.plaintext)
+
+    def test_ciphertext_with_secondary_encryption(self):
+        """测试原密文再次保存被二次加密的场景"""
+        ciphertext_without_prefix: str = self.legacy_cipher.encrypt(self.plaintext)
+        ciphertext: str = AsymmetricCipherSelector().encrypt(ciphertext_without_prefix)
+        self.assertEqual(crypto.decrypt(ciphertext=ciphertext), self.plaintext)
+
+    def test_ciphertext(self):
+        """模拟新数据加密携带前缀的场景"""
+        ciphertext: str = AsymmetricCipherSelector().encrypt(plaintext=self.plaintext)
+        print(ciphertext)
+        self.assertTrue(ciphertext.startswith(f"{bkcrypto_constants.AsymmetricCipherType.RSA.value.lower()}_str:::"))
+        self.assertEqual(crypto.decrypt(ciphertext=ciphertext), self.plaintext)
+
+    def test_plaintext(self):
+        self.assertEqual(self.plaintext, crypto.decrypt(self.plaintext))
diff --git a/gcloud/utils/crypto.py b/gcloud/utils/crypto.py
index 822a44446d..875438c308 100644
--- a/gcloud/utils/crypto.py
+++ b/gcloud/utils/crypto.py
@@ -10,14 +10,14 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
-import base64
 import json
+import typing
 
 from bkcrypto import constants as crypto_constants
 from bkcrypto.asymmetric.configs import KeyConfig as AsymmetricKeyConfig
-from Crypto import Util
-from Crypto.Cipher import PKCS1_v1_5 as PKCS1_v1_5_cipher
-from Crypto.PublicKey import RSA
+from bkcrypto.constants import AsymmetricCipherType
+from bkcrypto.contrib.django.ciphers import asymmetric_cipher_manager
+from bkcrypto.contrib.django.selectors import AsymmetricCipherSelector
 from django.conf import settings
 
 
@@ -42,72 +42,23 @@ def get_default_asymmetric_key_config(cipher_type: str) -> AsymmetricKeyConfig:
     )
 
 
-def get_nodeman_asymmetric_key_config(cipher_type: str) -> AsymmetricKeyConfig:
-    """
-    获取节点管理非对称加密配置
-    :param cipher_type:
-    :return:
-    """
-    pass
+def decrypt(ciphertext: str, using: typing.Optional[str] = None) -> str:
+    using = using or "default"
+    # 1. 尝试根据前缀解密
+    plaintext: str = AsymmetricCipherSelector(using=using).decrypt(ciphertext)
 
+    # 2. 尝试对明文二次 RSA 解密，用于兼容原逻辑
+    try:
+        plaintext = asymmetric_cipher_manager.cipher(using=using, cipher_type=AsymmetricCipherType.RSA.value).decrypt(
+            plaintext
+        )
+    except Exception:
+        # 已经是明文的情况下会抛出该异常
+        pass
 
-def _get_block_size(key_obj, is_encrypt=True) -> int:
-    """
-    获取加解密最大片长度，用于分割过长的文本，单位：bytes
-    :param key_obj:
-    :param is_encrypt:
-    :return:
-    """
-    block_size = Util.number.size(key_obj.n) / 8
-    reserve_size = 11
-    if not is_encrypt:
-        reserve_size = 0
-    return int(block_size - reserve_size)
+    return plaintext
 
 
-def _block_list(lst, block_size):
-    """
-    序列切片
-    :param lst:
-    :param block_size:
-    :return:
-    """
-    for idx in range(0, len(lst), block_size):
-        yield lst[idx : idx + block_size]
-
-
-def encrypt_auth_key(auth_key, public_key_name, public_key):
-    """
-    @summary: rsa分块加密
-    @param auth_key: 待加密的敏感信息
-    @param public_key_name: 公钥名称
-    @param public_key: 公钥
-    """
-    public_key_obj = RSA.importKey(public_key)
-    message_bytes = auth_key.encode(encoding="utf-8")
-    encrypt_message_bytes = b""
-    block_size = _get_block_size(public_key_obj)
-    cipher = PKCS1_v1_5_cipher.new(public_key_obj)
-    for block in _block_list(message_bytes, block_size):
-        encrypt_message_bytes += cipher.encrypt(block)
-
-    encrypt_message = base64.b64encode(public_key_name.encode("utf-8")) + base64.b64encode(encrypt_message_bytes)
-    return encrypt_message.decode(encoding="utf-8")
-
-
-def decrypt_auth_key(encrypt_message, private_key):
-    """
-    @summary: rsa分块解密
-    @param encrypt_message: 密文
-    @param private_key: rsa私钥
-    @return: 解密后的信息
-    """
-    # TODO 要改的
-    decrypt_message_bytes = b""
-    private_key_obj = RSA.importKey(private_key.strip("\n"))
-    encrypt_message_bytes = base64.b64decode(encrypt_message)
-    block_size = _get_block_size(private_key_obj, is_encrypt=False)
-    cipher = PKCS1_v1_5_cipher.new(private_key_obj)
-    for block in _block_list(encrypt_message_bytes, block_size):
-        decrypt_message_bytes += cipher.decrypt(block, "")
-    return decrypt_message_bytes.decode(encoding="utf-8")
+def encrypt(plaintext: str, using: typing.Optional[str] = None) -> str:
+    using = using or "default"
+    return AsymmetricCipherSelector(using=using).encrypt(plaintext)
diff --git a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
index 67ca542d08..b9291c565f 100644
--- a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
+++ b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
@@ -5,26 +5,23 @@
 
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
+from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
+
 from gcloud.conf import settings
 from gcloud.constants import JobBizScopeType
+from gcloud.utils import crypto
 from gcloud.utils.handlers import handle_api_error
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
 from pipeline_plugins.components.collections.sites.open.job import Jobv3Service
 from pipeline_plugins.components.collections.sites.open.job.ipv6_base import GetJobTargetServerMixin
-from pipeline.core.flow.io import (
-    StringItemSchema,
-    IntItemSchema,
-    ArrayItemSchema,
-    ObjectItemSchema,
-)
+from pipeline_plugins.components.query.sites.open.job import JOBV3_VAR_CATEGORY_IP, JOBV3_VAR_CATEGORY_PASSWORD
 from pipeline_plugins.components.utils import (
     get_job_instance_url,
     get_node_callback_url,
+    has_biz_set,
     loose_strip,
     plat_ip_reg,
-    has_biz_set,
 )
-from pipeline_plugins.components.query.sites.open.job import JOBV3_VAR_CATEGORY_IP
 
 __group_name__ = _("作业平台(JOB)")
 
@@ -126,8 +123,7 @@ def execute(self, data, parent_data):
             self.biz_scope_type = JobBizScopeType.BIZ.value
 
         for _value in original_global_var:
-            # 3-IP
-            val = loose_strip(_value["value"])
+            val = loose_strip(crypto.decrypt(_value["value"]))
             if _value["type"] == JOBV3_VAR_CATEGORY_IP:
 
                 ip_list = self.get_ip_list(val)
@@ -141,6 +137,9 @@ def execute(self, data, parent_data):
 
                 if result:
                     global_var_list.append({"id": _value["id"], "server": server})
+            # 密文变量在没有修改的情况下不加入全局变量，避免脱敏字符串作为正式值进行作业执行逻辑
+            elif _value["category"] == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
+                continue
             else:
                 global_var_list.append({"id": _value["id"], "value": val})
 
diff --git a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
index 51a80a361a..d5534c7409 100644
--- a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
+++ b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
@@ -19,9 +19,11 @@
 from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
 
 from gcloud.conf import settings
+from gcloud.utils import crypto
 from gcloud.utils.handlers import handle_api_error
 from pipeline_plugins.components.collections.sites.open.job import JobService
 from pipeline_plugins.components.collections.sites.open.job.ipv6_base import GetJobTargetServerMixin
+from pipeline_plugins.components.query.sites.open.job import JOBV3_VAR_CATEGORY_IP, JOBV3_VAR_CATEGORY_PASSWORD
 from pipeline_plugins.components.utils import get_job_instance_url, get_node_callback_url, loose_strip
 
 __group_name__ = _("作业平台(JOB)")
@@ -149,9 +151,9 @@ def execute(self, data, parent_data):
         biz_across = data.get_one_of_inputs("biz_across")
 
         for _value in original_global_var:
-            val = loose_strip(_value["value"])
+            val = loose_strip(crypto.decrypt(_value["value"]))
             # category为3,表示变量类型为IP
-            if _value["category"] == 3:
+            if _value["category"] == JOBV3_VAR_CATEGORY_IP:
                 self.logger.info("[job_execute_task_base] start find ip, var={}".format(val))
                 if val:
                     server = self.build_ip_list(biz_across, val, executor, biz_cc_id, data, ip_is_exist)
@@ -160,6 +162,9 @@ def execute(self, data, parent_data):
                         data.outputs.ex_data = _(f"无法从配置平台(CMDB)查询到对应 IP，请确认输入的 IP 是否合法。查询失败 IP： {val}")
                         return False
                     global_vars.append({"name": _value["name"], "server": server})
+            # 密文变量在没有修改的情况下不加入全局变量，避免脱敏字符串作为正式值进行作业执行逻辑
+            elif _value["category"] == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
+                continue
             else:
                 global_vars.append({"name": _value["name"], "value": val})
         job_kwargs = {
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/base.py b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
index 778f7bf9f5..82b8059561 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/base.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/base.py
@@ -10,7 +10,13 @@
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 """
+import base64
+
 import ujson as json
+from bkcrypto.asymmetric.ciphers import BaseAsymmetricCipher
+from bkcrypto.asymmetric.interceptors import BaseAsymmetricInterceptor
+from bkcrypto.constants import AsymmetricCipherType
+from bkcrypto.contrib.django.ciphers import get_asymmetric_cipher
 from django.utils.translation import ugettext_lazy as _
 from pipeline.core.flow.activity import Service, StaticIntervalGenerator
 from pipeline.core.flow.io import ArrayItemSchema, IntItemSchema, ObjectItemSchema, StringItemSchema
@@ -25,6 +31,15 @@
 from pipeline_plugins.components.utils.sites.open.utils import get_nodeman_job_url
 
 
+class NodeManAsymmetricInterceptor(BaseAsymmetricInterceptor):
+
+    PREFIX: str = base64.b64encode("DEFAULT".encode()).decode(encoding="utf-8")
+
+    @classmethod
+    def after_encrypt(cls, ciphertext: str, **kwargs) -> str:
+        return f"{cls.PREFIX}{ciphertext}"
+
+
 def get_host_id_by_inner_ip(executor, logger, bk_cloud_id: int, bk_biz_id: int, ip_list: list):
     """
     根据inner_ip获取bk_host_id 对应关系dict
@@ -71,19 +86,28 @@ def get_host_id_by_inner_ipv6(executor, logger, bk_cloud_id: int, bk_biz_id: int
     return {host["inner_ipv6"]: host["bk_host_id"] for host in result["data"]["list"]}
 
 
-def get_nodeman_rsa_public_key(executor, logger):
+def get_nodeman_public_key(executor, logger):
     """
     拉取节点管理rsa公钥
     """
     client = BKNodeManClient(username=executor)
-    get_rsa_result = client.get_rsa_public_key(executor)
-    if not get_rsa_result["result"]:
-        error = handle_api_error(__group_name__, "nodeman.get_rsa_public_key", executor, get_rsa_result)
+    pub_key_response = client.get_rsa_public_key(executor)
+    if not pub_key_response["result"]:
+        error = handle_api_error(__group_name__, "nodeman.get_rsa_public_key", executor, pub_key_response)
         logger.error(error)
         return False, None
-    content = get_rsa_result["data"][0]["content"]
-    name = get_rsa_result["data"][0]["name"]
-    return True, {"name": name, "content": content}
+    try:
+        public_key_info = pub_key_response["data"][0]
+    except (AssertionError, IndexError):
+        logger.error("fetch_public_keys return empty data")
+        return False, None
+
+    return True, {
+        "name": public_key_info["name"],
+        "content": public_key_info["content"],
+        # 如果没有返回 cipher_type，说明本环境节点管理还没更新为国密适配版本，此时设置 cipher_type 为 RSA，向前兼容节点管理的接口行为
+        "cipher_type": public_key_info.get("cipher_type") or AsymmetricCipherType.RSA.value,
+    }
 
 
 class NodeManBaseService(Service):
@@ -149,6 +173,20 @@ def get_host_id_list(self, ip_str, executor, bk_cloud_id, bk_biz_id):
         bk_host_id_dict = get_host_id_by_inner_ip(executor, self.logger, bk_cloud_id, bk_biz_id, ip_list)
         return [bk_host_id for bk_host_id in bk_host_id_dict.values()]
 
+    def parse2nodeman_ciphertext(self, data, executor, plaintext) -> str:
+        success, public_key_info = get_nodeman_public_key(executor, self.logger)
+        if not success:
+            data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+            raise ValueError
+
+        # 根据接口的 cipher type 和 publickey 创建 cipher
+        cipher: BaseAsymmetricCipher = get_asymmetric_cipher(
+            cipher_type=public_key_info["cipher_type"],
+            common={"public_key_string": public_key_info["content"], "interceptor": NodeManAsymmetricInterceptor},
+        )
+
+        return cipher.encrypt(plaintext)
+
     def outputs_format(self):
         return [
             self.OutputItem(
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v2_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v2_0.py
index 89adb8d22c..b4aac307aa 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v2_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v2_0.py
@@ -18,15 +18,17 @@
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
-from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
+from gcloud.utils import crypto
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
     NodeManBaseService,
     get_host_id_by_inner_ip,
     get_host_id_by_inner_ipv6,
-    get_nodeman_rsa_public_key,
 )
 
 __group_name__ = _("节点管理(Nodeman)")
+
+from pipeline_plugins.components.utils import parse_passwd_value
+
 VERSION = "v2.0"
 
 # 安装类任务(job_install)
@@ -55,15 +57,6 @@ def execute(self, data, parent_data):
         bk_cloud_id = nodeman_op_target.get("nodeman_bk_cloud_id", "")
         node_type = nodeman_op_target.get("nodeman_node_type", "")
 
-        nodeman_ticket = data.get_one_of_inputs("nodeman_ticket", {})
-        nodeman_tjj_ticket = nodeman_ticket.get("nodeman_tjj_ticket", "")
-        if nodeman_tjj_ticket:
-            try:
-                nodeman_tjj_ticket = decrypt_auth_key(nodeman_tjj_ticket, settings.RSA_PRIV_KEY)
-            except Exception:
-                # password is not encrypted
-                pass
-
         nodeman_op_info = data.inputs.nodeman_op_info
         op_type = nodeman_op_info.get("nodeman_op_type", "")
         nodeman_hosts = nodeman_op_info.get("nodeman_hosts", [])
@@ -105,7 +98,6 @@ def execute(self, data, parent_data):
             all_hosts, row_host_params_list = [], []
             for host in nodeman_hosts:
                 auth_type = host["auth_type"]
-                auth_key = host["auth_key"]
                 use_inner_ip = True if host.get("inner_ip") else False
                 # use_inner_ip 判定用户输入的的是ipv4还是ipv6
                 inner_ip_list = self.get_ip_list(
@@ -118,17 +110,12 @@ def execute(self, data, parent_data):
                     return False
 
                 # 处理表格中每行的key/psw
+                auth_key: str = crypto.decrypt(parse_passwd_value(host["auth_key"]))
                 try:
-                    auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
-                except Exception:
-                    # password is not encrypted
-                    pass
-                # auth_key加密
-                success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
-                if not success:
-                    data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+                    auth_key: str = self.parse2nodeman_ciphertext(data, executor, auth_key)
+                except ValueError:
                     return False
-                auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+
                 # 表格每行基础参数
                 base_params = {
                     "bk_biz_id": bk_biz_id,
@@ -188,8 +175,6 @@ def execute(self, data, parent_data):
 
             kwargs = {"job_type": job_name, "hosts": all_hosts, "action": "job_install"}
 
-            if nodeman_tjj_ticket:
-                kwargs.update({"tcoa_ticket": nodeman_tjj_ticket})
         else:
             data.set_outputs("ex_data", _("无效的操作请求:{}".format(job_name)))
             return False
@@ -202,7 +187,10 @@ def execute(self, data, parent_data):
     def inputs_format(self):
         return [
             self.InputItem(
-                name=_("业务 ID"), key="bk_biz_id", type="int", schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
+                name=_("业务 ID"),
+                key="bk_biz_id",
+                type="int",
+                schema=IntItemSchema(description=_("当前操作所属的 CMDB 业务 ID")),
             ),
             self.InputItem(
                 name=_("操作对象"),
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
index c3c0cb514a..518ed9ff03 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v3_0.py
@@ -17,15 +17,17 @@
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
-from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
+from gcloud.utils import crypto
 from pipeline_plugins.components.collections.sites.open.nodeman.base import (
     NodeManNewBaseService,
     get_host_id_by_inner_ip,
     get_host_id_by_inner_ipv6,
-    get_nodeman_rsa_public_key,
 )
 
 __group_name__ = _("节点管理(Nodeman)")
+
+from pipeline_plugins.components.utils import parse_passwd_value
+
 VERSION = "v3.0"
 
 # 安装类任务(job_install)
@@ -98,7 +100,6 @@ def execute(self, data, parent_data):
                 bk_cloud_id = host["nodeman_bk_cloud_id"]
                 ap_id = host["nodeman_ap_id"]
                 auth_type = host["auth_type"]
-                auth_key = host["auth_key"]
                 use_inner_ip = True if host.get("inner_ip") else False
                 # use_inner_ip 判定用户输入的的是ipv4还是ipv6
                 inner_ip_list = self.get_ip_list(
@@ -112,17 +113,12 @@ def execute(self, data, parent_data):
                     return False
 
                 # 处理表格中每行的key/psw
+                auth_key: str = crypto.decrypt(parse_passwd_value(host["auth_key"]))
                 try:
-                    auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
-                except Exception:
-                    # password is not encrypted
-                    pass
-                # auth_key加密
-                success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
-                if not success:
-                    data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+                    auth_key: str = self.parse2nodeman_ciphertext(data, executor, auth_key)
+                except ValueError:
                     return False
-                auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
+
                 # 表格每行基础参数
                 base_params = {
                     "bk_biz_id": bk_biz_id,
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
index c07311b5d8..6c1a984931 100644
--- a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py
@@ -17,15 +17,15 @@
 
 from api.collections.nodeman import BKNodeManClient
 from gcloud.conf import settings
+from gcloud.utils import crypto
 from gcloud.utils.cmdb import get_business_host, get_business_host_ipv6
-from gcloud.utils.crypto import decrypt_auth_key, encrypt_auth_key
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
-from pipeline_plugins.components.collections.sites.open.nodeman.base import (
-    NodeManNewBaseService,
-    get_nodeman_rsa_public_key,
-)
+from pipeline_plugins.components.collections.sites.open.nodeman.base import NodeManNewBaseService
 
 __group_name__ = _("节点管理(Nodeman)")
+
+from pipeline_plugins.components.utils import parse_passwd_value
+
 VERSION = "v4.0"
 
 # 无需认证信息的操作
@@ -117,21 +117,12 @@ def execute(self, data, parent_data):
                         }
                     )
 
-                    auth_key = host["auth_key"]
-
                     # 处理表格中每行的key/psw
+                    auth_key: str = crypto.decrypt(parse_passwd_value(host["auth_key"]))
                     try:
-                        auth_key = decrypt_auth_key(auth_key, settings.RSA_PRIV_KEY)
-                    except Exception:
-                        self.logger.info("try to decrypt password error, use plaintext.")
-                        pass
-
-                    # auth_key加密
-                    success, ras_public_key = get_nodeman_rsa_public_key(executor, self.logger)
-                    if not success:
-                        data.set_outputs("ex_data", _("获取节点管理公钥失败,请查看节点日志获取错误详情."))
+                        auth_key: str = self.parse2nodeman_ciphertext(data, executor, auth_key)
+                    except ValueError:
                         return False
-                    auth_key = encrypt_auth_key(auth_key, ras_public_key["name"], ras_public_key["content"])
 
                     if auth_params["auth_type"] == "PASSWORD":
                         auth_params["password"] = auth_key
diff --git a/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v5_0.py b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v5_0.py
new file mode 100644
index 0000000000..ad8d448e0e
--- /dev/null
+++ b/pipeline_plugins/components/collections/sites/open/nodeman/create_task/v5_0.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""
+Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community
+Edition) available.
+Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://opensource.org/licenses/MIT
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+"""
+
+
+from django.utils.translation import ugettext_lazy as _
+from pipeline.component_framework.component import Component
+
+from gcloud.conf import settings
+
+__group_name__ = _("节点管理(Nodeman)")
+
+from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v4_0 import (
+    NodemanCreateTaskService as NodemanCreateTaskV4Service,
+)
+
+VERSION = "v5.0"
+
+
+class NodemanCreateTaskService(NodemanCreateTaskV4Service):
+    pass
+
+
+class NodemanCreateTaskComponent(Component):
+    name = _("新建任务")
+    code = "nodeman_create_task"
+    bound_service = NodemanCreateTaskService
+    form = "%scomponents/atoms/nodeman/create_task/v5_0.js" % settings.STATIC_URL
+    version = VERSION
+    desc = _("v5.0版本 支持密码脱敏填写")
diff --git a/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
index e14ccbcf94..1d00698457 100644
--- a/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
+++ b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
@@ -15,15 +15,18 @@
 
 import requests
 from django.utils.translation import ugettext_lazy as _
-
-from pipeline.core.flow.activity import Service
 from pipeline.component_framework.component import Component
 from pipeline.conf import settings
+from pipeline.core.flow.activity import Service
 from pipeline.core.flow.io import StringItemSchema
+
 from gcloud.core.models import EnvironmentVariables
 
 __group_name__ = _("企业微信(WechatWork)")
 
+from gcloud.utils import crypto
+from pipeline_plugins.components.utils import parse_passwd_value
+
 
 class WechatWorkSendMessageService(Service):
     def inputs_format(self):
@@ -35,7 +38,10 @@ def inputs_format(self):
                 schema=StringItemSchema(description=_("通过在群里@企业微信机器人获取，多个用换行分隔")),
             ),
             self.InputItem(
-                name=_("消息内容"), key="message_content", type="string", schema=StringItemSchema(description=_("消息内容")),
+                name=_("消息内容"),
+                key="message_content",
+                type="string",
+                schema=StringItemSchema(description=_("消息内容")),
             ),
             self.InputItem(
                 name=_("提醒人"),
@@ -57,8 +63,13 @@ def execute(self, data, parent_data):
         mentioned_members = data.inputs.wechat_work_mentioned_members
         msgtype = data.get_one_of_inputs("msgtype", "text")
 
+        # 尝试解密
+        chat_id: str = crypto.decrypt(parse_passwd_value(chat_id))
+
         chat_id_list = chat_id.split("\n")
 
+        print(chat_id_list)
+
         url = EnvironmentVariables.objects.get_var("BKAPP_SOPS_WECHAT_WORK_WEB_HOOK")
         if not url:
             data.outputs.ex_data = "WechatWork send message URL is not config, contact admin please"
@@ -68,9 +79,9 @@ def execute(self, data, parent_data):
             data.outputs.ex_data = _("会话 ID 不能为空")
             return False
 
-        for c in chat_id_list:
+        for idx, c in enumerate(chat_id_list, 1):
             if len(c) != 32:
-                data.outputs.ex_data = _("无效的会话 ID: {}".format(c))
+                data.outputs.ex_data = _("第{idx}行的会话 ID 格式不正确（长度需为 32）".format(idx=idx))
                 return False
 
         mentioned_list = []
diff --git a/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v2_0.py b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v2_0.py
new file mode 100644
index 0000000000..07cb444d55
--- /dev/null
+++ b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v2_0.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+"""
+Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community
+Edition) available.
+Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved.
+Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://opensource.org/licenses/MIT
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+"""
+
+from django.utils.translation import ugettext_lazy as _
+from pipeline.component_framework.component import Component
+from pipeline.conf import settings
+
+from pipeline_plugins.components.collections.sites.open.wechat_work.wechat_work_send_message import v1_0
+
+__group_name__ = _("企业微信(WechatWork)")
+
+
+class WechatWorkSendMessageService(v1_0.WechatWorkSendMessageService):
+    pass
+
+
+class WechatWorkSendMessageComponent(Component):
+    name = _("发送消息")
+    code = "wechat_work_send_message"
+    bound_service = WechatWorkSendMessageService
+    form = "%scomponents/atoms/wechat_work/wechat_work_send_message/v2_0.js" % settings.STATIC_URL
+    version = "2.0"
+    desc = _(
+        "1.部署环境与企业微信服务器网络必须联通 "
+        "2.通过企业微信机器人获取会话 ID，可参考https://open.work.weixin.qq.com/api/doc/90000/90136/91770"
+        "3. 支持「会话 ID」脱敏填写"
+    )
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index 86dd4b1df5..da1b241d35 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -291,7 +291,6 @@
         if (op_type !== "UNINSTALL") {
             self.columns.push(...config_columns);
         }
-        console.log(node_type, op_type);
     };
 
     let NODEMAN_TJJ_IS_HIDDEN = true;
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
new file mode 100644
index 0000000000..945e937d7b
--- /dev/null
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
@@ -0,0 +1,619 @@
+/**
+ * Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community
+ * Edition) available.
+ * Copyright (C) 2017-2020 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+(function () {
+    function is_display_tag(self, op_type, value) {
+        if (op_type.indexOf(value) !== -1) {
+            self.show();
+        } else {
+            self.hide();
+        }
+    }
+
+    function is_install_op(self, value) {
+        is_display_tag(self, ["INSTALL", "REINSTALL"], value);
+    }
+
+
+    function init_columns(self, node_type, op_type) {
+        let common_columns = [
+            {
+                tag_code: "nodeman_bk_cloud_id",
+                type: "select",
+                attrs: {
+                    name: gettext("管控区域ID"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_cloud_area/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        resp.data.unshift({"text": gettext("直连区域"), "value": 0});
+                        return resp.data;
+                    },
+                    validation: [
+                        {
+                            type: "required",
+                        }
+                    ]
+                }
+            },
+            {
+                tag_code: "nodeman_ap_id",
+                type: "select",
+                attrs: {
+                    name: gettext("接入点"),
+                    width: "180px",
+                    remote: true,
+                    items: [],
+                    remote_url: $.context.get("site_url") + "pipeline/nodeman_get_ap_list/",
+                    remote_data_init: function (resp) {
+                        if (resp.result === false) {
+                            show_msg(resp.message, "error");
+                        }
+                        return resp.data;
+                    },
+                    validation: []
+                }
+            },
+            {
+                tag_code: "inner_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP"),
+                    placeholder: gettext("多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "inner_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("内网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，内网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "os_type",
+                type: "select",
+                attrs: {
+                    name: gettext("操作系统类型"),
+                    width: "180px",
+                    items: [
+                        {value: "LINUX", text: gettext("LINUX")},
+                        {value: "WINDOWS", text: gettext("WINDOWS")},
+                        {value: "AIX", text: gettext("AIX")}
+                    ],
+                    default: "LINUX",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+        ];
+
+        let proxy_columns = [
+            {
+                tag_code: "outer_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP"),
+                    placeholder: gettext("可选,如填写需与内网ip一一对应,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                    validation: []
+                },
+            },
+            {
+                tag_code: "data_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("数据IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true,
+                }
+            },
+            {
+                tag_code: "outer_ipv6",
+                type: "textarea",
+                attrs: {
+                    name: gettext("外网IP(IPV6)"),
+                    placeholder: gettext("可为空，如纯ipv6主机，外网ipv和外网IP(IPV6)两个必须填一个"),
+                    width: "180px",
+                    editable: true,
+                },
+            },
+        ];
+
+        let auth_columns = [
+            {
+                tag_code: "login_ip",
+                type: "textarea",
+                attrs: {
+                    name: gettext("登录IP"),
+                    placeholder: gettext("可为空，如填写需与内网ip一一对应，适配复杂网络时填写,多个用英文逗号 `,` 或换行分隔"),
+                    width: "180px",
+                    editable: true
+                }
+            },
+            {
+                tag_code: "account",
+                type: "input",
+                attrs: {
+                    name: gettext("登录账号"),
+                    width: "180px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "port",
+                type: "input",
+                attrs: {
+                    name: gettext("端口号"),
+                    width: "100px",
+                    editable: true,
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_type",
+                type: "select",
+                attrs: {
+                    name: gettext("认证方式"),
+                    width: "180px",
+                    items: [
+                        {value: "PASSWORD", text: gettext("PASSWORD")},
+                        {value: "KEY", text: gettext("KEY")},
+                        {value: "TJJ_PASSWORD", text: gettext("TJJ")}
+
+                    ],
+                    default: "PASSWORD",
+                    validation: [
+                        {
+                            type: "required"
+                        }
+                    ],
+                }
+            },
+            {
+                tag_code: "auth_key",
+                type: "password",
+                attrs: {
+                    name: gettext("认证密钥"),
+                    width: "400px",
+                    editable: true,
+                    textareaMode: true,
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value, parent_value) {
+                                let auth_type = parent_value.auth_type;
+                                let result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (auth_type !== "TJJ_PASSWORD" && !value.value.length) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入认证密钥");
+                                }
+                                return result;
+                            }
+                        }
+                    ]
+                },
+            },
+        ];
+
+        let config_columns = [
+            {
+                tag_code: "peer_exchange_switch_for_agent",
+                type: "radio",
+                attrs: {
+                    name: gettext("BT节点探测"),
+                    items: [
+                        {value: 1, name: gettext("是")},
+                        {value: 0, name: gettext("否")}
+                    ],
+                    default: 0,
+                    validation: [
+                        {
+                            type: "required"
+                        },
+                    ]
+                },
+            },
+            {
+                tag_code: "speed_limit",
+                type: "input",
+                attrs: {
+                    name: gettext("传输限速 M/s"),
+                    width: "100px",
+                    placeholder: gettext("请输入"),
+                    validation: [
+                        {
+                            type: "custom",
+                            args: function (value) {
+                                var result = {
+                                    result: true,
+                                    error_message: ""
+                                };
+                                if (value && !Number(value)) {
+                                    result.result = false;
+                                    result.error_message = gettext("请输入数字");
+                                }
+                                return result;
+                            }
+                        }
+                    ]
+                },
+            },
+        ];
+
+        self.columns = common_columns;
+
+        // 如果是 Proxy，补充 Proxy 信息
+        if (node_type === "PROXY") {
+            self.columns.push(...proxy_columns);
+        }
+        // 安装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+            self.columns.push(...auth_columns);
+        }
+        // 非卸载场景需要配置信息
+        if (op_type !== "UNINSTALL") {
+            self.columns.push(...config_columns);
+        }
+    };
+
+    let NODEMAN_TJJ_IS_HIDDEN = true;
+
+    $.ajax({
+        url: $.context.get('site_url') + 'pipeline/nodeman_is_support_tjj/',
+        type: 'GET',
+        dataType: 'json',
+        async: false,
+        success: function (resp) {
+            if (resp.data) {
+                NODEMAN_TJJ_IS_HIDDEN = false;
+            }
+        },
+        error: function () {
+            show_msg('request nodeman is support tjj error', 'error');
+        }
+    });
+    $.atoms.nodeman_create_task = [
+        {
+            tag_code: "bk_biz_id",
+            type: "select",
+            attrs: {
+                name: gettext("业务"),
+                allowCreate: true,
+                hookable: true,
+                remote: true,
+                remote_url: $.context.get("site_url") + "pipeline/cc_get_business_list/",
+                remote_data_init: function (resp) {
+                    if (resp.result === false) {
+                        show_msg(resp.message, 'error');
+                    }
+                    return resp.data;
+                },
+                disabled: !$.context.canSelectBiz(),
+                validation: [
+                    {
+                        type: "required"
+                    }
+                ]
+            },
+            methods: {
+                _tag_init: function () {
+                    if (this.value) {
+                        return
+                    }
+                    this._set_value($.context.getBkBizId());
+                }
+            }
+        },
+        {
+            tag_code: "nodeman_op_info",
+            type: "combine",
+            attrs: {
+                name: gettext("操作类型"),
+                hookable: true,
+                children: [
+                    {
+                        tag_code: "nodeman_node_type",
+                        type: "radio",
+                        attrs: {
+                            name: gettext("节点类型"),
+                            hookable: true,
+                            items: [
+                                {value: "AGENT", name: gettext("AGENT")},
+                                {value: "PROXY", name: gettext("PROXY")},
+                            ],
+                            default: "AGENT",
+                            validation: [
+                                {
+                                    type: "required"
+                                }
+                            ],
+                            events: [
+                                {
+                                    source: "nodeman_node_type",
+                                    type: "init",
+                                    action: function (value) {
+                                        // 统一以 change 事件抛出
+                                        this.emit_event(this.tagCode, "change", this.value);
+                                    }
+                                },
+                            ]
+                        }
+                    },
+                    {
+                        tag_code: "nodeman_op_type",
+                        type: "select",
+                        attrs: {
+                            name: gettext("操作类型"),
+                            items: [
+                                {value: "INSTALL", text: gettext("安裝")},
+                                {value: "REINSTALL", text: gettext("重新安装")},
+                                {value: "UNINSTALL", text: gettext("卸载")},
+                                {value: "UPGRADE", text: gettext("升级")},
+                                {value: "RESTART", text: gettext("重启")},
+                                {value: "RELOAD", text: gettext("配置重载")},
+                            ],
+                            default: "INSTALL",
+                            validation: [
+                                {
+                                    type: "required"
+                                }
+                            ]
+                        },
+                        events: [
+                            {
+                                source: "nodeman_op_type",
+                                type: "init",
+                                action: function (value) {
+                                    this.emit_event(this.tagCode, "change", this.value);
+                                }
+                            },
+                        ]
+                    },
+                    {
+                        tag_code: "nodeman_install_latest_plugins",
+                        type: "radio",
+                        attrs: {
+                            name: gettext("是否安装最新版本插件"),
+                            items: [
+                                {value: true, name: gettext("是")},
+                                {value: false, name: gettext("否")}
+                            ],
+                            default: true,
+                            validation: [
+                                {
+                                    type: "required"
+                                },
+                            ]
+                        },
+                        events: [
+                            {
+                                source: "nodeman_op_type",
+                                type: "change",
+                                action: function (value) {
+                                    is_install_op(this, value);
+                                }
+                            },
+                        ]
+                    },
+                    {
+                        tag_code: "nodeman_hosts",
+                        type: "datatable",
+                        attrs: {
+                            pagination: true,
+                            name: gettext("主机"),
+                            table_buttons: [
+                                {
+                                    type: "add_row",
+                                    text: gettext("添加"),
+                                    callback: function () {
+                                        this.add_row();
+                                    }
+                                },
+                                {
+                                    type: "import",
+                                    text: gettext("导入")
+                                },
+                                {
+                                    type: "export",
+                                    text: gettext("导出"),
+                                    callback: function () {
+                                        this.export2Excel();
+                                    }
+                                },
+
+                            ],
+                            columns: [],
+                            hookable: true,
+                            validation: [
+                                {
+                                    type: "custom",
+                                    args: function (value) {
+                                        let self = this;
+                                        let result = {
+                                            result: true,
+                                            error_message: ""
+                                        };
+                                        let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
+                                        let install_type = ["INSTALL", "REINSTALL"];
+                                        if (install_type.indexOf(op_type) !== -1 && value === "") {
+                                            result.result = false;
+                                            result.error_message = gettext("请完善主机信息");
+                                        }
+                                        return result;
+
+                                    }
+                                }
+                            ]
+                        },
+                        events: [
+                            {
+                                source: "nodeman_op_type",
+                                type: "change",
+                                action: function (value) {
+                                    let node_type = this.get_parent().get_child("nodeman_node_type").value;
+                                    init_columns(this, node_type, value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (node_type === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
+                                    }
+                                    is_display_tag(this, op_type, value);
+                                }
+                            },
+                            {
+                                source: "nodeman_node_type",
+                                type: "change",
+                                action: function (value) {
+                                    init_columns(this, value, this.get_parent().get_child("nodeman_op_type").value);
+                                    let op_type = ["INSTALL", "REINSTALL", "RELOAD"];
+                                    if (value === "AGENT") {
+                                        op_type = ["INSTALL", "REINSTALL", "UNINSTALL", "RELOAD"];
+                                    }
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
+                                }
+                            },
+                        ]
+                    },
+                    {
+                        tag_code: "nodeman_other_hosts",
+                        type: "datatable",
+                        attrs: {
+                            pagination: true,
+                            name: gettext("主机"),
+                            table_buttons: [
+                                {
+                                    type: "add_row",
+                                    text: gettext("添加"),
+                                    callback: function () {
+                                        this.add_row();
+                                    }
+                                },
+                                {
+                                    type: "import",
+                                    text: gettext("导入")
+                                },
+                                {
+                                    type: "export",
+                                    text: gettext("导出"),
+                                    callback: function () {
+                                        this.export2Excel();
+                                    }
+                                },
+
+                            ],
+                            columns: [
+                                {
+                                    tag_code: "nodeman_bk_cloud_id",
+                                    type: "input",
+                                    attrs: {
+                                        name: gettext("管控区域ID"),
+                                        placeholder: gettext("一行只能对应一个管控区域ID"),
+                                        hookable: true,
+                                        validation: [
+                                            {
+                                                type: "required"
+                                            }
+                                        ]
+                                    }
+                                },
+                                {
+                                    tag_code: "nodeman_ip_str",
+                                    type: "textarea",
+                                    attrs: {
+                                        name: gettext("IP"),
+                                        placeholder: gettext("多个用英文逗号 `,` 分隔"),
+                                        editable: true,
+                                        validation: [
+                                            {
+                                                type: "required"
+                                            }
+                                        ]
+                                    }
+                                }
+                            ],
+                            hookable: true,
+                            validation: [
+                                {
+                                    type: "custom",
+                                    args: function (value) {
+                                        let self = this;
+                                        let result = {
+                                            result: true,
+                                            error_message: ""
+                                        };
+                                        let op_type = self.get_parent && self.get_parent().get_child("nodeman_op_type").value;
+                                        let install_type = ["UNINSTALL", "UPGRADE"];
+                                        if (install_type.indexOf(op_type) !== -1 && value === "") {
+                                            result.result = false;
+                                            result.error_message = gettext("请完善主机信息");
+                                        }
+                                        return result;
+
+                                    }
+                                }
+                            ]
+                        },
+                        events: [
+                            {
+                                source: "nodeman_op_type",
+                                type: "change",
+                                action: function (value) {
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (this.get_parent().get_child("nodeman_node_type").value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
+                                    }
+                                    is_display_tag(this, op_type, value);
+                                }
+                            },
+                            {
+                                source: "nodeman_node_type",
+                                type: "change",
+                                action: function (value) {
+                                    let op_type = ["UPGRADE", "RESTART"];
+                                    if (value === "PROXY") {
+                                        op_type = ["UPGRADE", "RESTART", "UNINSTALL"];
+                                    }
+                                    is_display_tag(this, op_type, this.get_parent().get_child("nodeman_op_type").value);
+                                }
+                            },
+                        ]
+                    },
+                ],
+            },
+        },
+    ];
+})();
diff --git a/pipeline_plugins/components/static/components/atoms/wechat_work/wechat_work_send_message/v2_0.js b/pipeline_plugins/components/static/components/atoms/wechat_work/wechat_work_send_message/v2_0.js
new file mode 100644
index 0000000000..ca20765c14
--- /dev/null
+++ b/pipeline_plugins/components/static/components/atoms/wechat_work/wechat_work_send_message/v2_0.js
@@ -0,0 +1,59 @@
+$.atoms.wechat_work_send_message = [
+    {
+        "type": "password",
+        "attrs": {
+            "name": gettext("会话ID"),
+            "hookable": true,
+            "textareaMode": true,
+            "validation": [
+                {
+                    "type": "required"
+                }
+            ],
+            "placeholder": gettext("通过在群里@企业微信机器人获取，多个用换行分隔"),
+        },
+        "tag_code": "wechat_work_chat_id"
+    },
+    {
+        "tag_code": "msgtype",
+        "type": "radio",
+        "attrs": {
+            "name": gettext("消息格式"),
+            "hookable": false,
+            "items": [
+                {"name": gettext("文本(text)"), "value": "text"},
+                {"name": gettext("Markdown"), "value": "markdown"},
+            ],
+            "default": "text",
+            "validation": [
+                {
+                    "type": "required"
+                }
+            ],
+        },
+    },
+    {
+        "type": "textarea",
+        "attrs": {
+            "name": gettext("消息内容"),
+            "hookable": true,
+            "validation": [
+                {
+                    "type": "required"
+                }
+            ]
+        },
+        "tag_code": "message_content"
+    },
+    {
+        "type": "input",
+        "attrs": {
+            "name": gettext("提醒人"),
+            "hookable": true,
+            "placeholder": gettext("提醒群指定成员(@某个成员)，多个成员用 `,` 分隔，@all表示提醒所有人")
+        },
+        "events": [],
+        "methods": {},
+        "tag_code": "wechat_work_mentioned_members"
+    }
+]
\ No newline at end of file
diff --git a/pipeline_plugins/components/utils/common.py b/pipeline_plugins/components/utils/common.py
index 35a15c8ccd..aa75ddcf78 100644
--- a/pipeline_plugins/components/utils/common.py
+++ b/pipeline_plugins/components/utils/common.py
@@ -14,6 +14,7 @@
 import random
 import re
 import time
+import typing
 from copy import deepcopy
 
 from django.utils.translation import ugettext_lazy as _
@@ -118,3 +119,13 @@ def convert_num_to_str(export_data: list):
             if isinstance(value, int) or isinstance(value, float):
                 data[key] = str(value)
     return export_data
+
+
+def parse_passwd_value(passwd_value: typing.Union[str, typing.Dict[str, str]]) -> str:
+    if isinstance(passwd_value, str):
+        return passwd_value
+    elif isinstance(passwd_value, dict):
+        return parse_passwd_value(passwd_value.get("value", ""))
+    else:
+        # 仅有两种合法结构，如果都不满足直接返回空串
+        return ""
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v2_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v2_create_task.py
index f271bbffc8..4f56efcc31 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v2_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v2_create_task.py
@@ -13,16 +13,16 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
     ComponentTestCase,
     ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.nodeman.create_task.v2_0 import NodemanCreateTaskComponent
 
 
@@ -71,7 +71,9 @@ def __init__(
 GET_HOST_ID_BY_INNER_IP_BASE = (
     "pipeline_plugins.components.collections.sites.open.nodeman.create_task.v2_0.get_host_id_by_inner_ip"
 )
-ENCRYPT_AUTH_KEY = "pipeline_plugins.components.collections.sites.open.nodeman.create_task.v2_0.encrypt_auth_key"
+ENCRYPT_AUTH_KEY = (
+    "pipeline_plugins.components.collections.sites.open.nodeman." "base.NodeManBaseService.parse2nodeman_ciphertext"
+)
 
 # mock clients
 CASE_FAIL_CLIENT = MockClient(
@@ -743,7 +745,6 @@ def __init__(
     inputs={
         "bk_biz_id": "1",
         "nodeman_op_target": {"nodeman_bk_cloud_id": "1", "nodeman_node_type": "AGENT"},
-        "nodeman_ticket": {"nodeman_tjj_ticket": "xxxxx"},
         "nodeman_op_info": {
             "nodeman_ap_id": "1",
             "nodeman_op_type": "INSTALL",
@@ -798,7 +799,6 @@ def __init__(
                                 "data_ip": "1.1.1.1",
                             }
                         ],
-                        "tcoa_ticket": "xxxxx",
                     }
                 )
             ],
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
index 5836b6ad1f..bc249cb008 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v3_create_task.py
@@ -75,7 +75,9 @@ def __init__(
 )
 
 GET_HOST_ID_BY_INNER_IP = "pipeline_plugins.components.collections.sites.open.nodeman.base.get_host_id_by_inner_ip"
-ENCRYPT_AUTH_KEY = "pipeline_plugins.components.collections.sites.open.nodeman.create_task.v3_0.encrypt_auth_key"
+ENCRYPT_AUTH_KEY = (
+    "pipeline_plugins.components.collections.sites.open.nodeman." "base.NodeManBaseService.parse2nodeman_ciphertext"
+)
 
 # mock clients
 CASE_FAIL_CLIENT = MockClient(
diff --git a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
index 8ff67501a0..71e49df389 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py
@@ -71,7 +71,9 @@ def __init__(
 HANDLE_API_ERROR = "pipeline_plugins.components.collections.sites.open.nodeman.base.handle_api_error"
 GET_BUSINESS_HOST = "pipeline_plugins.components.collections.sites.open.nodeman.create_task.v4_0.get_business_host"
 GET_HOST_ID_BY_INNER_IP = "pipeline_plugins.components.collections.sites.open.nodeman.base.get_host_id_by_inner_ip"
-ENCRYPT_AUTH_KEY = "pipeline_plugins.components.collections.sites.open.nodeman.create_task.v4_0.encrypt_auth_key"
+ENCRYPT_AUTH_KEY = (
+    "pipeline_plugins.components.collections.sites.open.nodeman." "base.NodeManBaseService.parse2nodeman_ciphertext"
+)
 
 # mock clients
 CASE_FAIL_CLIENT = MockClient(
diff --git a/pipeline_plugins/tests/components/collections/sites/open/wechat_work_test/wechat_work_send_message/test_wechat_work_send_message_v1_0.py b/pipeline_plugins/tests/components/collections/sites/open/wechat_work_test/wechat_work_send_message/test_wechat_work_send_message_v1_0.py
index d77bd82e3e..839e50f3a8 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/wechat_work_test/wechat_work_send_message/test_wechat_work_send_message_v1_0.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/wechat_work_test/wechat_work_send_message/test_wechat_work_send_message_v1_0.py
@@ -13,7 +13,6 @@
 
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
     Call,
     CallAssertion,
@@ -22,9 +21,11 @@
     ExecuteAssertion,
     Patcher,
 )
-from pipeline_plugins.components.collections.sites.open.wechat_work.wechat_work_send_message.v1_0 import (
+
+from gcloud.utils import crypto
+from pipeline_plugins.components.collections.sites.open.wechat_work.wechat_work_send_message.v1_0 import (  # noqa
     WechatWorkSendMessageComponent,
-)  # noqa
+)
 
 
 class WechatWorkSendMessageComponentTest(TestCase, ComponentTestMixin):
@@ -89,7 +90,7 @@ def component_cls(self):
         "msgtype": "text",
     },
     parent_data={},
-    execute_assertion=ExecuteAssertion(success=False, outputs={"ex_data": "无效的会话 ID: @all"}),
+    execute_assertion=ExecuteAssertion(success=False, outputs={"ex_data": "第1行的会话 ID 格式不正确（长度需为 32）"}),
     schedule_assertion=None,
     patchers=[Patcher(target=ENVIRONMENT_VAIRABLES_GET, return_value="test_url")],
 )
@@ -172,3 +173,40 @@ def component_cls(self):
         Patcher(target=REQUESTS_POST, side_effect=SUCCESS_REQUEST_POST),
     ],
 )
+
+
+ENCRYPT_SUCCESS_CASE = ComponentTestCase(
+    name="success case",
+    inputs={
+        "wechat_work_chat_id": {
+            "tag": "variable",
+            "value": crypto.encrypt("11111111111111111111111111111111\n22222222222222222222222222222222"),
+        },
+        "message_content": "haha",
+        "wechat_work_mentioned_members": "m1,m2",
+        "msgtype": "text",
+    },
+    parent_data={},
+    execute_assertion=ExecuteAssertion(success=True, outputs={}),
+    schedule_assertion=None,
+    execute_call_assertion=[
+        CallAssertion(
+            func=SUCCESS_REQUEST_POST,
+            calls=[
+                Call(
+                    url="test_url",
+                    json={
+                        "chatid": "11111111111111111111111111111111|22222222222222222222222222222222",  # noqa
+                        "msgtype": "text",
+                        "text": {"content": "haha", "mentioned_list": ["m1", "m2"]},
+                    },
+                    timeout=5,
+                )
+            ],
+        )
+    ],
+    patchers=[
+        Patcher(target=ENVIRONMENT_VAIRABLES_GET, return_value="test_url"),
+        Patcher(target=REQUESTS_POST, side_effect=SUCCESS_REQUEST_POST),
+    ],
+)
diff --git a/pipeline_plugins/tests/utils/test_utils.py b/pipeline_plugins/tests/utils/test_utils.py
index c47611a779..50a1549b8a 100644
--- a/pipeline_plugins/tests/utils/test_utils.py
+++ b/pipeline_plugins/tests/utils/test_utils.py
@@ -13,7 +13,7 @@
 
 from django.test import TestCase
 
-from pipeline_plugins.components.utils import chunk_table_data
+from pipeline_plugins.components.utils import chunk_table_data, parse_passwd_value
 
 
 class UtilsTestCase(TestCase):
@@ -65,3 +65,15 @@ def test_chunk_table_data(self):
         self.assertEqual(has_two_list_expect_column, has_two_list_actual_column["data"])
         self.assertEqual([], failed_actual_column["data"])
         self.assertFalse(failed_actual_column["result"])
+
+    def test_parse_passwd_value__nest(self):
+        value = "123"
+        passwd_value = {"tag": "value", "value": {"tag": "value", "value": value}}
+        self.assertEqual(parse_passwd_value(passwd_value), value)
+
+    def test_parse_passwd_value__str(self):
+        value = "123"
+        self.assertEqual(parse_passwd_value(value), value)
+
+    def test_parse_passwd_value__invalid_type(self):
+        self.assertEqual(parse_passwd_value([]), "")
diff --git a/pipeline_plugins/variables/collections/common.py b/pipeline_plugins/variables/collections/common.py
index 1090af6caa..4a1c5c3976 100644
--- a/pipeline_plugins/variables/collections/common.py
+++ b/pipeline_plugins/variables/collections/common.py
@@ -92,7 +92,6 @@ def _self_explain(cls, **kwargs) -> List[FieldExplain]:
 
 
 class Password(LazyVariable, SelfExplainVariable):
-    # TODO 需要改的
     code = "password"
     name = _("密码")
     type = "general"
diff --git a/pipeline_plugins/variables/static/variables/password.js b/pipeline_plugins/variables/static/variables/password.js
index 6fcb8535c4..7fb8f0b3b3 100644
--- a/pipeline_plugins/variables/static/variables/password.js
+++ b/pipeline_plugins/variables/static/variables/password.js
@@ -17,6 +17,8 @@
             attrs: {
                 name: gettext("密码"),
                 hookable: true,
+                // TODO 如果是 false，应该是允许输密码？
+                canUseVar: false,
                 validation: [
                     {
                         type: "required"
@@ -24,5 +26,5 @@
                 ]
             }
         },
-    ]
+    ];
 })();
diff --git a/requirements.txt b/requirements.txt
index 4959f8957d..59094bf900 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ django-nose==1.4.5
 coverage==4.5.1
 python-magic==0.4.15
 cryptography==3.3.2
-bk-crypto-python-sdk==1.0.4
+bk-crypto-python-sdk==1.1.1
 gitdb2==2.0.6
 GitPython==2.1.11
 PyJWT==1.7.1

From ae545a8594328fea2491a574e03908940f1b1c5b Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Thu, 17 Aug 2023 21:47:13 +0800
Subject: [PATCH 065/112] =?UTF-8?q?feature:=20=E5=9B=BD=E5=AF=86=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../all_biz_execute_job_plan/base_service.py  |  2 +-
 .../job/execute_task/execute_task_base.py     |  2 +-
 .../all_biz_execute_job_plan/test_v1_0.py     | 21 +++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
index b9291c565f..38eb194362 100644
--- a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
+++ b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
@@ -138,7 +138,7 @@ def execute(self, data, parent_data):
                 if result:
                     global_var_list.append({"id": _value["id"], "server": server})
             # 密文变量在没有修改的情况下不加入全局变量，避免脱敏字符串作为正式值进行作业执行逻辑
-            elif _value["category"] == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
+            elif _value.get("category") == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
                 continue
             else:
                 global_var_list.append({"id": _value["id"], "value": val})
diff --git a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
index d5534c7409..4d8829d8a3 100644
--- a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
+++ b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
@@ -163,7 +163,7 @@ def execute(self, data, parent_data):
                         return False
                     global_vars.append({"name": _value["name"], "server": server})
             # 密文变量在没有修改的情况下不加入全局变量，避免脱敏字符串作为正式值进行作业执行逻辑
-            elif _value["category"] == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
+            elif _value.get("category") == JOBV3_VAR_CATEGORY_PASSWORD and val == "******":
                 continue
             else:
                 global_vars.append({"name": _value["name"], "value": val})
diff --git a/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py b/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
index ec85a8e222..90d620e291 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
@@ -13,19 +13,20 @@
 import ujson as json
 from django.test import TestCase
 from mock import MagicMock
-
 from pipeline.component_framework.test import (
-    ComponentTestMixin,
-    ComponentTestCase,
+    Call,
     CallAssertion,
+    ComponentTestCase,
+    ComponentTestMixin,
     ExecuteAssertion,
-    ScheduleAssertion,
-    Call,
     Patcher,
+    ScheduleAssertion,
 )
+
 from pipeline_plugins.components.collections.sites.open.job.all_biz_execute_job_plan.v1_0 import (
     AllBizJobExecuteJobPlanComponent,
 )
+from pipeline_plugins.components.query.sites.open.job import JOBV3_VAR_CATEGORY_PASSWORD
 
 
 class AllBizJobExecuteJobPlanComponentTest(TestCase, ComponentTestMixin):
@@ -228,7 +229,15 @@ def __init__(
         "data": {
             "job_instance_id": 10000,
             "step_instance_var_list": [
-                {"step_instance_id": 20000000577, "global_var_list": [{"type": 1, "name": "name", "value": "test"}]},
+                {
+                    "step_instance_id": 20000000577,
+                    "global_var_list": [
+                        # 已重新编辑，需要传递给 Job
+                        {"type": JOBV3_VAR_CATEGORY_PASSWORD, "name": "password_1", "value": "test"},
+                        # Job 侧脱敏，无需传递
+                        {"type": JOBV3_VAR_CATEGORY_PASSWORD, "name": "password", "value": "******"},
+                    ],
+                },
                 {"step_instance_id": 20000000578, "global_var_list": [{"type": 1, "name": "name", "value": "test"}]},
             ],
         },

From 6279fdb33d6cab77bba3a48104a2e32f9fdb36c4 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Fri, 18 Aug 2023 11:47:50 +0800
Subject: [PATCH 066/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Dpassword=20?=
 =?UTF-8?q?textarea=E6=A8=A1=E5=BC=8F=E5=8A=A0=E5=AF=86=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagPassword.vue    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 4f77febd5c..64f948d1a5 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -33,7 +33,9 @@
                     rows="4"
                     :value="inputText"
                     :placeholder="inputPlaceholder"
+                    @keydown="handleTextareaKeyDown"
                     @input="handleTextareaInput"
+                    @keyup="handleTextareaKeyUp"
                     @focus="handleFocus"
                     @blur="handleBlur">
                 </textarea>
@@ -91,6 +93,7 @@
                     tag: 'value',
                     value: ''
                 },
+                cursorPos: 0,
                 inputText: '',
                 inputPlaceholder: '',
                 ASYMMETRIC_CIPHER_TYPE: window.ASYMMETRIC_CIPHER_TYPE,
@@ -143,11 +146,24 @@
                 this.localVal.value = e.target.value
                 this.inputPlaceholder = ''
             },
+            handleTextareaKeyDown (e) {
+                this.cursorPos = e.target.selectionStart
+            },
             handleTextareaInput (e) {
-                console.log('textarea input: ', e.target.value)
-                this.localVal.value = e.target.value
+                const value = e.target.value
+                const start = this.cursorPos > e.target.selectionStart ? e.target.selectionStart : this.cursorPos
+                const crtLength = this.localVal.value.length
+                const targetLength = value.length
+                const lenGap = targetLength - crtLength
+                if (lenGap < 0) { // 删除
+                    this.localVal.value = this.localVal.value.slice(0, start) + this.localVal.value.slice(start - lenGap)
+                } else { // 新增
+                    this.localVal.value = this.localVal.value.slice(0, start) + value.slice(start, start + lenGap) + this.localVal.value.slice(start)
+                }
+            },
+            handleTextareaKeyUp (e) {
                 this.inputPlaceholder = ''
-                e.target.value = e.target.value.replace(/[^\n]/g, '·')
+                this.inputText = e.target.value.replace(/[^\n]/g, '·')
             },
             handleFocus () {
                 if (this.localVal.value.length > 0) {
@@ -237,7 +253,6 @@
             text-align: left;
             outline: none;
             resize: none;
-            // -webkit-text-security: disc !important;
             &:focus {
                 border-color: #3a84ff;
                 background-color: #ffffff;

From bcb8650f9088b133ac170ecc6b7e62629af28a05 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Fri, 18 Aug 2023 22:36:38 +0800
Subject: [PATCH 067/112] =?UTF-8?q?feature:=20=E5=9B=BD=E5=AF=86=E6=94=B9?=
 =?UTF-8?q?=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/default.py | 2 +-
 env.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/default.py b/config/default.py
index e6526cc32f..c9c183824f 100644
--- a/config/default.py
+++ b/config/default.py
@@ -807,7 +807,7 @@ def check_engine_admin_permission(request, *args, **kwargs):
 }
 
 # 加密
-if env.BKAPP_CRYPTO_TYPE == "SHANGMI":
+if env.BKPAAS_CRYPTO_TYPE == "SHANGMI":
     BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value
     BKCRYPTO.update(
         {
diff --git a/env.py b/env.py
index 43db006dd3..95eee907e0 100644
--- a/env.py
+++ b/env.py
@@ -111,4 +111,4 @@
 
 
 # 获取加密类型
-BKAPP_CRYPTO_TYPE = os.getenv("BK_CRYPTO_TYPE") or os.getenv("BKAPP_CRYPTO_TYPE") or "CLASSIC"
+BKPAAS_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"

From 3f515874085937fbe840fa67fbe70ceda60ecbcd Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Mon, 21 Aug 2023 21:27:07 +0800
Subject: [PATCH 068/112] =?UTF-8?q?sprintfix:=20=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=20&=20=E4=BF=AE=E5=A4=8D=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=87=8D=E8=A3=85=E6=93=8D=E4=BD=9C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=86=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/default.py                                             | 2 +-
 env.py                                                        | 2 +-
 .../static/components/atoms/nodeman/create_task/v4_0.js       | 4 ++--
 .../static/components/atoms/nodeman/create_task/v5_0.js       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/default.py b/config/default.py
index c9c183824f..107cd49663 100644
--- a/config/default.py
+++ b/config/default.py
@@ -807,7 +807,7 @@ def check_engine_admin_permission(request, *args, **kwargs):
 }
 
 # 加密
-if env.BKPAAS_CRYPTO_TYPE == "SHANGMI":
+if env.BKPAAS_BK_CRYPTO_TYPE == "SHANGMI":
     BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value
     BKCRYPTO.update(
         {
diff --git a/env.py b/env.py
index 95eee907e0..b64958306b 100644
--- a/env.py
+++ b/env.py
@@ -111,4 +111,4 @@
 
 
 # 获取加密类型
-BKPAAS_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
+BKPAAS_BK_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
index da1b241d35..ba487b09f4 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js
@@ -283,8 +283,8 @@
         if (node_type === "PROXY") {
             self.columns.push(...proxy_columns);
         }
-        // 安装 / 卸载需要认证信息
-        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+        // 安装 / 重装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") {
             self.columns.push(...auth_columns);
         }
         // 非卸载场景需要配置信息
diff --git a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
index 945e937d7b..cd9888e61e 100644
--- a/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
+++ b/pipeline_plugins/components/static/components/atoms/nodeman/create_task/v5_0.js
@@ -281,8 +281,8 @@
         if (node_type === "PROXY") {
             self.columns.push(...proxy_columns);
         }
-        // 安装 / 卸载需要认证信息
-        if (op_type === "INSTALL" || op_type === "UNINSTALL") {
+        // 安装 / 重装 / 卸载需要认证信息
+        if (op_type === "INSTALL" || op_type === "UNINSTALL" || op_type === "REINSTALL") {
             self.columns.push(...auth_columns);
         }
         // 非卸载场景需要配置信息

From 4f77fd06f968ef639851afd60a5b7d4c753c48a2 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Tue, 22 Aug 2023 15:31:10 +0800
Subject: [PATCH 069/112] =?UTF-8?q?feature:=20=E5=90=AF=E7=94=A8=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E6=A1=86=E6=9E=B6=E5=86=85=E7=BD=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/default.py      |  9 +++++++++
 gcloud/utils/crypto.py | 11 +++++++++++
 requirements.txt       |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/config/default.py b/config/default.py
index 107cd49663..c75fc59a54 100644
--- a/config/default.py
+++ b/config/default.py
@@ -804,8 +804,17 @@ def check_engine_admin_permission(request, *args, **kwargs):
             },
         },
     },
+    "SYMMETRIC_CIPHERS": {
+        "default": {"get_key_config": "gcloud.utils.crypto.get_default_symmetric_key_config"},
+    },
 }
 
+# 启用框架内置数据加密
+BLUEAPPS_ENABLE_DB_ENCRYPTION = True
+# 复用已有的 default 对称加密实例
+BKCRYPTO["SYMMETRIC_CIPHERS"]["blueapps"] = BKCRYPTO["SYMMETRIC_CIPHERS"]["default"]
+
+
 # 加密
 if env.BKPAAS_BK_CRYPTO_TYPE == "SHANGMI":
     BKCRYPTO_ASYMMETRIC_CIPHER_TYPE = bkcrypto_constants.AsymmetricCipherType.SM2.value
diff --git a/gcloud/utils/crypto.py b/gcloud/utils/crypto.py
index 875438c308..32af7094b9 100644
--- a/gcloud/utils/crypto.py
+++ b/gcloud/utils/crypto.py
@@ -18,6 +18,7 @@
 from bkcrypto.constants import AsymmetricCipherType
 from bkcrypto.contrib.django.ciphers import asymmetric_cipher_manager
 from bkcrypto.contrib.django.selectors import AsymmetricCipherSelector
+from bkcrypto.symmetric.configs import KeyConfig as SymmetricKeyConfig
 from django.conf import settings
 
 
@@ -42,6 +43,16 @@ def get_default_asymmetric_key_config(cipher_type: str) -> AsymmetricKeyConfig:
     )
 
 
+def get_default_symmetric_key_config(cipher_type: str) -> SymmetricKeyConfig:
+    """
+    获取项目默认对称加密配置
+    :param cipher_type:
+    :return:
+    """
+    # 统一使用 APP_SECRET 作为对称加密密钥，SDK 会截断，取符合预期的 key length
+    return SymmetricKeyConfig(key=settings.SECRET_KEY)
+
+
 def decrypt(ciphertext: str, using: typing.Optional[str] = None) -> str:
     using = using or "default"
     # 1. 尝试根据前缀解密
diff --git a/requirements.txt b/requirements.txt
index 59094bf900..2109bb99ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -62,7 +62,7 @@ importlib-metadata==3.7.3
 protobuf==3.19.4
 
 # blueapps
-blueapps[opentelemetry]==4.7.0
+blueapps[opentelemetry, bkcrypto]==4.8.0
 whitenoise==5.2.0
 raven==6.5.0
 python-json-logger==2.0.1

From f0c1e9d70e370357342704b34d0898faef50e2ef Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Wed, 23 Aug 2023 15:13:11 +0800
Subject: [PATCH 070/112] =?UTF-8?q?sprintfix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=9D=9E=E6=B3=95=20b64=20=E5=AF=BC=E8=87=B4=E8=84=B1=E6=95=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=B2=E8=A2=AB=E8=AF=AF=E8=BD=AC=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E4=B8=B2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/utils/crypto.py | 6 ++++++
 requirements.txt       | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcloud/utils/crypto.py b/gcloud/utils/crypto.py
index 32af7094b9..117a0bb1c6 100644
--- a/gcloud/utils/crypto.py
+++ b/gcloud/utils/crypto.py
@@ -12,6 +12,7 @@
 """
 import json
 import typing
+import base64
 
 from bkcrypto import constants as crypto_constants
 from bkcrypto.asymmetric.configs import KeyConfig as AsymmetricKeyConfig
@@ -60,6 +61,11 @@ def decrypt(ciphertext: str, using: typing.Optional[str] = None) -> str:
 
     # 2. 尝试对明文二次 RSA 解密，用于兼容原逻辑
     try:
+        # 该校验用于避免非 b64 串 decode 返回空的场景
+        # 尝试 base64 解密，如果解密结果是空串，说明 plaintext 为空或者字符非法，说明非密文，直接返回；
+        # 如果抛出异常，在外层被 catch 后返回
+        if not base64.b64decode(plaintext.encode(encoding="utf-8")):
+            return plaintext
         plaintext = asymmetric_cipher_manager.cipher(using=using, cipher_type=AsymmetricCipherType.RSA.value).decrypt(
             plaintext
         )
diff --git a/requirements.txt b/requirements.txt
index 2109bb99ae..4a9c3f02cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,6 @@ django-nose==1.4.5
 coverage==4.5.1
 python-magic==0.4.15
 cryptography==3.3.2
-bk-crypto-python-sdk==1.1.1
 gitdb2==2.0.6
 GitPython==2.1.11
 PyJWT==1.7.1
@@ -62,7 +61,7 @@ importlib-metadata==3.7.3
 protobuf==3.19.4
 
 # blueapps
-blueapps[opentelemetry, bkcrypto]==4.8.0
+blueapps[opentelemetry,bkcrypto]==4.8.0
 whitenoise==5.2.0
 raven==6.5.0
 python-json-logger==2.0.1

From 0f6d91a5ea636177aca19edadab2968fa415aa0a Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Wed, 23 Aug 2023 21:06:03 +0800
Subject: [PATCH 071/112] =?UTF-8?q?sprintfix:=20=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AF=86=E7=A0=81=E5=8F=98=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open/job/all_biz_execute_job_plan/base_service.py    | 3 ++-
 .../sites/open/job/execute_task/execute_task_base.py     | 9 +++++++--
 .../open/job_test/all_biz_execute_job_plan/test_v1_0.py  | 8 ++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
index 38eb194362..3a67b8b6f4 100644
--- a/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
+++ b/pipeline_plugins/components/collections/sites/open/job/all_biz_execute_job_plan/base_service.py
@@ -20,6 +20,7 @@
     get_node_callback_url,
     has_biz_set,
     loose_strip,
+    parse_passwd_value,
     plat_ip_reg,
 )
 
@@ -123,7 +124,7 @@ def execute(self, data, parent_data):
             self.biz_scope_type = JobBizScopeType.BIZ.value
 
         for _value in original_global_var:
-            val = loose_strip(crypto.decrypt(_value["value"]))
+            val = loose_strip(crypto.decrypt(parse_passwd_value(_value["value"])))
             if _value["type"] == JOBV3_VAR_CATEGORY_IP:
 
                 ip_list = self.get_ip_list(val)
diff --git a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
index 4d8829d8a3..31eec55d9b 100644
--- a/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
+++ b/pipeline_plugins/components/collections/sites/open/job/execute_task/execute_task_base.py
@@ -24,7 +24,12 @@
 from pipeline_plugins.components.collections.sites.open.job import JobService
 from pipeline_plugins.components.collections.sites.open.job.ipv6_base import GetJobTargetServerMixin
 from pipeline_plugins.components.query.sites.open.job import JOBV3_VAR_CATEGORY_IP, JOBV3_VAR_CATEGORY_PASSWORD
-from pipeline_plugins.components.utils import get_job_instance_url, get_node_callback_url, loose_strip
+from pipeline_plugins.components.utils import (
+    get_job_instance_url,
+    get_node_callback_url,
+    loose_strip,
+    parse_passwd_value,
+)
 
 __group_name__ = _("作业平台(JOB)")
 
@@ -151,7 +156,7 @@ def execute(self, data, parent_data):
         biz_across = data.get_one_of_inputs("biz_across")
 
         for _value in original_global_var:
-            val = loose_strip(crypto.decrypt(_value["value"]))
+            val = loose_strip(crypto.decrypt(parse_passwd_value(_value["value"])))
             # category为3,表示变量类型为IP
             if _value["category"] == JOBV3_VAR_CATEGORY_IP:
                 self.logger.info("[job_execute_task_base] start find ip, var={}".format(val))
diff --git a/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py b/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
index 90d620e291..51ab94ccbd 100644
--- a/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
+++ b/pipeline_plugins/tests/components/collections/sites/open/job_test/all_biz_execute_job_plan/test_v1_0.py
@@ -23,6 +23,7 @@
     ScheduleAssertion,
 )
 
+from gcloud.utils import crypto
 from pipeline_plugins.components.collections.sites.open.job.all_biz_execute_job_plan.v1_0 import (
     AllBizJobExecuteJobPlanComponent,
 )
@@ -709,6 +710,12 @@ def __init__(
             "is_tagged_ip": True,
             "job_global_var": [
                 {"id": 1000030, "type": 1, "name": "name", "value": "test", "description": ""},
+                {
+                    "id": 1000032,
+                    "type": JOBV3_VAR_CATEGORY_PASSWORD,
+                    "name": "password",
+                    "value": {"tag": "variable", "value": crypto.encrypt("123")},
+                },
                 {"id": 1000031, "type": 3, "name": "ip", "value": "0:192.168.20.218", "description": ""},
             ],
         }
@@ -750,6 +757,7 @@ def __init__(
                         "job_plan_id": 1000010,
                         "global_var_list": [
                             {"id": 1000030, "value": "test"},
+                            {"id": 1000032, "value": "123"},
                             {"id": 1000031, "server": {"ip_list": [{"ip": "192.168.20.218", "bk_cloud_id": 0}]}},
                         ],
                         "callback_url": "callback_url",

From a448a874ea8dbe8e0478f508a598a33fb70de840 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Thu, 24 Aug 2023 09:40:20 +0800
Subject: [PATCH 072/112] =?UTF-8?q?minor:=20sm2=E5=8A=A0=E5=AF=86=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E7=94=9F=E6=88=90=E7=9A=84=E5=AF=86=E6=96=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/RenderForm/tags/TagPassword.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 64f948d1a5..1feb32b464 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -199,7 +199,7 @@
                     const pkey = cryptoJsSdk.helper.asn1.decode(pubKey)
                     const cipher = sm2.encrypt(pkey, cryptoJsSdk.helper.encode.strToHex(this.localVal.value))
                     const base64Ret = cryptoJsSdk.helper.encode.hexToBase64(cipher)
-                    return base64Ret
+                    return `${this.ASYMMETRIC_PREFIX}${base64Ret}`
                 }
             },
             change () {

From 58feabeb0f84dc3e52ed2e4638f786cf331f7fa4 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Tue, 29 Aug 2023 20:34:29 +0800
Subject: [PATCH 073/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BD?=
 =?UTF-8?q?=E5=AF=86=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BD=93=E9=AA=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/RenderForm/FormItem.vue  | 13 +++++++++----
 .../components/common/RenderForm/RenderForm.vue    |  1 +
 .../common/RenderForm/tags/TagPassword.vue         | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 92a8f2a1f5..79a4af4316 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -348,11 +348,15 @@
                     defaultValueFormat = this.getDefaultValueFormat()
                 }
 
-                const isTypeValid = Array.isArray(defaultValueFormat.type)
-                    ? defaultValueFormat.type.indexOf(valueType) > -1
-                    : defaultValueFormat.type === valueType
+                const defaultValueType = Array.isArray(defaultValueFormat.type) ? defaultValueFormat.type : [defaultValueFormat.type]
 
-                if (isTypeValid) {
+                // 处理非密码框表单使用密码变量时，需要展示******的场景
+                // 非密码框且值类型包含string的表单，如果当前value为Object类型，且type值为password_value时，展示值为******
+                if (this.scheme.type !== 'password' && defaultValueType.includes('String') && checkDataType(val) === 'Object' && val.type === 'password_value') {
+                    return '******'
+                }
+
+                if (defaultValueType.includes(valueType)) {
                     formValue = tools.deepClone(val)
                 } else {
                     formValue = tools.deepClone(defaultValueFormat.value)
@@ -468,6 +472,7 @@
                         valueFormat = {
                             type: ['String', 'Object'],
                             value: {
+                                type: 'password_value',
                                 tag: 'value',
                                 value: ''
                             }
diff --git a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
index 07aff3fa97..e988a08b98 100644
--- a/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
+++ b/frontend/desktop/src/components/common/RenderForm/RenderForm.vue
@@ -292,6 +292,7 @@
                             break
                         case 'password':
                             val = {
+                                type: 'password_value',
                                 tag: 'value',
                                 value: ''
                             }
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 1feb32b464..936b10307d 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -12,7 +12,14 @@
 <template>
     <div class="tag-password">
         <div v-if="formMode" class="password-edit-wrapper">
-            <bk-select v-if="canUseVar" slot="prepend" class="select-type" :clearable="false" :value="localVal.tag" @selected="handleSelectType">
+            <bk-select
+                v-if="canUseVar"
+                slot="prepend"
+                class="select-type"
+                :disabled="!editable || !formMode || disabled"
+                :clearable="false"
+                :value="localVal.tag"
+                @selected="handleSelectType">
                 <bk-option id="value" :name="$t('password_手动输入')"></bk-option>
                 <bk-option id="variable" :name="$t('password_使用密码变量')"></bk-option>
             </bk-select>
@@ -23,6 +30,7 @@
                     type="password"
                     :value="inputText"
                     :placeholder="inputPlaceholder"
+                    :disabled="!editable || !formMode || disabled"
                     @input="handleInput"
                     @focus="handleFocus"
                     @blur="handleBlur" />
@@ -33,6 +41,7 @@
                     rows="4"
                     :value="inputText"
                     :placeholder="inputPlaceholder"
+                    :disabled="!editable || !formMode || disabled"
                     @keydown="handleTextareaKeyDown"
                     @input="handleTextareaInput"
                     @keyup="handleTextareaKeyUp"
@@ -41,7 +50,7 @@
                 </textarea>
             </template>
             <bk-select v-else class="select-var" :value="localVal.value" @selected="handleSelectVariable">
-                <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.name"></bk-option>
+                <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.id"></bk-option>
             </bk-select>
             <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
         </div>
@@ -90,6 +99,7 @@
         data () {
             return {
                 localVal: {
+                    type: 'password_value',
                     tag: 'value',
                     value: ''
                 },

From 5987361ba3fa36cc0824de146f32eadbddd86cc9 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Wed, 30 Aug 2023 20:29:19 +0800
Subject: [PATCH 074/112] minor: release V3.30.0

---
 app.yml                               | 2 +-
 app_desc.yaml                         | 2 +-
 config/default.py                     | 2 +-
 version_logs_md/V3.30.0_2023-08-30.md | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 version_logs_md/V3.30.0_2023-08-30.md

diff --git a/app.yml b/app.yml
index 63f475dfb7..650371dfe3 100644
--- a/app.yml
+++ b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.29.5
+version: 3.30.0
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index 841ec68097..0324f4d24f 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.29.5"
+app_version: "3.30.0"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index c75fc59a54..e9dafacff5 100644
--- a/config/default.py
+++ b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.29.5"
+STATIC_VERSION = "3.30.0"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
diff --git a/version_logs_md/V3.30.0_2023-08-30.md b/version_logs_md/V3.30.0_2023-08-30.md
new file mode 100644
index 0000000000..d47990eff2
--- /dev/null
+++ b/version_logs_md/V3.30.0_2023-08-30.md
@@ -0,0 +1,3 @@
+# V3.30.0 版本更新说明
+
+- [ 新增 ] 提供国密支持

From 9ef27c326cf1d2cadd3c9a6967470b9f72ac6de6 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Mon, 4 Sep 2023 16:40:41 +0800
Subject: [PATCH 075/112] =?UTF-8?q?sprintfix:=20=E5=9B=BD=E5=AF=86?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=80=82=E9=85=8D=20PaaSV2=20=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/env.py b/env.py
index b64958306b..b93eea8150 100644
--- a/env.py
+++ b/env.py
@@ -111,4 +111,9 @@
 
 
 # 获取加密类型
-BKPAAS_BK_CRYPTO_TYPE = os.getenv("BKPAAS_BK_CRYPTO_TYPE", "") or os.getenv("BK_CRYPTO_TYPE") or "CLASSIC"
+BKPAAS_BK_CRYPTO_TYPE = (
+    os.getenv("BKPAAS_BK_CRYPTO_TYPE", "")
+    or os.getenv("BKAPP_BK_CRYPTO_TYPE", "")
+    or os.getenv("BK_CRYPTO_TYPE")
+    or "CLASSIC"
+)

From a11dfb88c76c47ec1d1f71d34445c45db13e44b5 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Wed, 6 Sep 2023 15:04:45 +0800
Subject: [PATCH 076/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=80=BC=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E6=97=B6=E5=80=BC=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../variables/collections/common.py           | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pipeline_plugins/variables/collections/common.py b/pipeline_plugins/variables/collections/common.py
index 4e8d6494b7..c4eb7d7d35 100644
--- a/pipeline_plugins/variables/collections/common.py
+++ b/pipeline_plugins/variables/collections/common.py
@@ -12,23 +12,23 @@
 """
 
 import datetime
-import logging
 import json
+import logging
 from typing import List
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+from pipeline.core.data.var import LazyVariable, RegisterVariableMeta, SpliceVariable
+from pipeline.core.flow.io import IntItemSchema, StringItemSchema
 
+from gcloud.conf import settings as gcloud_settings
 from gcloud.constants import Type
 from gcloud.core.models import StaffGroupSet
 from gcloud.exceptions import ApiRequestError
 from gcloud.utils.cmdb import get_notify_receivers
-from gcloud.conf import settings as gcloud_settings
-from pipeline.core.data.var import SpliceVariable, LazyVariable, RegisterVariableMeta
-from pipeline.core.flow.io import StringItemSchema, IntItemSchema
 from pipeline_plugins.base.utils.inject import supplier_account_for_business
-from pipeline_plugins.variables.base import SelfExplainVariable, FieldExplain
+from pipeline_plugins.variables.base import FieldExplain, SelfExplainVariable
 
 logger = logging.getLogger("root")
 get_client_by_user = gcloud_settings.ESB_GET_CLIENT_BY_USER
@@ -159,10 +159,9 @@ def _self_explain(cls, **kwargs) -> List[FieldExplain]:
         ]
 
     def get_value(self):
+
         meta_values = json.loads(self.value["meta_data"])
-        info_values = (
-            [self.value["info_value"]] if isinstance(self.value["info_value"], str) else self.value["info_value"]
-        )
+        info_values = TextValueSelect.process_info_value(self.value["info_value"])
         text_values = [meta["text"] for meta in meta_values if meta["value"] in info_values]
         text_not_selected_values = [meta["text"] for meta in meta_values if meta["value"] not in info_values]
         info_not_selected_values = [meta["value"] for meta in meta_values if meta["value"] not in info_values]
@@ -174,6 +173,19 @@ def get_value(self):
             "value_not_selected": ",".join(info_not_selected_values),
         }
 
+    @classmethod
+    def process_info_value(cls, info_value):
+        if isinstance(info_value, str):
+            return [info_value]
+
+        # 在 子流程 变量传递的过程中，会出现info_value = {"value": 1, "text": "xx", "text_not_selected": "xx"}的情况，
+        # 所以需要特殊处理一下
+        if isinstance(info_value, dict):
+            if set(info_value.keys()) == {"value", "text", "text_not_selected", "value_not_selected"}:
+                return [info_value["value"]]
+
+        return info_value
+
     @classmethod
     def process_meta_value(self, meta_data, info_value):
         if meta_data["value"]["datasource"] == "1":

From d8ce1bc9706eaf6bbb6376558abf9fa1fdd0f3f5 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Thu, 7 Sep 2023 10:46:45 +0800
Subject: [PATCH 077/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Dpreview=5Fn?=
 =?UTF-8?q?ode=5Finputs=E5=AF=B9=E4=BA=8E=E5=AD=90=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/tasktmpl3/domains/constants.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index 3913770074..5cb03038d9 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -95,8 +95,9 @@ def get_need_render_context_keys():
                     keys.add("${" + value + "}")
         return keys
 
-    node_type = pipeline["activities"][node_id]["type"]
-    node_code = pipeline["activities"][node_id].get("component", {}).get("code")
+    # 对于子流程内的节点，拿不到当前node_id的type和code
+    node_type = pipeline["activities"].get(node_id, {}).get("type")
+    node_code = pipeline["activities"].get(node_id, {}).get("component", {}).get("code")
     # 只优化普通节点的渲染过程
     if node_type == NodeType.ServiceActivity.value and node_code != "subprocess_plugin":
         need_render_context_keys = get_need_render_context_keys()

From a18bb9dd3fb15b2914dc8d58e99ed8dbebc7e6cf Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 7 Sep 2023 14:30:18 +0800
Subject: [PATCH 078/112] =?UTF-8?q?optimization:=20=E5=AD=90=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=8A=82=E7=82=B9=E6=89=A7=E8=A1=8C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0=E5=B1=95=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/RenderForm/FormItem.vue | 121 +-----------------
 .../common/RenderForm/formMixins.js           |   4 +
 .../common/RenderForm/tags/TagDatatable.vue   |   2 +-
 .../RenderForm/tags/TagHostAllocation.vue     |   2 +-
 .../common/RenderForm/tags/TagIpSelector.vue  |   8 +-
 .../RenderForm/tags/TagMemberSelector.vue     |   2 +-
 .../common/RenderForm/tags/TagSelect.vue      |   2 +-
 .../RenderForm/tags/TagSetAllocation.vue      |   2 +-
 .../common/RenderForm/tags/TagTextarea.vue    |   5 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  53 ++++----
 .../TaskExecute/ExecuteInfo/InputParams.vue   |  51 ++------
 .../pages/task/TaskExecute/ModifyParams.vue   |   2 +-
 .../TabGlobalVariables/VariableEdit.vue       |  25 ++--
 frontend/desktop/src/utils/checkDataType.js   | 113 ++++++++++++++++
 14 files changed, 185 insertions(+), 207 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index dff64bede9..9cef50a2b5 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -117,6 +117,7 @@
                 :hook="hook"
                 :render="render"
                 :constants="constants"
+                :scheme="scheme"
                 :atom-events="scheme.events"
                 :atom-methods="scheme.methods"
                 :value="formValue"
@@ -162,7 +163,7 @@
 <script>
     import '@/utils/i18n.js'
     import tools from '@/utils/tools.js'
-    import { checkDataType } from '@/utils/checkDataType.js'
+    import { checkDataType, getDefaultValueFormat } from '@/utils/checkDataType.js'
     import FormGroup from './FormGroup.vue'
 
     // 导入 tag 文件注册为组件
@@ -373,6 +374,10 @@
                 return { ...attrs }
             },
             getFormValue (val) {
+                // 不使用默认值
+                if (this.scheme.attrs.usedValue) {
+                    return tools.deepClone(val)
+                }
                 const valueType = checkDataType(val)
 
                 if (valueType === 'Undefined') {
@@ -388,7 +393,7 @@
                         value: ''
                     }
                 } else {
-                    defaultValueFormat = this.getDefaultValueFormat()
+                    defaultValueFormat = getDefaultValueFormat(this.scheme)
                 }
 
                 const isTypeValid = Array.isArray(defaultValueFormat.type)
@@ -404,118 +409,6 @@
 
                 return formValue
             },
-            getDefaultValueFormat () {
-                let valueFormat
-                switch (this.scheme.type) {
-                    case 'input':
-                    case 'textarea':
-                    case 'radio':
-                    case 'text':
-                    case 'datetime':
-                    case 'password':
-                    case 'memberSelector':
-                    case 'logDisplay':
-                    case 'code_editor':
-                    case 'section':
-                        valueFormat = {
-                            type: ['String', 'Number', 'Boolean'],
-                            value: ''
-                        }
-                        break
-                    case 'checkbox':
-                    case 'datatable':
-                    case 'tree':
-                    case 'upload':
-                    case 'cascader':
-                        valueFormat = {
-                            type: 'Array',
-                            value: []
-                        }
-                        break
-                    case 'select':
-                        if (this.scheme.attrs.multiple) {
-                            valueFormat = {
-                                type: 'Array',
-                                value: []
-                            }
-                        } else {
-                            valueFormat = {
-                                type: ['String', 'Number', 'Boolean'],
-                                value: ''
-                            }
-                        }
-                        break
-                    case 'time':
-                        if (this.scheme.attrs.isRange) {
-                            valueFormat = {
-                                type: 'Array',
-                                value: ['00:00:00', '23:59:59']
-                            }
-                        } else {
-                            valueFormat = {
-                                type: 'String',
-                                value: ''
-                            }
-                        }
-                        break
-                    case 'int':
-                        valueFormat = {
-                            type: 'Number',
-                            value: 0
-                        }
-                        break
-                    case 'ip_selector':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                static_ip_table_config: [],
-                                selectors: [],
-                                ip: [],
-                                topo: [],
-                                group: [],
-                                filters: [],
-                                excludes: []
-                            }
-                        }
-                        break
-                    case 'set_allocation':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                config: {
-                                    set_count: 1,
-                                    set_template_id: '',
-                                    host_resources: [],
-                                    module_detail: []
-                                },
-                                data: [],
-                                separator: ','
-                            }
-                        }
-                        break
-                    case 'host_allocation':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                config: {
-                                    host_count: 0,
-                                    host_screen_value: '',
-                                    host_resources: [],
-                                    host_filter_detail: []
-                                },
-                                data: [],
-                                separator: ','
-                            }
-                        }
-                        break
-                    default:
-                        valueFormat = {
-                            type: 'String',
-                            value: ''
-                        }
-                }
-                return valueFormat
-            },
             isRequired () {
                 let required = false
                 if (this.option.showRequired === true && 'validation' in this.scheme.attrs) {
diff --git a/frontend/desktop/src/components/common/RenderForm/formMixins.js b/frontend/desktop/src/components/common/RenderForm/formMixins.js
index 447713197c..05d6b8d288 100644
--- a/frontend/desktop/src/components/common/RenderForm/formMixins.js
+++ b/frontend/desktop/src/components/common/RenderForm/formMixins.js
@@ -14,6 +14,10 @@ import { checkDataType } from '@/utils/checkDataType.js'
 import i18n from '@/config/i18n/index.js'
 
 export const COMMON_ATTRS = {
+    scheme: {
+        type: Object,
+        default: () => ({})
+    },
     tagCode: {
         type: String,
         required: true,
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
index 1182e6a839..0ea003e782 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
@@ -51,7 +51,7 @@
                 </el-upload>
             </template>
         </div>
-        <span v-if="constants.subflow_detail_var" class="rf-view-value">{{ constants[tagCode] }}</span>
+        <span v-if="scheme.attrs.usedValue" class="rf-view-value">{{ value }}</span>
         <template v-else-if="Array.isArray(value) && !loading">
             <el-table
                 ref="tableEl"
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagHostAllocation.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagHostAllocation.vue
index 6deda7ae5c..1a5d07db49 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagHostAllocation.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagHostAllocation.vue
@@ -11,7 +11,7 @@
 */
 <template>
     <div class="tag-host-allocation">
-        <span v-if="constants.subflow_detail_var" class="rf-view-value">{{ constants[tagCode] }}</span>
+        <span v-if="scheme.attrs.usedValue" class="rf-view-value">{{ value }}</span>
         <div class="tag-host-allocation-wrap" v-else>
             <host-allocation
                 ref="hostAllocation"
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
index bd994b6fc5..c3468d97cb 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagIpSelector.vue
@@ -11,7 +11,8 @@
 */
 <template>
     <div class="tag-ip-selector" v-bkloading="{ isLoading: loading, opacity: 0.8, zIndex: 100 }">
-        <div v-if="formMode && typeof ipValue === 'object'" class="tag-ip-selector-wrap">
+        <span v-if="scheme.attrs.usedValue" class="rf-view-value">{{ value }}</span>
+        <div v-else-if="typeof ipValue === 'object'" class="tag-ip-selector-wrap">
             <ip-selector
                 ref="ipSelector"
                 :editable="editable && !disabled"
@@ -25,7 +26,6 @@
                 v-model="ipValue">
             </ip-selector>
         </div>
-        <span v-else class="rf-view-value">{{ constants.subflow_detail_var ? constants[tagCode] : viewValue }}</span>
     </div>
 </template>
 <script>
@@ -140,7 +140,9 @@
             }
         },
         mounted () {
-            this.getData()
+            if (!this.scheme.attrs.usedValue) {
+                this.getData()
+            }
         },
         methods: {
             ...mapActions([
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagMemberSelector.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagMemberSelector.vue
index 0acad577e2..cd766baa2a 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagMemberSelector.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagMemberSelector.vue
@@ -18,7 +18,7 @@
                 :placeholder="placeholder">
             </member-select>
         </div>
-        <span v-else class="rf-view-value">{{ constants.subflow_detail_var ? constants[tagCode] : viewValue }}</span>
+        <span v-else class="rf-view-value">{{ viewValue }}</span>
         <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
     </div>
 </template>
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
index 9c7ad4b28c..30ce81f3e2 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
@@ -83,7 +83,7 @@
 
     export const attrs = {
         value: {
-            type: [String, Array, Boolean, Number],
+            type: [String, Array, Object, Boolean, Number],
             required: false,
             default: '',
             desc: i18n.t('下拉框的选中值，可输入 String、Boolean、Number 类型的值，若为多选请输入包含上述类型的数组格式数据')
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagSetAllocation.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagSetAllocation.vue
index 6941ada37f..7877a3329c 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagSetAllocation.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagSetAllocation.vue
@@ -11,7 +11,7 @@
 */
 <template>
     <div class="tag-set-allocation">
-        <span v-if="constants.subflow_detail_var" class="rf-view-value">{{ constants[tagCode] }}</span>
+        <span v-if="scheme.attrs.usedValue" class="rf-view-value">{{ value }}</span>
         <div class="tag-set-allocation-wrap" v-else>
             <set-allocation
                 ref="setAllocation"
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index a61fc760f1..175f804dec 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">
+        <div class="rf-form-wrapper" v-if="formMode">
             <div class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled, 'text-view-mode': !formMode }">
                 <div
                     ref="input"
@@ -47,6 +47,7 @@
                 </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>
@@ -59,7 +60,7 @@
 
     export const attrs = {
         value: {
-            type: String,
+            type: [String, Object],
             required: false,
             default: ''
         },
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 0599e4ddfa..e35feaa7c0 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -228,6 +228,7 @@
     import tools from '@/utils/tools.js'
     import atomFilter from '@/utils/atomFilter.js'
     import { TASK_STATE_DICT, NODE_DICT } from '@/constants/index.js'
+    import { checkDataType, getDefaultValueFormat } from '@/utils/checkDataType.js'
     import NodeTree from './NodeTree'
     import NodeOperationFlow from './ExecuteInfo/NodeOperationFlow.vue'
     import ExecuteRecord from './ExecuteInfo/ExecuteRecord.vue'
@@ -667,7 +668,7 @@
                 }
                 let outputsInfo = []
                 const renderData = {}
-                let constants = {}
+                const constants = {}
                 let inputsInfo = inputs
                 let failInfo = ''
                 // 添加插件输出表单所需上下文
@@ -677,36 +678,32 @@
                 // 获取子流程配置详情
                 if (componentCode === 'subprocess_plugin' || this.isLegacySubProcess) {
                     const { constants } = this.isLegacySubProcess ? this.pipelineData : this.componentValue.pipeline
-                    this.renderConfig = await this.getSubflowInputsConfig(constants)
+                    const renderConfig = await this.getSubflowInputsConfig(constants)
+                    const keys = Object.keys(inputs)
+                    this.renderConfig = renderConfig.filter(item => keys.includes(item.tag_code))
                 } else if (componentCode) { // 任务节点需要加载标准插件
                     await this.getNodeConfig(componentCode, version, inputs.plugin_version)
                 }
-                if (this.isSubProcessNode) { // 新版子流程任务节点输入参数处理
-                    inputsInfo = Object.keys(inputs).reduce((acc, cur) => {
-                        const value = inputs[cur]
-                        if (cur === 'subprocess') {
-                            Object.keys(value.pipeline.constants).forEach(key => {
-                                const data = value.pipeline.constants[key]
-                                acc[key] = data.value
-                            })
-                        } else {
-                            acc[cur] = value
-                        }
-                        return acc
-                    }, {})
-                } else if (this.isLegacySubProcess) {
-                    /**
-                     * 兼容旧版本子流程节点输入数据
-                     * 获取子流程输入参数 (subflow_detail_var 标识当前为子流程节点详情)
-                     */
-                    constants = { subflow_detail_var: true, ...inputsInfo }
-                    inputsInfo = Object.values(this.pipelineData.constants).reduce((acc, cur) => {
-                        if (cur.show_type === 'show') {
-                            acc[cur.key] = cur.value
+                inputsInfo = Object.keys(inputs).reduce((acc, cur) => {
+                    const scheme = this.renderConfig.find(item => item.tag_code === cur)
+                    if (scheme) {
+                        const defaultValueFormat = getDefaultValueFormat(scheme)
+                        const valueType = checkDataType(inputs[cur])
+                        const isTypeValid = Array.isArray(defaultValueFormat.type)
+                            ? defaultValueFormat.type.indexOf(valueType) > -1
+                            : defaultValueFormat.type === valueType
+                        // 标记数据类型不同的表单项并原样展示数据
+                        if (!isTypeValid) {
+                            if ('attrs' in scheme) {
+                                scheme.attrs.usedValue = true
+                            } else {
+                                scheme.attrs = { usedValue: true }
+                            }
                         }
-                        return acc
-                    }, {})
-                }
+                    }
+                    acc[cur] = inputs[cur]
+                    return acc
+                }, {})
                 for (const key in inputsInfo) {
                     renderData[key] = inputsInfo[key]
                 }
@@ -897,7 +894,7 @@
                     if (variable.custom_type === 'select') {
                         formItemConfig.attrs.allowCreate = true
                     }
-                    formItemConfig.tag_code = key
+                    formItemConfig.tag_code = key.slice(2, -1)
                     formItemConfig.attrs.name = variable.name
                     // 自定义输入框变量正则校验添加到插件配置项
                     if (['input', 'textarea'].includes(variable.custom_type) && variable.validation !== '') {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
index 1df95a09f4..63f7354ce0 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/InputParams.vue
@@ -23,7 +23,7 @@
                         :key="renderKey"
                         :scheme="renderConfig"
                         :form-option="renderOption"
-                        :constants="inputConstants"
+                        :constants="constants"
                         v-model="inputRenderData">
                     </RenderForm>
                     <NoData v-else></NoData>
@@ -98,7 +98,6 @@
                     formMode: false
                 },
                 renderKey: null,
-                inputConstants: {},
                 inputRenderData: {},
                 isExpand: true
             }
@@ -115,39 +114,10 @@
                 },
                 immediate: true
             },
-            constants: {
-                handler (val) {
-                    const constants = tools.deepClone(val)
-                    if (constants.subflow_detail_var) {
-                        // 兼容接口返回的key值和form配置的key不同
-                        Object.keys(this.inputs).forEach(key => {
-                            if (!(key in constants) && /^\${[^${}]+}$/.test(key)) {
-                                const varKey = key.split('').slice(2, -1).join('')
-                                if (varKey in constants) {
-                                    constants[key] = constants[varKey]
-                                    this.$delete(constants, varKey)
-                                }
-                            }
-                        })
-                    }
-                    this.inputConstants = constants
-                },
-                deep: true,
-                immediate: true
-            },
             renderData: {
                 handler (val) {
                     this.renderKey = new Date().getTime()
                     const renderData = tools.deepClone(val)
-                    // 兼容form配置的key为变量的情况
-                    if (this.constants.subflow_detail_var) {
-                        Object.keys(this.renderData).forEach(key => {
-                            const value = this.renderData[key]
-                            if (/^\${[^${}]+}$/.test(value) && key in this.inputConstants) {
-                                renderData[key] = this.inputConstants[key]
-                            }
-                        })
-                    }
                     this.inputRenderData = renderData
                 },
                 deep: true,
@@ -163,14 +133,9 @@
         methods: {
             inputSwitcher () {
                 if (!this.isShowInputOrigin) {
-                    this.inputsInfo = this.constants.subflow_detail_var ? tools.deepClone(this.inputs) : JSON.parse(this.inputsInfo)
+                    this.inputsInfo = JSON.parse(this.inputsInfo)
                 } else {
-                    let info = this.inputs
-                    if (this.constants.subflow_detail_var) {
-                        info = tools.deepClone(this.constants)
-                        this.$delete(info, 'subflow_detail_var')
-                    }
-                    this.inputsInfo = JSON.stringify(info, null, 4)
+                    this.inputsInfo = JSON.stringify(this.inputs, null, 4)
                 }
             }
         }
@@ -198,7 +163,7 @@
             }
             .input-name {
                 line-height: 20px;
-                width: 40%;
+                width: 20%;
             }
         }
         /deep/.render-form {
@@ -209,7 +174,7 @@
                 width: 100% !important;
                 border-bottom: 1px solid #dcdee5;
                 label {
-                    width: 40%;
+                    width: 20%;
                     text-align: left;
                     padding-left: 13px;
                     color: #63656e;
@@ -218,7 +183,7 @@
                     }
                 }
                 >.rf-tag-form {
-                    margin-left: 40%;
+                    margin-left: 20%;
                     padding-left: 13px;
                     padding-right: 15px;
                 }
@@ -243,7 +208,7 @@
                 width: 100% !important;
                 border-bottom: 1px solid #dcdee5;
                 label {
-                    width: 40% !important;
+                    width: 20% !important;
                     text-align: left;
                     padding-left: 13px;
                     color: #63656e;
@@ -252,7 +217,7 @@
                     }
                 }
                 >.bk-form-content {
-                    margin-left: 40% !important;
+                    margin-left: 20% !important;
                     padding-left: 13px;
                     padding-right: 15px;
                 }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue b/frontend/desktop/src/pages/task/TaskExecute/ModifyParams.vue
index f990ad8553..dfb356c2b0 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') {
+                        if (cnt.show_type === 'show' && !cnt.pre_render_mako) {
                             if (!has_key || keys_in_constants_parameter.includes(key)) {
                                 // api调用时不做校验
                                 cnt.validation = ''
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
index ab0e058a1b..4d16eb1482 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableEdit.vue
@@ -68,7 +68,7 @@
                     <pre class="variable-type-desc" v-if="variableDesc">{{ variableDesc }}</pre>
                 </div>
                 <!-- 验证规则 -->
-                <div v-show="theEditingData.custom_type === 'input' && !isInternalVal" class="form-item clearfix">
+                <div v-show="['input', 'textarea'].includes(theEditingData.custom_type) && !isInternalVal" class="form-item clearfix">
                     <label class="form-label">{{ $t('正则校验') }}</label>
                     <div class="form-content">
                         <bk-input
@@ -277,7 +277,10 @@
                 varTypeListLoading: false,
                 varTypeList: [], // 变量类型，input、textarea、datetime 等
                 varTypeData: {},
-                inputRegexp: '', // input类型正则
+                varRegexpData: { // input，textarea类型正则
+                    input: '^.+$',
+                    textarea: '^[\\s\\S]+$'
+                },
                 atomConfigLoading: false,
                 atomTypeKey: '',
                 stringLength: STRING_LENGTH,
@@ -564,7 +567,7 @@
                 if (is_meta && source_type === 'component_inputs' && config.meta_transform) {
                     config = config.meta_transform(meta)
                 }
-                if (custom_type === 'input') {
+                if (['input', 'textarea'].includes(custom_type)) {
                     config.attrs.validation.push({
                         type: 'regex',
                         args: this.getInputDefaultValueValidation(),
@@ -628,7 +631,7 @@
 
                 // 隐藏状态下，默认值为必填项
                 // 输入框显示类型为隐藏时，按照正则规则校验，去掉必填项校验
-                if (show_type === 'show' || (show_type === 'hide' && custom_type === 'input')) {
+                if (show_type === 'show' || (show_type === 'hide' && ['input', 'textarea'].includes(custom_type))) {
                     return validateSet.slice(1)
                 } else {
                     return validateSet
@@ -649,9 +652,9 @@
                     ? { set_module_ip_selector: tools.deepClone(this.renderData['ip_selector']) }
                     : tools.deepClone(this.renderData)
                 Object.assign(this.varTypeData, valData)
-                // 将input类型正则存起来
-                if (oldValue === 'input') {
-                    this.inputRegexp = this.theEditingData.validation
+                // 将input textarea类型正则存起来
+                if (['input', 'textarea'].includes(oldValue)) {
+                    this.varRegexpData[oldValue] = this.theEditingData.validation
                 }
                 let data
                 this.varTypeList.some(group => {
@@ -667,9 +670,9 @@
                 } else {
                     this.renderData = {}
                 }
-                // input类型需要正则校验
-                if (val === 'input') {
-                    this.theEditingData.validation = this.inputRegexp || '^.+$'
+                // input textarea类型需要正则校验
+                if (['input', 'textarea'].includes(val)) {
+                    this.theEditingData.validation = this.varRegexpData[val]
                 } else {
                     this.theEditingData.validation = ''
                 }
@@ -709,7 +712,7 @@
                 const validateSet = this.getValidateSet()
                 this.$set(this.renderOption, 'validateSet', validateSet)
 
-                if (this.theEditingData.custom_type === 'input') {
+                if (['input', 'textarea'].includes(this.theEditingData.custom_type)) {
                     const config = tools.deepClone(this.renderConfig[0])
                     const regValidate = config.attrs.validation.find(item => item.type === 'regex')
                     regValidate.args = this.getInputDefaultValueValidation()
diff --git a/frontend/desktop/src/utils/checkDataType.js b/frontend/desktop/src/utils/checkDataType.js
index 271e0ae260..364bc8676c 100644
--- a/frontend/desktop/src/utils/checkDataType.js
+++ b/frontend/desktop/src/utils/checkDataType.js
@@ -13,3 +13,116 @@ export const checkDataType = (data) => {
     const typeString = Object.prototype.toString.call(data)
     return typeString.slice(8, -1)
 }
+
+export const getDefaultValueFormat = (scheme) => {
+    let valueFormat
+    switch (scheme.type) {
+        case 'input':
+        case 'textarea':
+        case 'radio':
+        case 'text':
+        case 'datetime':
+        case 'password':
+        case 'memberSelector':
+        case 'logDisplay':
+        case 'code_editor':
+        case 'section':
+            valueFormat = {
+                type: ['String', 'Number', 'Boolean'],
+                value: ''
+            }
+            break
+        case 'checkbox':
+        case 'datatable':
+        case 'tree':
+        case 'upload':
+        case 'cascader':
+            valueFormat = {
+                type: 'Array',
+                value: []
+            }
+            break
+        case 'select': // 文本值下拉框数据类型可能为对象
+            if (scheme.attrs.multiple) {
+                valueFormat = {
+                    type: ['Array', 'Object'],
+                    value: []
+                }
+            } else {
+                valueFormat = {
+                    type: ['String', 'Number', 'Boolean', 'Object'],
+                    value: ''
+                }
+            }
+            break
+        case 'time':
+            if (scheme.attrs.isRange) {
+                valueFormat = {
+                    type: 'Array',
+                    value: ['00:00:00', '23:59:59']
+                }
+            } else {
+                valueFormat = {
+                    type: 'String',
+                    value: ''
+                }
+            }
+            break
+        case 'int':
+            valueFormat = {
+                type: 'Number',
+                value: 0
+            }
+            break
+        case 'ip_selector':
+            valueFormat = {
+                type: 'Object',
+                value: {
+                    static_ip_table_config: [],
+                    selectors: [],
+                    ip: [],
+                    topo: [],
+                    group: [],
+                    filters: [],
+                    excludes: []
+                }
+            }
+            break
+        case 'set_allocation':
+            valueFormat = {
+                type: 'Object',
+                value: {
+                    config: {
+                        set_count: 1,
+                        set_template_id: '',
+                        host_resources: [],
+                        module_detail: []
+                    },
+                    data: [],
+                    separator: ','
+                }
+            }
+            break
+        case 'host_allocation':
+            valueFormat = {
+                type: 'Object',
+                value: {
+                    config: {
+                        host_count: 0,
+                        host_screen_value: '',
+                        host_resources: [],
+                        host_filter_detail: []
+                    },
+                    data: [],
+                    separator: ','
+                }
+            }
+            break
+        default:
+            valueFormat = {
+                type: 'String',
+                value: ''
+            }
+    }
+    return valueFormat
+}

From 9dbfce7e4817c8d129136181c4441dc8106b4e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 7 Sep 2023 17:04:08 +0800
Subject: [PATCH 079/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E6=89=A7=E8=A1=8C=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2inputs=E6=A0=BC=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?(#7049)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bugfix: 修复独立子流程执行历史inputs格式的问题

* bugfix: 修复独立子流程执行历史inputs格式的问题

* test: fix test
---
 gcloud/taskflow3/domains/dispatchers/node.py  | 17 +++++++++------
 .../test_get_node_detail_v2.py                | 21 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/gcloud/taskflow3/domains/dispatchers/node.py b/gcloud/taskflow3/domains/dispatchers/node.py
index 0e6dbdb88a..36d591b324 100644
--- a/gcloud/taskflow3/domains/dispatchers/node.py
+++ b/gcloud/taskflow3/domains/dispatchers/node.py
@@ -727,6 +727,11 @@ def get_node_detail_v2(
             }
 
         detail = result.data
+        pipeline_instance = kwargs["pipeline_instance"]
+        node_info = self._get_node_info(
+            node_id=self.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
+        )
+        node_code = node_info.get("component", {}).get("code")
         # 节点已经执行
         if detail:
             detail = detail[self.node_id]
@@ -764,19 +769,19 @@ def get_node_detail_v2(
 
             for hist in detail["histories"]:
                 # 重试记录必然是因为失败才重试
+                if node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                    # 对于独立子流程节点要重新渲染输出
+                    raw_inputs = hist["inputs"]["subprocess"]["pipeline"]["constants"]
+                    hist["inputs"] = {key[2:-1]: value.get("value") for key, value in raw_inputs.items()}
                 hist.setdefault("state", bamboo_engine_states.FAILED)
                 hist["history_id"] = hist["id"]
                 format_pipeline_status(hist)
         # 节点未执行
         else:
-            pipeline_instance = kwargs["pipeline_instance"]
-            node = self._get_node_info(
-                node_id=self.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
-            )
             detail.update(
                 {
-                    "name": node["name"],
-                    "error_ignorable": node.get("error_ignorable", False),
+                    "name": node_info["name"],
+                    "error_ignorable": node_info.get("error_ignorable", False),
                     "state": bamboo_engine_states.READY,
                 }
             )
diff --git a/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_detail_v2.py b/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_detail_v2.py
index b4579d304e..d098185bd0 100644
--- a/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_detail_v2.py
+++ b/gcloud/tests/taskflow3/dispatchers/node/node_command_dispatcher/test_get_node_detail_v2.py
@@ -11,12 +11,11 @@
 specific language governing permissions and limitations under the License.
 """
 
+from bamboo_engine import states as bamboo_engine_states
 from django.test import TestCase
 
 from gcloud import err_code
 from gcloud.taskflow3.domains.dispatchers.node import NodeCommandDispatcher
-from bamboo_engine import states as bamboo_engine_states
-
 from gcloud.tests.mock import *  # noqa
 from gcloud.tests.mock_settings import *  # noqa
 
@@ -87,7 +86,7 @@ def test_node_started_loop_is_none(self):
         bamboo_api.get_node_histories = MagicMock(return_value=get_node_histories_return)
         dispatcher = NodeCommandDispatcher(engine_ver=2, node_id="node_id")
 
-        dispatcher._get_node_info = MagicMock()
+        dispatcher._get_node_info = MagicMock(return_value={"type": "ServiceActivity"})
         format_pipeline_status = MagicMock()
 
         with patch(TASKFLOW_DISPATCHERS_NODE_BAMBOO_RUNTIME, runtime_init):
@@ -103,7 +102,9 @@ def test_node_started_loop_is_none(self):
 
         bamboo_api.get_children_states.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id)
         bamboo_api.get_node_histories.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id, loop=1)
-        dispatcher._get_node_info.assert_not_called()
+        dispatcher._get_node_info.assert_called_once_with(
+            node_id=dispatcher.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
+        )
 
         self.assertEqual(
             node_detail,
@@ -149,7 +150,7 @@ def test_node_started_loop_is_latest(self):
         bamboo_api.get_node_histories = MagicMock(return_value=get_node_histories_return)
 
         dispatcher = NodeCommandDispatcher(engine_ver=2, node_id="node_id")
-        dispatcher._get_node_info = MagicMock()
+        dispatcher._get_node_info = MagicMock(return_value={"type": "ServiceActivity"})
         format_pipeline_status = MagicMock()
 
         with patch(TASKFLOW_DISPATCHERS_NODE_BAMBOO_RUNTIME, runtime_init):
@@ -165,7 +166,9 @@ def test_node_started_loop_is_latest(self):
 
         bamboo_api.get_children_states.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id)
         bamboo_api.get_node_histories.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id, loop=1)
-        dispatcher._get_node_info.assert_not_called()
+        dispatcher._get_node_info.assert_called_once_with(
+            node_id=dispatcher.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
+        )
 
         self.assertEqual(
             node_detail,
@@ -213,7 +216,7 @@ def test_node_started_loop_is_not_latest(self):
         bamboo_api.get_node_histories = MagicMock(return_value=get_node_histories_return)
 
         dispatcher = NodeCommandDispatcher(engine_ver=2, node_id="node_id")
-        dispatcher._get_node_info = MagicMock()
+        dispatcher._get_node_info = MagicMock(return_value={"type": "ServiceActivity"})
         dispatcher._assemble_histroy_detail = MagicMock()
         format_pipeline_status = MagicMock()
 
@@ -230,7 +233,9 @@ def test_node_started_loop_is_not_latest(self):
 
         bamboo_api.get_children_states.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id)
         bamboo_api.get_node_histories.assert_called_once_with(runtime=runtime, node_id=dispatcher.node_id, loop=1)
-        dispatcher._get_node_info.assert_not_called()
+        dispatcher._get_node_info.assert_called_once_with(
+            node_id=dispatcher.node_id, pipeline=pipeline_instance.execution_data, subprocess_stack=subprocess_stack
+        )
         dispatcher._assemble_histroy_detail.assert_called_once()
 
         self.assertEqual(

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 080/112] =?UTF-8?q?optimization:=20=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86/=E4=B8=8B=E6=8B=89=E6=A1=86=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9=E8=B0=83=E6=95=B4&&?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=AD=90=E6=B5=81=E7=A8=8B=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=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)

From 252e319c96b1c49ac87dbb5b72cf9322a406304f Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 7 Sep 2023 19:33:02 +0800
Subject: [PATCH 081/112] =?UTF-8?q?bugfix:=20=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E9=80=89=E5=8F=96=E5=8F=98=E9=87=8F=E6=97=B6=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E7=B4=A7=E6=8C=A8=E7=9D=80=E7=A9=BA=E6=A0=BC=E4=BC=9A=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index 803e33b69e..c11fb6e7cd 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -214,20 +214,29 @@
                 }
             },
             onSelectVal (val) {
-                // 替换内容
-                const { focusNode, anchorOffset, previousElementSibling } = this.selection
-                const divInputDom = this.$el.querySelector('.div-input')
-                const { outerHTML, id } = previousElementSibling || {}
-                const previousDomContent = outerHTML || ''
-                // 光标左边文本内容
-                let matchText = focusNode.data.slice(0, anchorOffset)
-                const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
-                matchText = matchText.split(varRegexp).pop()
-                // 拿到字段最后以$开头的部分
-                matchText = matchText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
-                const focusNodeContent = focusNode.data.slice(0, anchorOffset - matchText.length) + val + focusNode.data.slice(anchorOffset)
-                const replaceContent = previousDomContent + focusNodeContent
-                divInputDom.innerHTML = divInputDom.innerHTML.replace(previousDomContent + focusNode.data, replaceContent)
+                // 获取选定对象
+                const selection = getSelection()
+                // 如果保存的有上次的光标对象
+                if (this.lastEditRange) {
+                    // 清除所有选区
+                    selection.removeAllRanges()
+                    // 添加最后光标还原之前的状态
+                    selection.addRange(this.lastEditRange)
+                }
+                const range = selection.getRangeAt(0)
+                const textNode = range.startContainer
+                const rangeStartOffset = range.startOffset
+                // 匹配光标前内容最后面变量部分
+                const previousText = textNode.textContent.slice(0, rangeStartOffset)
+                const matchText = previousText.replace(/(.*)(\$[^\}]*)/, ($0, $1, $2) => $2)
+                // 需要补全的变量
+                const addText = val.replace(matchText, '')
+                textNode.insertData(rangeStartOffset, addText)
+                range.setStart(textNode, rangeStartOffset + addText.length)
+                // 将选区折叠为一个光标
+                range.collapse(true)
+                selection.removeAllRanges()
+                selection.addRange(range)
                 // 更新表单
                 this.updateInputValue()
                 // 清空/关闭
@@ -235,20 +244,6 @@
                 this.hoverKey = ''
                 this.selection = {}
                 this.input.focus = true
-                // 设置光标在变量后面
-                this.$nextTick(() => {
-                    const selection = window.getSelection()
-                    let previousDom = null
-                    const textNode = Array.from(divInputDom.childNodes).find(item => {
-                        const previousDomMatch = id ? id === previousDom?.id : true
-                        if (previousDomMatch && item.nodeName === '#text' && item.textContent.indexOf(val) > -1) {
-                            return true
-                        }
-                        previousDom = item
-                        return false
-                    })
-                    selection.collapse(textNode, anchorOffset - matchText.length + val.length)
-                })
             },
             // 文本框点击
             handleInputMouseUp (e) {
@@ -311,6 +306,7 @@
                     this.isListOpen = false
                     return
                 }
+                this.lastEditRange = window.getSelection().getRangeAt(0)
                 const offsetText = focusNode.data.substring(0, anchorOffset)
                 const varRegexp = /\s?\${[a-zA-Z_][\w|.]*}\s?/g
                 let matchText = offsetText.split(varRegexp).pop()

From 70865477b8e282cf30f0786d7ccc47b396e2c353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E6=95=B0?=
 <33194175+hanshuaikang@users.noreply.github.com>
Date: Thu, 7 Sep 2023 19:54:14 +0800
Subject: [PATCH 082/112] =?UTF-8?q?minor:=20detail=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81subprocess=5Fsimple=5Finputs=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20(#7053)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* minor: detail 接口支持retry参数

* minor: detail 接口支持subprocess_simple_inputs参数控制是否简化独立子流程的返回

* test: fix 单元测试
---
 gcloud/taskflow3/apis/django/api.py           | 10 +++++++++-
 gcloud/taskflow3/domains/dispatchers/node.py  | 19 ++++++++++++++++---
 gcloud/taskflow3/models.py                    |  2 ++
 gcloud/tasktmpl3/domains/constants.py         |  4 +++-
 .../models/taskflow/test_get_node_detail.py   |  4 +++-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/gcloud/taskflow3/apis/django/api.py b/gcloud/taskflow3/apis/django/api.py
index cf9bce62e1..f670504b11 100644
--- a/gcloud/taskflow3/apis/django/api.py
+++ b/gcloud/taskflow3/apis/django/api.py
@@ -200,6 +200,7 @@ def detail(request, project_id):
     task_id = request.query_params["instance_id"]
     node_id = request.query_params["node_id"]
     loop = request.query_params.get("loop")
+    subprocess_simple_inputs = request.query_params.get("subprocess_simple_inputs") == "true"
     component_code = request.query_params.get("component_code")
     include_data = int(request.query_params.get("include_data", 1))
 
@@ -207,7 +208,14 @@ def detail(request, project_id):
 
     task = TaskFlowInstance.objects.get(pk=task_id, project_id=project_id)
     ctx = task.get_node_detail(
-        node_id, request.user.username, component_code, subprocess_stack, loop, include_data, project_id=project_id
+        node_id,
+        request.user.username,
+        component_code,
+        subprocess_stack,
+        loop,
+        include_data,
+        project_id=project_id,
+        subprocess_simple_inputs=subprocess_simple_inputs,
     )
 
     return JsonResponse(ctx)
diff --git a/gcloud/taskflow3/domains/dispatchers/node.py b/gcloud/taskflow3/domains/dispatchers/node.py
index 36d591b324..ccb81f1966 100644
--- a/gcloud/taskflow3/domains/dispatchers/node.py
+++ b/gcloud/taskflow3/domains/dispatchers/node.py
@@ -504,7 +504,11 @@ def get_node_data_v2(
                 if node_info["type"] == "SubProcess":
                     # remove prefix '${' and subfix '}' in subprocess execution input
                     inputs = {k[2:-1]: v for k, v in data["inputs"].items()}
-                elif node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                elif (
+                    node_info["type"] == "ServiceActivity"
+                    and node_code == "subprocess_plugin"
+                    and kwargs.get("subprocess_simple_inputs")
+                ):
                     raw_inputs = data["inputs"]["subprocess"]["pipeline"]["constants"]
                     inputs = {key[2:-1]: value.get("value") for key, value in raw_inputs.items()}
                 else:
@@ -567,6 +571,7 @@ def get_node_data_v2(
                         subprocess_stack=subprocess_stack,
                         root_pipeline_data=root_pipeline_data,
                         parent_params=root_pipeline_context,
+                        subprocess_simple_inputs=kwargs.get("subprocess_simple_inputs"),
                     )
                 except Exception as e:
                     message = _(f"节点数据请求失败: 请重试, 如多次失败可联系管理员处理. {e} | get_node_data_v2")
@@ -581,7 +586,11 @@ def get_node_data_v2(
                 if node_info["type"] == "SubProcess":
                     # remove prefix '${' and subfix '}' in subprocess execution input
                     inputs = {k[2:-1]: v for k, v in preview_inputs.items()}
-                elif node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                elif (
+                    node_info["type"] == "ServiceActivity"
+                    and node_code == "subprocess_plugin"
+                    and kwargs.get("subprocess_simple_inputs")
+                ):
                     inputs = {k[2:-1]: v for k, v in preview_inputs.items()}
                 else:
                     inputs = preview_inputs
@@ -769,7 +778,11 @@ def get_node_detail_v2(
 
             for hist in detail["histories"]:
                 # 重试记录必然是因为失败才重试
-                if node_info["type"] == "ServiceActivity" and node_code == "subprocess_plugin":
+                if (
+                    node_info["type"] == "ServiceActivity"
+                    and node_code == "subprocess_plugin"
+                    and kwargs.get("subprocess_simple_inputs")
+                ):
                     # 对于独立子流程节点要重新渲染输出
                     raw_inputs = hist["inputs"]["subprocess"]["pipeline"]["constants"]
                     hist["inputs"] = {key[2:-1]: value.get("value") for key, value in raw_inputs.items()}
diff --git a/gcloud/taskflow3/models.py b/gcloud/taskflow3/models.py
index 61f11df366..f62c64a0f7 100644
--- a/gcloud/taskflow3/models.py
+++ b/gcloud/taskflow3/models.py
@@ -958,6 +958,7 @@ def get_node_detail(
                 pipeline_instance=self.pipeline_instance,
                 subprocess_stack=subprocess_stack,
                 project_id=kwargs["project_id"],
+                subprocess_simple_inputs=kwargs.get("subprocess_simple_inputs", False),
             )
             if not node_data_result["result"]:
                 return node_data_result
@@ -969,6 +970,7 @@ def get_node_detail(
             loop=loop,
             pipeline_instance=self.pipeline_instance,
             subprocess_stack=subprocess_stack,
+            subprocess_simple_inputs=kwargs.get("subprocess_simple_inputs", False),
         )
         if not node_detail_result["result"]:
             return node_detail_result
diff --git a/gcloud/tasktmpl3/domains/constants.py b/gcloud/tasktmpl3/domains/constants.py
index 5cb03038d9..a17c4796fb 100644
--- a/gcloud/tasktmpl3/domains/constants.py
+++ b/gcloud/tasktmpl3/domains/constants.py
@@ -81,6 +81,7 @@ def preview_node_inputs(
     subprocess_stack: List[str] = [],
     root_pipeline_data: dict = {},
     parent_params: dict = {},
+    subprocess_simple_inputs: bool = False,
 ):
     def get_need_render_context_keys():
         keys = set()
@@ -130,11 +131,12 @@ def get_need_render_context_keys():
             subprocess_stack=subprocess_stack[1:],
             root_pipeline_data=root_pipeline_data,
             parent_params=formatted_param_data,
+            subprocess_simple_inputs=subprocess_simple_inputs,
         )
 
     if node_type == NodeType.ServiceActivity.value:
         # 如果是独立子流程
-        if node_code == "subprocess_plugin":
+        if node_code == "subprocess_plugin" and subprocess_simple_inputs:
             raw_inputs = pipeline["activities"][node_id]["component"]["inputs"]["subprocess"]["value"]["pipeline"][
                 "constants"
             ]
diff --git a/gcloud/tests/taskflow3/models/taskflow/test_get_node_detail.py b/gcloud/tests/taskflow3/models/taskflow/test_get_node_detail.py
index 8749fa0422..0fa45548fe 100644
--- a/gcloud/tests/taskflow3/models/taskflow/test_get_node_detail.py
+++ b/gcloud/tests/taskflow3/models/taskflow/test_get_node_detail.py
@@ -15,7 +15,6 @@
 
 from gcloud import err_code
 from gcloud.taskflow3.models import TaskFlowInstance
-
 from gcloud.tests.mock import *  # noqa
 from gcloud.tests.mock_settings import *  # noqa
 
@@ -97,6 +96,7 @@ def test_include_data_is_false(self):
             subprocess_stack=subprocess_stack,
             pipeline_instance=taskflow.pipeline_instance,
             loop=loop,
+            subprocess_simple_inputs=False,
         )
         self.assertEqual(detail, {"code": 0, "data": {}, "message": "", "result": True})
 
@@ -138,6 +138,7 @@ def test_success(self):
             pipeline_instance=taskflow.pipeline_instance,
             loop=loop,
             project_id="project_id",
+            subprocess_simple_inputs=False,
         )
         dispatcher.get_node_detail.assert_called_once_with(
             username=username,
@@ -145,6 +146,7 @@ def test_success(self):
             subprocess_stack=subprocess_stack,
             pipeline_instance=taskflow.pipeline_instance,
             loop=loop,
+            subprocess_simple_inputs=False,
         )
         self.assertEqual(
             detail, {"code": 0, "data": {"data": "data", "detail": "detail"}, "message": "", "result": True}

From 9d66586dc6b1ba46dda9ad315e5adde31512730c Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Mon, 11 Sep 2023 16:16:27 +0800
Subject: [PATCH 083/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6=E8=BF=87=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/apis/drf/viewsets/taskflow.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gcloud/core/apis/drf/viewsets/taskflow.py b/gcloud/core/apis/drf/viewsets/taskflow.py
index 62cccd03a1..ebac80c701 100644
--- a/gcloud/core/apis/drf/viewsets/taskflow.py
+++ b/gcloud/core/apis/drf/viewsets/taskflow.py
@@ -474,11 +474,8 @@ def _optimized_my_dynamic_query(queryset, username, limit, offset, create_method
             original_query,
         )
         new_query = re.sub("ORDER BY (.*?) DESC", "ORDER BY `pipeline_pipelineinstance`.`id` DESC", new_query)
-        new_query = new_query.replace(username, f"'{username}'")
-        if create_method:
-            new_query = new_query.replace(create_method, f"'{create_method}'")
         new_query += f" LIMIT {limit} OFFSET {offset}"
-        return TaskFlowInstance.objects.raw(original_query, params)
+        return TaskFlowInstance.objects.raw(new_query, params)
 
     @swagger_auto_schema(
         method="GET",

From e90b01e0dea66ef5941296c916d5b68e8f11815a Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Tue, 12 Sep 2023 11:40:33 +0800
Subject: [PATCH 084/112] minor: release V3.31.0-alpha

---
 app.yml           | 2 +-
 app_desc.yaml     | 2 +-
 config/default.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.yml b/app.yml
index 650371dfe3..2ffdf1ed45 100644
--- a/app.yml
+++ b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.30.0
+version: 3.31.0-alpha
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index 0324f4d24f..7d18656561 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.30.0"
+app_version: "3.31.0-alpha"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index a52b47afcb..8cae0ff5fc 100644
--- a/config/default.py
+++ b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.30.0"
+STATIC_VERSION = "3.31.0-alpha"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]

From 4a1d69604709b754e501b6067c546ace8583d52c Mon Sep 17 00:00:00 2001
From: Luo Fan <44999219+luofann@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:12:57 +0800
Subject: [PATCH 085/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=8F=98=E9=87=8F=E5=80=BC=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98=20(#7068)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bugfix: 修复代码合并导致的密码变量值无法保存的问题

* minor: password tag错误提示换行处理
---
 .../components/common/RenderForm/FormItem.vue | 121 ------------------
 .../common/RenderForm/tags/TagPassword.vue    |   3 +-
 frontend/desktop/src/utils/checkDataType.js   |  11 +-
 3 files changed, 12 insertions(+), 123 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 6fdf0213b0..f4cef9e221 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -413,127 +413,6 @@
 
                 return formValue
             },
-            getDefaultValueFormat () {
-                let valueFormat
-                switch (this.scheme.type) {
-                    case 'input':
-                    case 'textarea':
-                    case 'radio':
-                    case 'text':
-                    case 'datetime':
-                    case 'memberSelector':
-                    case 'logDisplay':
-                    case 'code_editor':
-                    case 'section':
-                        valueFormat = {
-                            type: ['String', 'Number', 'Boolean'],
-                            value: ''
-                        }
-                        break
-                    case 'checkbox':
-                    case 'datatable':
-                    case 'tree':
-                    case 'upload':
-                    case 'cascader':
-                        valueFormat = {
-                            type: 'Array',
-                            value: []
-                        }
-                        break
-                    case 'select':
-                        if (this.scheme.attrs.multiple) {
-                            valueFormat = {
-                                type: 'Array',
-                                value: []
-                            }
-                        } else {
-                            valueFormat = {
-                                type: ['String', 'Number', 'Boolean'],
-                                value: ''
-                            }
-                        }
-                        break
-                    case 'time':
-                        if (this.scheme.attrs.isRange) {
-                            valueFormat = {
-                                type: 'Array',
-                                value: ['00:00:00', '23:59:59']
-                            }
-                        } else {
-                            valueFormat = {
-                                type: 'String',
-                                value: ''
-                            }
-                        }
-                        break
-                    case 'int':
-                        valueFormat = {
-                            type: 'Number',
-                            value: 0
-                        }
-                        break
-                    case 'ip_selector':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                static_ip_table_config: [],
-                                selectors: [],
-                                ip: [],
-                                topo: [],
-                                group: [],
-                                filters: [],
-                                excludes: []
-                            }
-                        }
-                        break
-                    case 'set_allocation':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                config: {
-                                    set_count: 1,
-                                    set_template_id: '',
-                                    host_resources: [],
-                                    module_detail: []
-                                },
-                                data: [],
-                                separator: ','
-                            }
-                        }
-                        break
-                    case 'host_allocation':
-                        valueFormat = {
-                            type: 'Object',
-                            value: {
-                                config: {
-                                    host_count: 0,
-                                    host_screen_value: '',
-                                    host_resources: [],
-                                    host_filter_detail: []
-                                },
-                                data: [],
-                                separator: ','
-                            }
-                        }
-                        break
-                    case 'password':
-                        valueFormat = {
-                            type: ['String', 'Object'],
-                            value: {
-                                type: 'password_value',
-                                tag: 'value',
-                                value: ''
-                            }
-                        }
-                        break
-                    default:
-                        valueFormat = {
-                            type: 'String',
-                            value: ''
-                        }
-                }
-                return valueFormat
-            },
             isRequired () {
                 let required = false
                 if (this.option.showRequired === true && 'validation' in this.scheme.attrs) {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 936b10307d..8f6ec7cd1a 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -52,9 +52,9 @@
             <bk-select v-else class="select-var" :value="localVal.value" @selected="handleSelectVariable">
                 <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.id"></bk-option>
             </bk-select>
-            <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
         </div>
         <span v-else class="rf-view-value">{{(value.password === 'undefined' || value.password === '') ? '--' : '******'}}</span>
+        <div v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</div>
     </div>
 </template>
 <script>
@@ -130,6 +130,7 @@
                         this.localVal = { ...val }
                     } else {
                         this.localVal = {
+                            type: 'password_value',
                             tag: 'value',
                             value: val
                         }
diff --git a/frontend/desktop/src/utils/checkDataType.js b/frontend/desktop/src/utils/checkDataType.js
index 364bc8676c..7479ad369f 100644
--- a/frontend/desktop/src/utils/checkDataType.js
+++ b/frontend/desktop/src/utils/checkDataType.js
@@ -22,7 +22,6 @@ export const getDefaultValueFormat = (scheme) => {
         case 'radio':
         case 'text':
         case 'datetime':
-        case 'password':
         case 'memberSelector':
         case 'logDisplay':
         case 'code_editor':
@@ -118,6 +117,16 @@ export const getDefaultValueFormat = (scheme) => {
                 }
             }
             break
+        case 'password':
+            valueFormat = {
+                type: ['String', 'Object'],
+                value: {
+                    type: 'password_value',
+                    tag: 'value',
+                    value: ''
+                }
+            }
+            break
         default:
             valueFormat = {
                 type: 'String',

From c5b54a8ce0de4ae8bb360b2b9bc227e328b5b2c0 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Mon, 18 Sep 2023 11:25:05 +0800
Subject: [PATCH 086/112] =?UTF-8?q?Horse=E7=89=88=E6=9C=AC=E6=8F=90?=
 =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=20(#7082)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/package.json                 |   2 +-
 .../common/RenderForm/IpSelector/StaticIp.vue |  18 ++--
 .../common/RenderForm/tags/TagDatatable.vue   |   3 +
 .../common/RenderForm/tags/TagInput.vue       |  11 ++
 .../common/RenderForm/tags/TagSelect.vue      |   5 +-
 .../common/RenderForm/tags/TagTextarea.vue    |   1 -
 frontend/desktop/src/config/i18n/cn.js        |   6 +-
 frontend/desktop/src/config/i18n/en.js        |   6 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  10 +-
 .../pages/task/TaskExecute/TaskOperation.vue  |  20 ++--
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |  11 +-
 .../TabGlobalVariables/index.vue              | 100 +++++++++++++++++-
 .../desktop/src/store/modules/taskList.js     |   2 +-
 13 files changed, 162 insertions(+), 33 deletions(-)

diff --git a/frontend/desktop/package.json b/frontend/desktop/package.json
index 7059bbabf8..b9cfec0a97 100644
--- a/frontend/desktop/package.json
+++ b/frontend/desktop/package.json
@@ -19,7 +19,7 @@
     "ajv": "^6.10.2",
     "art-template": "^4.13.0",
     "axios": "^0.18.0",
-    "bk-magic-vue": "2.5.7",
+    "bk-magic-vue": "2.5.8-beta.10",
     "cron-parser-custom": "^2.13.0",
     "dom-to-image": "^2.6.0",
     "element-ui": "^2.4.1",
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
index b821b6e476..4601d5ebf3 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
@@ -62,7 +62,7 @@
                         <span class="total-ip">{{staticIps.length}}</span>
                         {{$t('个静态IP，')}}
                         {{$t('其中')}}
-                        <span class="total-not-installed">{{failedAgentLength}}</span>
+                        <span class="total-not-installed">{{abnormalLength}}</span>
                         {{$t('个')}}{{$t('异常')}}
                     </div>
                     <div class="table-pagination" v-if="isPaginationShow">
@@ -138,27 +138,27 @@
                 operations: [
                     {
                         type: 'copyIp',
-                        name: this.$t('复制IP')
+                        name: this.$t('复制所有IP')
                     },
                     {
                         type: 'copyAgentIp',
-                        name: this.$t('复制Agent异常IP')
+                        name: this.$t('复制异常IP')
                     },
                     {
                         type: 'clearIp',
-                        name: this.$t('清空IP')
+                        name: this.$t('清除所有IP')
                     },
                     {
                         type: 'clearFailedAgentIp',
-                        name: this.$t('清空Agent异常IP')
+                        name: this.$t('清除异常IP')
                     }
                 ],
                 isUnfold: false
             }
         },
         computed: {
-            failedAgentLength () {
-                return this.staticIps.filter(item => item.agent !== 1).length
+            abnormalLength () {
+                return this.staticIps.filter(item => item.agent !== 1 || item.diff).length
             },
             isShowQuantity () {
                 return this.staticIps.length
@@ -224,14 +224,14 @@
                 this.handleIpCopy(ipStr)
             },
             copyAgentIp () {
-                const ipStr = this.staticIps.filter(item => item.agent !== 1).map(d => d.bk_host_innerip).join(',')
+                const ipStr = this.staticIps.filter(item => item.agent !== 1 || item.diff).map(d => d.bk_host_innerip).join(',')
                 this.handleIpCopy(ipStr)
             },
             clearIp () {
                 this.$emit('change', [])
             },
             clearFailedAgentIp () {
-                const staticIps = this.staticIps.filter(item => item.agent === 1)
+                const staticIps = this.staticIps.filter(item => item.agent === 1 && !item.diff)
                 this.$emit('change', staticIps)
             },
             onDropdownShow () {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
index 0ea003e782..1696ec01fb 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
@@ -693,4 +693,7 @@
         white-space: nowrap;
         cursor: pointer;
     }
+    /deep/.rf-tag-form {
+        margin-left: 0 !important;
+    }
 </style>
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index c11fb6e7cd..b70ea3411e 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -183,6 +183,17 @@
                 } else {
                     this.handleInputBlur()
                 }
+            },
+            formMode (val) {
+                if (val) {
+                    this.$nextTick(() => {
+                        const divInputDom = this.$el.querySelector('.div-input')
+                        divInputDom.innerHTML = this.value
+                        this.handleInputBlur()
+                    })
+                } else {
+                    this.validate()
+                }
             }
         },
         created () {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagSelect.vue
index ce743986c0..0728550f46 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">{{ value || '--' }}</span>
+        <span v-else class="rf-view-value">{{ viewValue || '--' }}</span>
     </div>
 </template>
 <script>
@@ -252,6 +252,9 @@
                 }
             },
             viewValue () {
+                if (Object.prototype.toString.call(this.value) === '[object object]') {
+                    return this.value
+                }
                 if (Array.isArray(this.seletedValue)) { // 多选
                     if (!this.seletedValue.length) {
                         return '--'
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 34164ec78f..9688e43751 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -534,7 +534,6 @@
     }
     /deep/.div-input {
         >div {
-            height: 18px;
             width: 100%;
         }
     }
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index e2b63f0f06..dbe62c51bd 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1768,7 +1768,11 @@ const cn = {
     '确定重试节点【n】 ？': '确定重试节点【{n}】 ？',
     '非根节点仅支持以原参数进行重试': '非根节点仅支持以原参数进行重试',
     'password_手动输入': '手动输入',
-    'password_使用密码变量': '使用密码变量'
+    'password_使用密码变量': '使用密码变量',
+    '复制所有IP': '复制所有IP',
+    '复制异常IP': '复制异常IP',
+    '清除所有IP': '清除所有IP',
+    '清除异常IP': '清除异常IP'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 71bc404eec..6540a6673f 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1802,7 +1802,11 @@ const en = {
     '确定重试节点【n】 ？': 'Retry this node [ {n} ] ？',
     '非根节点仅支持以原参数进行重试': 'Non-root nodes only support retrying with the original parameters.',
     'password_手动输入': 'custom input',
-    'password_使用密码变量': 'use password var.'
+    'password_使用密码变量': 'use password var.',
+    '复制所有IP': 'Copy all IPs',
+    '复制异常IP': 'Copy abnormal IP',
+    '清除所有IP': 'Clear all IPs',
+    '清除异常IP': 'Clear abnormal IP'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 2d454057ae..d654c1de1a 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -177,7 +177,7 @@
                             v-else-if="nodeDetailConfig.component_code === 'bk_approve'"
                             theme="primary"
                             data-test-id="taskExecute_form_approvalBtn"
-                            @click="$emit('onApprovalClick', nodeDetailConfig.node_id)">
+                            @click="onApprovalClick">
                             {{ $t('审批') }}
                         </bk-button>
                         <bk-button
@@ -428,9 +428,6 @@
             nodeActivity () {
                 return this.pipelineData.activities[this.nodeDetailConfig.node_id]
             },
-            componentValue () {
-                return this.isSubProcessNode ? this.nodeActivity.component.data.subprocess.value : {}
-            },
             isExecuteTimeShow () {
                 return ['record', 'log'].includes(this.curActiveTab) && (this.loop > 1 || this.historyInfo.length > 1)
             },
@@ -677,7 +674,7 @@
                 $.context.output_form.state = state
                 // 获取子流程配置详情
                 if (componentCode === 'subprocess_plugin' || this.isLegacySubProcess) {
-                    const { constants } = this.isLegacySubProcess ? this.pipelineData : this.componentValue.pipeline
+                    const { constants } = this.subProcessPipeline
                     const renderConfig = await this.getSubflowInputsConfig(constants)
                     const keys = Object.keys(inputs)
                     this.renderConfig = renderConfig.filter(item => keys.includes(item.tag_code))
@@ -1428,6 +1425,9 @@
             onResumeClick () {
                 this.$emit('onTaskNodeResumeClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
+            onApprovalClick () {
+                this.$emit('onApprovalClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
+            },
             onModifyTimeClick () {
                 this.$emit('onModifyTimeClick', this.nodeDetailConfig.node_id, this.subProcessTaskId)
             },
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index ffeb8564ec..70c54091e3 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -1299,8 +1299,9 @@
                     }
                 })
             },
-            onApprovalClick (id) {
+            onApprovalClick (id, taskId) {
                 this.approval.id = id
+                this.subProcessTaskId = taskId
                 this.approval.dialogShow = true
             },
             onApprovalConfirm () {
@@ -1316,17 +1317,16 @@
                             is_passed,
                             message,
                             project_id: this.project_id,
-                            task_id: this.instance_id,
+                            task_id: this.subProcessTaskId || this.instance_id,
                             node_id: id
                         }
-                        if (!this.isTopTask) {
-                            const selectedFlowIds = this.selectedFlowPath.reduce((acc, cur) => {
-                                if (cur.type !== 'root') {
-                                    acc = acc ? acc + ',' + cur.id : cur.id
-                                }
-                                return acc
-                            }, '')
-                            params.subprocess_id = selectedFlowIds
+                        // 如果存在子流程任务节点时则不需要传subprocess_id
+                        if (!this.subProcessTaskId) {
+                            let { subprocess_stack: stack } = this.nodeDetailConfig
+                            if (stack) {
+                                stack = JSON.parse(stack)
+                                params.subprocess_id = stack.join(',')
+                            }
                         }
                         await this.itsmTransition(params)
                         this.approval.id = ''
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index dffff209a9..d6ecfeb2d5 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1281,11 +1281,18 @@
                     const { activities, conditions, constants } = this.variableCited[key]
                     const citedNum = activities.length + conditions.length + constants.length
                     if (citedNum <= 1) {
-                        // 直接删除引用量为1变量
-                        this.deleteUnhookingVar()
+                        // 切换插件/切换版本/更新子流程时直接删除引用量为1变量
+                        if (this.isUpdateConstants) {
+                            this.deleteUnhookingVar()
+                        } else {
+                            this.isCancelGloVarDialogShow = true
+                        }
                     } else {
+                        // 当变量来源为0时，自动删除变量
                         if (sourceInfo[id].length <= 1) {
                             this.$delete(sourceInfo, id)
+                            this.deleteUnhookingVar()
+                            return
                         } else {
                             let atomIndex
                             sourceInfo[id].some((item, index) => {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index 0b2d8a277a..562791e853 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -12,7 +12,7 @@
 <template>
     <bk-sideslider
         :is-show="true"
-        :width="800"
+        :width="sideWidth"
         :quick-close="true"
         :before-close="closeTab">
         <div class="setting-header" slot="header">
@@ -71,6 +71,13 @@
             </div>
         </div>
         <div class="global-variable-panel" slot="content">
+            <!--可拖拽-->
+            <template v-if="variableData">
+                <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
+                <i :class="['resize-proxy', 'left']" ref="resizeProxy"></i>
+                <div class="resize-mask" ref="resizeMask"></div>
+            </template>
+
             <div v-show="!variableData" :class="{ 'is-hidden': variableData }">
                 <div class="add-variable">
                     <bk-button
@@ -280,6 +287,7 @@
                 }
             ]
             return {
+                sideWidth: 800, // 侧栏宽度
                 isHideSystemVar: false,
                 variableList: [], // 变量列表，包含系统内置变量和用户变量
                 cloneVariableList: [],
@@ -656,6 +664,7 @@
             // 关闭变量编辑面板
             closeEditingPanel () {
                 this.variableData = null
+                this.sideWidth = 800
             },
             // 关闭全局变量侧滑
             closeTab () {
@@ -687,6 +696,37 @@
             },
             setNewCloneKeys (key) {
                 this.newCloneKeys = [key]
+            },
+            handleMousedown (event) {
+                this.updateResizeMaskStyle()
+                this.updateResizeProxyStyle()
+                document.addEventListener('mousemove', this.handleMouseMove)
+                document.addEventListener('mouseup', this.handleMouseUp)
+            },
+            handleMouseMove (event) {
+                let width = window.innerWidth - event.clientX
+                width = width > 800 ? width : 800
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.right = `${width}px`
+            },
+            updateResizeMaskStyle () {
+                const resizeMask = this.$refs.resizeMask
+                resizeMask.style.display = 'block'
+                resizeMask.style.cursor = 'col-resize'
+            },
+            updateResizeProxyStyle () {
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'visible'
+                resizeProxy.style.right = `${this.sideWidth}px`
+            },
+            handleMouseUp () {
+                const resizeMask = this.$refs.resizeMask
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'hidden'
+                resizeMask.style.display = 'none'
+                this.sideWidth = resizeProxy.style.right
+                document.removeEventListener('mousemove', this.handleMouseMove)
+                document.removeEventListener('mouseup', this.handleMouseUp)
             }
         }
     }
@@ -742,8 +782,66 @@
 /deep/.bk-sideslider-content {
     height: calc(100% - 60px);
 }
+
+/deep/.bk-sideslider-wrapper {
+    overflow: initial;
+}
 .global-variable-panel {
     height: 100%;
+    
+    .resize-trigger {
+        width: 5px;
+        height: calc(100vh - 109px);
+        position: absolute;
+        left: 0;
+        top: 60px;
+        cursor: col-resize;
+        z-index: 3;
+        &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            bottom: 0;
+            width: 1px;
+            background-color: #dcdee5;
+        }
+        &::after {
+            content: "";
+            position: absolute;
+            top: 50%;
+            right: -1px;
+            width: 2px;
+            height: 2px;
+            color: #979ba5;
+            transform: translate3d(0,-50%,0);
+            background: currentColor;
+            box-shadow: 0 4px 0 0 currentColor,0 8px 0 0 currentColor,0 -4px 0 0 currentColor,0 -8px 0 0 currentColor;
+        }
+        &:hover::before {
+            background-color: #3a84ff;
+        }
+    }
+    .resize-proxy {
+        visibility: hidden;
+        position: absolute;
+        pointer-events: none;
+        z-index: 9999;
+        &.left {
+            top: 0;
+            height: 100%;
+            border-left: 1px dashed #3a84ff;
+        }
+    }
+    .resize-mask {
+        display: none;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 9999;
+    }
     .is-hidden {
         transform: scale(0)
     }
diff --git a/frontend/desktop/src/store/modules/taskList.js b/frontend/desktop/src/store/modules/taskList.js
index 7c476d7925..383492154f 100644
--- a/frontend/desktop/src/store/modules/taskList.js
+++ b/frontend/desktop/src/store/modules/taskList.js
@@ -28,7 +28,7 @@ const taskList = {
             return axios.get('api/v3/taskflow/', { params, ...config }).then(response => response.data.data)
         },
         deleteTask ({ commit }, task_id) {
-            return axios.delete(`api/v3/taskflow/${task_id}/`).then(response => response.data.objects)
+            return axios.delete(`api/v3/taskflow/${task_id}/`).then(response => response.data)
         },
         cloneTask ({ commit }, data) {
             const { task_id, name } = data

From ad944aaefb56ff4219f411f6508ac460a37b4327 Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Thu, 14 Sep 2023 11:49:54 +0800
Subject: [PATCH 087/112] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E6=8E=A5=E5=8F=A3=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6=E8=BF=87=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sites/open/cmdb/var_cmdb_set_module_ip_selector.py         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py b/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
index 843bdbaff2..3df33d7d70 100644
--- a/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
+++ b/pipeline_plugins/variables/collections/sites/open/cmdb/var_cmdb_set_module_ip_selector.py
@@ -383,7 +383,8 @@ def get_ip_result_by_input_method(
         select_method[module_input_method],
     )
     if isinstance(selected_set_names, str):
-        selected_set_names = selected_set_names.split(",")
+        # 去除两端的空格
+        selected_set_names = [selected_set_name.strip() for selected_set_name in selected_set_names.split(",")]
     if isinstance(selected_service_template_names, str):
         selected_service_template_names = selected_service_template_names.split(",")
 

From 6e362b6aa43fe5c6a8ed5a1f5eeca3218af19820 Mon Sep 17 00:00:00 2001
From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com>
Date: Mon, 18 Sep 2023 17:44:19 +0800
Subject: [PATCH 088/112] =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8B=BE=E9=80=89/?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E9=80=BB=E8=BE=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D&&=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9=20(#7084)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/FormGroup.vue           |  2 +-
 .../components/common/RenderForm/FormItem.vue |  2 +-
 frontend/desktop/src/config/i18n/cn.js        | 15 ++++++++---
 frontend/desktop/src/config/i18n/en.js        | 17 ++++++++++---
 .../src/pages/task/TaskCreate/TaskScheme.vue  |  3 ++-
 .../TemplateEdit/NodeConfig/NodeConfig.vue    | 25 ++++++++++++++-----
 .../TemplateEdit/NodeConfig/OutputParams.vue  |  2 +-
 7 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index c384bd4016..f8c993d611 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -104,7 +104,7 @@
             <i
                 :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                 v-bk-tooltips="{
-                    content: hook ? $t('取消变量引用') : $t('设置为变量'),
+                    content: hook ? $t('恢复为非变量节点内维护') : $t('转换为变量集中维护'),
                     placement: 'bottom',
                     zIndex: 3000
                 }"
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index f4cef9e221..574d05734d 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -132,7 +132,7 @@
                 <i
                     :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                     v-bk-tooltips="{
-                        content: hook ? $t('取消变量引用') : $t('设置为变量'),
+                        content: hook ? $t('恢复为非变量节点内维护') : $t('转换为变量集中维护'),
                         placement: 'bottom',
                         zIndex: 3000
                     }"
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index dbe62c51bd..1697342335 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1405,9 +1405,18 @@ const cn = {
     '变量豁免': '变量豁免',
     '取消变量引用': '取消变量引用',
     '变量引用': '变量引用',
-    '设置为变量&变量免渲染使用指引': '设置为变量&变量免渲染使用指引',
-    '设置为变量：将节点的输入或输出设置为全局变量，可供其他节点使用': '设置为变量：将节点的输入或输出设置为全局变量，可供其他节点使用',
-    '变量免渲染：忽略参数中的全局变量，将${}视为普通字符串': '变量免渲染：忽略参数中的全局变量，将${}视为普通字符串',
+    '转换为变量和恢复为非变量使用说明': '转换为变量和恢复为非变量使用说明',
+    '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用': '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用',
+    '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护': '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护',
+    '当所有使用该变量的参数恢复为节点内维护，则自动删除变量': '当所有使用该变量的参数恢复为节点内维护，则自动删除变量',
+    '接收输出和取消接收使用说明': '接收输出和取消接收使用说明',
+    '自动创建一个节点输出类型变量来接收任务执行时节点的输出': '自动创建一个节点输出类型变量来接收任务执行时节点的输出',
+    '后续节点可引用变量来获取该节点的输出': '后续节点可引用变量来获取该节点的输出',
+    '取消接收输出则自动删除变量': '取消接收输出则自动删除变量',
+    '转换为变量集中维护': '转换为变量集中维护',
+    '恢复为非变量节点内维护': '恢复为非变量节点内维护',
+    '使用变量接收输出': '使用变量接收输出',
+    '取消接收输出': '取消接收输出',
     '流程当前被使用中，无法删除': '流程当前被使用中，无法删除',
     '以下情况参数值无法复用，将使用全局变量的默认值：': '以下情况参数值无法复用，将使用全局变量的默认值：',
     '变量的类型变更': '变量的类型变更',
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 6540a6673f..b2153d53b0 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1415,7 +1415,7 @@ const en = {
     '返回编辑': 'Back To Edit',
     '周期任务根据创建时的流程和执行方案数据生成快照保存，流程变更后不影响周期任务，可手动更新到使用流程最新数据。': 'Cron tasks generate snapshots and save according to the flow and node-group data at the time of creation. After the flow is changed, it does not affect the cron tasks, and can be manually updated to use the latest version of the flow.',
     '不使用执行方案': 'Don\'t use node-group',
-    '当前流程非最新，执行方案不可更改，请先更新流程': '当前流程非最新，执行方案不可更改，请先更新流程',
+    '当前流程非最新，执行方案不可更改，请先更新流程': 'The current flow is not the latest version and the step-group  cannot be modified. Please update the flow first.',
     '执行代理人在任务开始执行时确定，未执行任务不展示': 'The agent is determined when the task starts to execute, and the unexecuted task will not be displayed',
     '计划任务在执行时获取最新的流程和执行方案数据创建任务，流程和方案变更将影响未执行的计划任务，如增加参数可能导致计划任务启动失败。': 'When a scheduled task is executed, it get the latest version from the flow and node-group  to create a task. Changes to the flow and plan will affect the unexecuted scheduled task. For example, adding parameters may cause the scheduled task to fail to start.',
     '未能重用': 'Failed to reuse',
@@ -1443,9 +1443,18 @@ const en = {
     '变量豁免': 'Variable exemption',
     '取消变量引用': 'Unlink Variable',
     '变量引用': 'Variable Used',
-    '设置为变量&变量免渲染使用指引': 'User manual  for set as a variable & variable rendering-free',
-    '设置为变量：将节点的输入或输出设置为全局变量，可供其他节点使用': "Set as variable: Set the node's input or output as a global variable that can be used by other nodes",
-    '变量免渲染：忽略参数中的全局变量，将${}视为普通字符串': 'Variable-free rendering: ignore global variables in parameters, treat ${} as a normal string',
+    '转换为变量和恢复为非变量使用说明': 'Instructions for converting to variable and restoring to non-variable',
+    '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用': "Create a variable of the corresponding component type using the node's parameter, If a variable of the same type already exists, it can be used directly. ",
+    '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护': 'By using this conversion, the same configuration item of multiple nodes can be unified and maintained centrally using variable.',
+    '当所有使用该变量的参数恢复为节点内维护，则自动删除变量': 'When all parameters using this variable are restored to node-internal maintenance, it will automatically delete the variable.',
+    '接收输出和取消接收使用说明': 'Instructions for receiving output and canceling receive output',
+    '自动创建一个节点输出类型变量来接收任务执行时节点的输出': 'Automatically create a node output type variable to receive the output of the node during task execution.',
+    '后续节点可引用变量来获取该节点的输出': 'Subsequent nodes can reference the variable to get the output of the node.',
+    '取消接收输出则自动删除变量': 'Canceling receive output will automatically delete the variable.',
+    '转换为变量集中维护': 'Convert to variable for centralized maintenance',
+    '恢复为非变量节点内维护': 'Restore to non-variable for node-internal maintenance',
+    '使用变量接收输出': 'Use variable to receive output',
+    '取消接收输出': 'Cancel receiving output',
     '流程当前被使用中，无法删除': 'The flow is being used and can not be deleted',
     '以下情况参数值无法复用，将使用全局变量的默认值：': 'The parameter value cannot be reused in the following cases, and the global variable default value is used:',
     '变量的类型变更': 'Variable type change',
diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
index d1dc2b359c..ae4224ccb7 100644
--- a/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
+++ b/frontend/desktop/src/pages/task/TaskCreate/TaskScheme.vue
@@ -166,7 +166,8 @@
             async initLoad () {
                 try {
                     await this.loadDefaultSchemeList()
-                    this.loadSchemeList()
+                    await this.loadSchemeList()
+                    this.showPanel = !!this.schemeList.length
                 } catch (error) {
                     console.warn(error)
                 }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index d6ecfeb2d5..a424be7117 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -202,12 +202,13 @@
                                         </i>
                                     </h3>
                                     <p class="citations-waivers-guide">
-                                        <bk-popover placement="top-end" theme="light" width="258" :ext-cls="'citations-waivers-guide-tip'">
+                                        <bk-popover placement="top-end" theme="light" width="350" :ext-cls="'citations-waivers-guide-tip'">
                                             <i class="bk-icon icon-info-circle-shape"></i>
-                                            {{ $t('设置为变量&变量免渲染使用指引') }}
+                                            {{ $t('转换为变量和恢复为非变量使用说明') }}
                                             <div slot="content">
-                                                <p>{{ $t('设置为变量：将节点的输入或输出设置为全局变量，可供其他节点使用') }}</p><br>
-                                                <p>{{ $t('变量免渲染：忽略参数中的全局变量，将${}视为普通字符串') }}</p>
+                                                <p>{{ $t('利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用') }}</p><br>
+                                                <p>{{ $t('使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护') }}</p><br>
+                                                <p>{{ $t('当所有使用该变量的参数恢复为节点内维护，则自动删除变量') }}</p>
                                             </div>
                                         </bk-popover>
                                     </p>
@@ -250,6 +251,17 @@
                                 <!-- 输出参数 -->
                                 <section class="config-section" data-test-id="templateEdit_form_outputParamsInfo">
                                     <h3>{{$t('输出参数')}}</h3>
+                                    <p class="citations-waivers-guide">
+                                        <bk-popover placement="top-end" theme="light" width="350" :ext-cls="'citations-waivers-guide-tip'">
+                                            <i class="bk-icon icon-info-circle-shape"></i>
+                                            {{ $t('接收输出和取消接收使用说明') }}
+                                            <div slot="content">
+                                                <p>{{ $t('自动创建一个节点输出类型变量来接收任务执行时节点的输出') }}</p><br>
+                                                <p>{{ $t('后续节点可引用变量来获取该节点的输出') }}</p><br>
+                                                <p>{{ $t('取消接收输出则自动删除变量') }}</p>
+                                            </div>
+                                        </bk-popover>
+                                    </p>
                                     <div class="outputs-wrapper" v-bkloading="{ isLoading: outputLoading, zIndex: 100 }">
                                         <template v-if="!outputLoading">
                                             <output-params
@@ -1291,8 +1303,6 @@
                         // 当变量来源为0时，自动删除变量
                         if (sourceInfo[id].length <= 1) {
                             this.$delete(sourceInfo, id)
-                            this.deleteUnhookingVar()
-                            return
                         } else {
                             let atomIndex
                             sourceInfo[id].some((item, index) => {
@@ -1303,6 +1313,9 @@
                             })
                             sourceInfo[id].splice(atomIndex, 1)
                         }
+                        if (Object.keys(sourceInfo).length === 0) {
+                            this.$delete(this.localConstants, key)
+                        }
                         const refDom = source === 'input' ? this.$refs.inputParams : this.$refs.outputParams
                         refDom && refDom.setFormData({ ...this.unhookingVarForm })
                     }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index cc01a3e58e..4458d2c597 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -32,7 +32,7 @@
                                 disabled: isViewMode || !hook
                             }]"
                             v-bk-tooltips="{
-                                content: props.row.hooked ? $t('取消变量引用') : $t('设置为变量'),
+                                content: props.row.hooked ? $t('取消接收输出') : $t('使用变量接收输出'),
                                 placement: 'bottom',
                                 zIndex: 3000
                             }"

From f088ac5d82794245fba7689769d9c073e4779d13 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Tue, 19 Sep 2023 10:44:07 +0800
Subject: [PATCH 089/112] =?UTF-8?q?minor:=20=E5=8F=98=E9=87=8F=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=8F=8F=E8=BF=B0=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/config/i18n/cn.js        | 17 ++++++++-----
 frontend/desktop/src/config/i18n/en.js        | 25 +++++++++++--------
 .../TemplateEdit/NodeConfig/NodeConfig.vue    | 12 ++++-----
 .../TemplateEdit/NodeConfig/OutputParams.vue  |  2 +-
 .../NodeConfig/ReuseVarDialog.vue             | 10 ++++----
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 1697342335..a074432e14 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1406,17 +1406,22 @@ const cn = {
     '取消变量引用': '取消变量引用',
     '变量引用': '变量引用',
     '转换为变量和恢复为非变量使用说明': '转换为变量和恢复为非变量使用说明',
-    '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用': '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用',
-    '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护': '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护',
-    '当所有使用该变量的参数恢复为节点内维护，则自动删除变量': '当所有使用该变量的参数恢复为节点内维护，则自动删除变量',
+    '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量',
+    '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护',
+    '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量',
     '接收输出和取消接收使用说明': '接收输出和取消接收使用说明',
-    '自动创建一个节点输出类型变量来接收任务执行时节点的输出': '自动创建一个节点输出类型变量来接收任务执行时节点的输出',
-    '后续节点可引用变量来获取该节点的输出': '后续节点可引用变量来获取该节点的输出',
-    '取消接收输出则自动删除变量': '取消接收输出则自动删除变量',
+    '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出',
+    '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出',
+    '如何删除：取消接收输出则自动删除变量': '如何删除：取消接收输出则自动删除变量',
     '转换为变量集中维护': '转换为变量集中维护',
     '恢复为非变量节点内维护': '恢复为非变量节点内维护',
     '使用变量接收输出': '使用变量接收输出',
     '取消接收输出': '取消接收输出',
+    '转换为变量': '转换为变量',
+    '转换方式': '转换方式',
+    'varDialog_新建变量': '新建变量',
+    '使用已有变量': '使用已有变量',
+    'varDialog_选择变量': '选择变量',
     '流程当前被使用中，无法删除': '流程当前被使用中，无法删除',
     '以下情况参数值无法复用，将使用全局变量的默认值：': '以下情况参数值无法复用，将使用全局变量的默认值：',
     '变量的类型变更': '变量的类型变更',
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index b2153d53b0..cfceb6aa38 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1444,17 +1444,22 @@ const en = {
     '取消变量引用': 'Unlink Variable',
     '变量引用': 'Variable Used',
     '转换为变量和恢复为非变量使用说明': 'Instructions for converting to variable and restoring to non-variable',
-    '利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用': "Create a variable of the corresponding component type using the node's parameter, If a variable of the same type already exists, it can be used directly. ",
-    '使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护': 'By using this conversion, the same configuration item of multiple nodes can be unified and maintained centrally using variable.',
-    '当所有使用该变量的参数恢复为节点内维护，则自动删除变量': 'When all parameters using this variable are restored to node-internal maintenance, it will automatically delete the variable.',
+    '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': "How it works:  Create a variable of the corresponding component type using the node's parameter. For example, if a parameter is a dropdown list component, a dropdown list variable will be created.",
+    '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': 'How to use:  The variable created during conversion will be automatically referenced, or an existing variable of the same component type created by another node can be reused. This enables the centralized maintenance of the same configuration item of multiple nodes using variables.',
+    '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': 'How to delete:  When all parameters using this variable are restored to node-internal maintenance, the variable will be automatically deleted.',
     '接收输出和取消接收使用说明': 'Instructions for receiving output and canceling receive output',
-    '自动创建一个节点输出类型变量来接收任务执行时节点的输出': 'Automatically create a node output type variable to receive the output of the node during task execution.',
-    '后续节点可引用变量来获取该节点的输出': 'Subsequent nodes can reference the variable to get the output of the node.',
-    '取消接收输出则自动删除变量': 'Canceling receive output will automatically delete the variable.',
-    '转换为变量集中维护': 'Convert to variable for centralized maintenance',
-    '恢复为非变量节点内维护': 'Restore to non-variable for node-internal maintenance',
-    '使用变量接收输出': 'Use variable to receive output',
-    '取消接收输出': 'Cancel receiving output',
+    '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': 'How it works:  Automatically create a node output type variable to receive the output of the node during task execution.',
+    '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': 'How to use:  Subsequent nodes can reference the variable to get the output of the node.',
+    '如何删除：取消接收输出则自动删除变量': 'How to delete:  Canceling receive output will automatically delete the variable.',
+    '转换为变量集中维护': 'Convert to Variable for Centralized Maintenance',
+    '恢复为非变量节点内维护': 'Restore to Non-variable for Node-internal Maintenance',
+    '使用变量接收输出': 'Use Variable to Receive Output',
+    '取消接收输出': 'Cancel Receiving Output',
+    '转换为变量': 'Convert to Variable',
+    '转换方式': 'Conversion Method',
+    'varDialog_新建变量': 'New Variable',
+    '使用已有变量': 'Using existing variables',
+    'varDialog_选择变量': 'Variable',
     '流程当前被使用中，无法删除': 'The flow is being used and can not be deleted',
     '以下情况参数值无法复用，将使用全局变量的默认值：': 'The parameter value cannot be reused in the following cases, and the global variable default value is used:',
     '变量的类型变更': 'Variable type change',
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index a424be7117..af722ea391 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -206,9 +206,9 @@
                                             <i class="bk-icon icon-info-circle-shape"></i>
                                             {{ $t('转换为变量和恢复为非变量使用说明') }}
                                             <div slot="content">
-                                                <p>{{ $t('利用节点的参数创建一个对应组件类型的变量，如已存在该类型变量则可直接使用') }}</p><br>
-                                                <p>{{ $t('使用这种转换，可将多个节点的同一配置项统一起来，利用变量集中维护') }}</p><br>
-                                                <p>{{ $t('当所有使用该变量的参数恢复为节点内维护，则自动删除变量') }}</p>
+                                                <p>{{ $t('如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量') }}</p><br>
+                                                <p>{{ $t('如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护') }}</p><br>
+                                                <p>{{ $t('如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量') }}</p>
                                             </div>
                                         </bk-popover>
                                     </p>
@@ -256,9 +256,9 @@
                                             <i class="bk-icon icon-info-circle-shape"></i>
                                             {{ $t('接收输出和取消接收使用说明') }}
                                             <div slot="content">
-                                                <p>{{ $t('自动创建一个节点输出类型变量来接收任务执行时节点的输出') }}</p><br>
-                                                <p>{{ $t('后续节点可引用变量来获取该节点的输出') }}</p><br>
-                                                <p>{{ $t('取消接收输出则自动删除变量') }}</p>
+                                                <p>{{ $t('如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出') }}</p><br>
+                                                <p>{{ $t('如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出') }}</p><br>
+                                                <p>{{ $t('如何删除：取消接收输出则自动删除变量') }}</p>
                                             </div>
                                         </bk-popover>
                                     </p>
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index 4458d2c597..ebdd9c6c5a 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -48,7 +48,7 @@
             :mask-close="false"
             :render-directive="'if'"
             :header-position="'left'"
-            :title="$t('新建变量')"
+            :title="$t('使用变量接收输出')"
             :auto-close="false"
             :value="isShow"
             width="600"
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
index 8e3460bbc8..3d7aa29b0f 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/ReuseVarDialog.vue
@@ -16,7 +16,7 @@
         :mask-close="false"
         :render-directive="'if'"
         :header-position="'left'"
-        :title="$t('变量配置')"
+        :title="$t('转换为变量')"
         :auto-close="false"
         :value="isShow"
         width="600"
@@ -34,17 +34,17 @@
                 ref="form"
                 :model="formData"
                 :rules="rules">
-                <bk-form-item :label="$t('创建方式')">
+                <bk-form-item :label="$t('转换方式')">
                     <bk-select
                         v-model="createMethod"
                         :clearable="false"
                         @selected="handleCreateMethodChange">
                         <bk-option v-if="!sameKeyExist" id="autoCreate" :name="$t('自动创建')"></bk-option>
-                        <bk-option v-if="variables.length > 0" id="reuse" :name="$t('变量复用')"></bk-option>
-                        <bk-option id="manualCreate" :name="$t('手动创建')"></bk-option>
+                        <bk-option v-if="variables.length > 0" id="reuse" :name="$t('使用已有变量')"></bk-option>
+                        <bk-option id="manualCreate" :name="$t('varDialog_新建变量')"></bk-option>
                     </bk-select>
                 </bk-form-item>
-                <bk-form-item v-if="createMethod === 'reuse'" :label="$t('复用变量')" property="reused">
+                <bk-form-item v-if="createMethod === 'reuse'" :label="$t('varDialog_选择变量')" property="reused">
                     <bk-select
                         v-model="formData.reused"
                         :popover-options="{ appendTo: 'parent' }"

From 788d965ce4113fd43ae6ee28d2601bd7a437735c Mon Sep 17 00:00:00 2001
From: hanshuaikang <1758504262@qq.com>
Date: Fri, 15 Sep 2023 16:39:26 +0800
Subject: [PATCH 090/112] =?UTF-8?q?bugfix:=20=E7=9B=91=E6=8E=A7(=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E5=B1=8F=E8=94=BD=E8=8C=83=E5=9B=B4)=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81ipv6=E5=92=8Cipv4=E4=B8=BB=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collections/sites/open/monitor/base.py    | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pipeline_plugins/components/collections/sites/open/monitor/base.py b/pipeline_plugins/components/collections/sites/open/monitor/base.py
index a37fd45581..aa06985350 100644
--- a/pipeline_plugins/components/collections/sites/open/monitor/base.py
+++ b/pipeline_plugins/components/collections/sites/open/monitor/base.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import ipaddress
 from functools import partial
 
 from django.conf import settings
@@ -37,21 +38,46 @@ def build_request_body(self, begin_time, bk_biz_id, shied_type, dimension_config
     def get_ip_dimension_config(self, scope_value, bk_biz_id, username):
         ip_list = scope_value.split(",")
         if settings.ENABLE_IPV6:
-            hosts = cmdb.get_business_host_ipv6(
+            # 开启了IPV6 要同时查ipv6和ipv4
+            ipv4_list = []
+            ipv6_list = []
+
+            for ip in ip_list:
+                p_address = ipaddress.ip_address(ip)
+                if p_address.version == 6:
+                    ipv6_list.append(ip)
+                else:
+                    ipv4_list.append(ip)
+
+            ip_v6_hosts = cmdb.get_business_host_ipv6(
                 username=username,
                 bk_biz_id=bk_biz_id,
                 supplier_account=Business.objects.supplier_account_for_business(bk_biz_id),
                 host_fields=["bk_host_id", "bk_cloud_id", "bk_host_innerip", "bk_host_innerip_v6"],
-                ip_list=ip_list,
+                ip_list=ipv6_list,
             )
             # 监控接口不支持 host_id, 进支持 ip
-            host_without_innerip = [host for host in hosts if host["bk_host_innerip"] == ""]
+            host_without_innerip = [host for host in ip_v6_hosts if host["bk_host_innerip"] == ""]
             if host_without_innerip:
                 raise Exception(
                     _("主机[{}]innerip字段为空，蓝鲸监控接口仅支持通过该字段进行ip传参").format(
                         ",".join([str(host["bk_host_id"]) for host in host_without_innerip])
                     )
                 )
+
+            ip_v4_hosts = cmdb.get_business_host(
+                username=username,
+                bk_biz_id=bk_biz_id,
+                supplier_account=Business.objects.supplier_account_for_business(bk_biz_id),
+                host_fields=["bk_host_id", "bk_cloud_id", "bk_host_innerip"],
+                ip_list=ipv4_list,
+            )
+
+            if not ip_v4_hosts:
+                raise Exception(_("当前业务下未查询到ip信息, 请检查ip地址是否填写正确:{}").format(ipv4_list))
+
+            hosts = ip_v4_hosts + ip_v6_hosts
+
         else:
             hosts = cmdb.get_business_host(
                 username=username,

From 05d8adea040fe3dd2d2b4e1edd26f988b0d48142 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 20 Sep 2023 16:34:08 +0800
Subject: [PATCH 091/112] =?UTF-8?q?optimization:=20=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E5=90=8E=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=A0=E9=99=A4=E5=8F=98=E9=87=8F=E5=8F=AA?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=8F=98=E9=87=8F=E6=9D=A5=E6=BA=90=E6=95=B0?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue | 6 +++---
 .../pages/template/TemplateEdit/NodeConfig/NodeConfig.vue  | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index d589db5a33..5e7fba5ad3 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -710,7 +710,7 @@
             }
         }
         .rf-tag-label {
-            width: 130px;
+            width: 20%;
             padding-right: 24px;
             .label {
                 white-space: initial;
@@ -726,7 +726,7 @@
         .rf-form-group {
             .rf-group-name {
                 display: block;
-                width: 130px;
+                width: 20%;
                 padding-right: 24px;
                 text-align: right;
                 .scheme-name {
@@ -747,7 +747,7 @@
                 float: left;
             }
             .form-item-group {
-                margin-left: 130px;
+                margin-left: 20%;
             }
         }
         .form-item-group {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index af722ea391..e62664656f 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1293,12 +1293,7 @@
                     const { activities, conditions, constants } = this.variableCited[key]
                     const citedNum = activities.length + conditions.length + constants.length
                     if (citedNum <= 1) {
-                        // 切换插件/切换版本/更新子流程时直接删除引用量为1变量
-                        if (this.isUpdateConstants) {
-                            this.deleteUnhookingVar()
-                        } else {
-                            this.isCancelGloVarDialogShow = true
-                        }
+                        this.deleteUnhookingVar()
                     } else {
                         // 当变量来源为0时，自动删除变量
                         if (sourceInfo[id].length <= 1) {

From d238d5513bd9e28572cf98229635d9e574871309 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 21 Sep 2023 11:49:18 +0800
Subject: [PATCH 092/112] =?UTF-8?q?minor:=20=E5=8F=98=E9=87=8F=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=8F=8F=E8=BF=B0=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/components/common/RenderForm/FormItem.vue | 2 +-
 frontend/desktop/src/config/i18n/cn.js                    | 8 ++++----
 frontend/desktop/src/config/i18n/en.js                    | 8 ++++----
 .../pages/template/TemplateEdit/NodeConfig/NodeConfig.vue | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index 574d05734d..8620330416 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -132,7 +132,7 @@
                 <i
                     :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                     v-bk-tooltips="{
-                        content: hook ? $t('恢复为非变量节点内维护') : $t('转换为变量集中维护'),
+                        content: hook ? $t('取消使用变量，节点内维护') : $t('转换为变量，集中维护'),
                         placement: 'bottom',
                         zIndex: 3000
                     }"
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index a074432e14..cfbc1c0618 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1405,16 +1405,16 @@ const cn = {
     '变量豁免': '变量豁免',
     '取消变量引用': '取消变量引用',
     '变量引用': '变量引用',
-    '转换为变量和恢复为非变量使用说明': '转换为变量和恢复为非变量使用说明',
+    '转换为变量和取消使用变量说明': '转换为变量和取消使用变量说明',
     '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量',
     '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护',
     '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量',
     '接收输出和取消接收使用说明': '接收输出和取消接收使用说明',
     '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出',
     '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出',
-    '如何删除：取消接收输出则自动删除变量': '如何删除：取消接收输出则自动删除变量',
-    '转换为变量集中维护': '转换为变量集中维护',
-    '恢复为非变量节点内维护': '恢复为非变量节点内维护',
+    '如何删除：当所有复用该变量的参数被取消使用，则自动删除变量': '如何删除：当所有复用该变量的参数被取消使用，则自动删除变量',
+    '转换为变量，集中维护': '转换为变量，集中维护',
+    '取消使用变量，节点内维护': '取消使用变量，节点内维护',
     '使用变量接收输出': '使用变量接收输出',
     '取消接收输出': '取消接收输出',
     '转换为变量': '转换为变量',
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index cfceb6aa38..7307e53431 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1443,16 +1443,16 @@ const en = {
     '变量豁免': 'Variable exemption',
     '取消变量引用': 'Unlink Variable',
     '变量引用': 'Variable Used',
-    '转换为变量和恢复为非变量使用说明': 'Instructions for converting to variable and restoring to non-variable',
+    '转换为变量和取消使用变量说明': 'Instructions for converting to variable and canceling use variable',
     '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': "How it works:  Create a variable of the corresponding component type using the node's parameter. For example, if a parameter is a dropdown list component, a dropdown list variable will be created.",
     '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': 'How to use:  The variable created during conversion will be automatically referenced, or an existing variable of the same component type created by another node can be reused. This enables the centralized maintenance of the same configuration item of multiple nodes using variables.',
     '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': 'How to delete:  When all parameters using this variable are restored to node-internal maintenance, the variable will be automatically deleted.',
     '接收输出和取消接收使用说明': 'Instructions for receiving output and canceling receive output',
     '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': 'How it works:  Automatically create a node output type variable to receive the output of the node during task execution.',
     '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': 'How to use:  Subsequent nodes can reference the variable to get the output of the node.',
-    '如何删除：取消接收输出则自动删除变量': 'How to delete:  Canceling receive output will automatically delete the variable.',
-    '转换为变量集中维护': 'Convert to Variable for Centralized Maintenance',
-    '恢复为非变量节点内维护': 'Restore to Non-variable for Node-internal Maintenance',
+    '如何删除：当所有复用该变量的参数被取消使用，则自动删除变量': 'How to delete:  When all parameters reusing this variable are canceled, the variable will be automatically deleted.',
+    '转换为变量，集中维护': 'Convert to Variable for Centralized Maintenance',
+    '取消使用变量，节点内维护': 'Cancel Using variable for Node-internal Maintenance',
     '使用变量接收输出': 'Use Variable to Receive Output',
     '取消接收输出': 'Cancel Receiving Output',
     '转换为变量': 'Convert to Variable',
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index e62664656f..b0b9b30a9f 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -204,11 +204,11 @@
                                     <p class="citations-waivers-guide">
                                         <bk-popover placement="top-end" theme="light" width="350" :ext-cls="'citations-waivers-guide-tip'">
                                             <i class="bk-icon icon-info-circle-shape"></i>
-                                            {{ $t('转换为变量和恢复为非变量使用说明') }}
+                                            {{ $t('转换为变量和取消使用变量说明') }}
                                             <div slot="content">
                                                 <p>{{ $t('如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量') }}</p><br>
                                                 <p>{{ $t('如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护') }}</p><br>
-                                                <p>{{ $t('如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量') }}</p>
+                                                <p>{{ $t('如何删除：当所有复用该变量的参数被取消使用，则自动删除变量') }}</p>
                                             </div>
                                         </bk-popover>
                                     </p>

From 81d6f1e63be6a9d00c618e630e95c4736efbaf82 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Thu, 21 Sep 2023 16:17:20 +0800
Subject: [PATCH 093/112] =?UTF-8?q?minor:=20=E6=96=B0=E5=A2=9E=20V3.31.0?=
 =?UTF-8?q?=20=E7=89=88=E6=9C=AC=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 version_logs_md/V3.31.0_2023-09-21.md    | 52 ++++++++++++++++++++++++
 version_logs_md_en/V3.31.0_2023-09-21.md | 51 +++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 version_logs_md/V3.31.0_2023-09-21.md
 create mode 100644 version_logs_md_en/V3.31.0_2023-09-21.md

diff --git a/version_logs_md/V3.31.0_2023-09-21.md b/version_logs_md/V3.31.0_2023-09-21.md
new file mode 100644
index 0000000000..8f1582bc72
--- /dev/null
+++ b/version_logs_md/V3.31.0_2023-09-21.md
@@ -0,0 +1,52 @@
+# V3.31.0 版本更新说明
+
+### 新增
+
+- [ 新增 ] 编辑流程时，输入$可快速引用已创建的变量，并以标签形式展示，方便快速引用和识别。
+
+
+### 优化
+
+- [ 优化 ] 移除变量免渲染功能，同时限制全局变量的生效范围。不再支持脚本中引用全局变量，请使用脚本参数传入。
+
+- [ 优化 ] 调整节点的失败处理选项逻辑，自动跳过和手动跳过不再支持同时勾选。
+
+- [ 优化 ] 节点输入、输出变量型变量，当所有来源取消使用变量时，自动删除变量。
+
+- [ 优化 ] 优化了子流程节点详情，在一个界面中同时展示子流程节点的输入参数和内部详情。
+
+- [ 优化 ] 任务状态支持筛选失败、执行中、暂停等细分状态。
+
+- [ 优化 ] 任务记录默认只显示最近半年记录，节省存储空间（管理员可通过环境变量设置）。
+
+- [ 优化 ] 优化「节点管理(Nodeman)-新建任务」插件，安装、重装操作移除不必要的选项；增加配置重载、重启操作。
+
+- [ 优化 ] 优化文本输入的交互，增加长度限制和提示。
+
+### 修复
+
+- [修复] 修复修改周期任务配置时，修改时间未刷新问题。
+
+- [修复] 修复执行方案重命名报错问题。
+
+- [修复] 修复任务执行前，执行代理人错误问题。
+
+- [修复] 修复重新执行时，没有记住上次选择节点的问题。
+
+- [修复] 修复子流程暂停时，任务无法终止的问题。
+
+- [修复] 修复子流程节点输入型变量不显示参数名问题。
+
+- [修复] 修复“集群资源筛选”变量，集群个数输入非数字显示 NaN 问题。
+
+- [修复] 修复“集群模块 IP 选择器”变量使用不存在服务模版也可筛选出 IP 列表问题。
+
+- [修复] 修复“IP 选择器”变量已选的集群/模块在 CMDB 被移除时输出结果不正确问题。
+
+- [修复] 修复“配置平台(CMDB) - 批量更新集群属性”插件传参错误导致不可用问题。
+
+- [修复] 修复“监控平台(Monitor) - 蓝鲸监控告警屏蔽(按策略)”插件执行失败时异常不显示问题。
+
+- [修复] 修复调用 "create_task" 接口时权限不足时，接口返回错误信息不友好的问题。
+
+- [修复] 修复在切换动作需要进行二次确认时，如果用户取消切换，选项仍然被切换的问题。
diff --git a/version_logs_md_en/V3.31.0_2023-09-21.md b/version_logs_md_en/V3.31.0_2023-09-21.md
new file mode 100644
index 0000000000..3539cdf3ee
--- /dev/null
+++ b/version_logs_md_en/V3.31.0_2023-09-21.md
@@ -0,0 +1,51 @@
+# V3.31.0 Release Note
+
+### Feature
+
+- [Feature] When editing a flow, entering "$" can quickly reference a created variable, and display it as tags for easy reference and identification.
+
+### Improved
+
+- [Improved] Remove the feature "Variable Rendering-free"  and limit the scope of global variables. No longer support referencing global variables in scripts, please use script parameters to pass them in.
+
+- [Improved] Adjusted the logic of the Failure Processing options for nodes, Auto Skip and Manual Skip are no longer supported to be selected at the same time.
+
+- [Improved] For node input and output variables, when all sources cancel use the variable, the variable is automatically deleted.
+
+- [Improved] Optimized the sub-flow node details, allowing the input parameters and internal details of the sub-flow node to be displayed simultaneously in a single interface.
+
+- [Improved] Task status can be filter by Failed, Running, and Paused.
+
+- [Improved] Tasks only display history from the past half-year to save storage(admin can set it by change environment variables).
+
+- [Improved] Optimized the "NodeMan New Task" plugin, removing unnecessary options for install and reinstall operations; added configuration reload and restart operations.
+
+- [Improved] Optimized text input interaction, adding length limitations and prompts.
+
+### Fixed
+
+- [Fixed] Fixed the issue that the "Modified At" column do not refresh when modify cron tasks.
+
+- [Fixed] Fixed the issue when renaming a node-group resulted in an error.
+
+- [Fixed] Fixed the issue that the agent of task was incorrect.
+
+- [Fixed] Fixed the issue that the last selected node was not remembered when redo task.
+
+- [Fixed] Fixed the issue that tasks could not be terminated when sub-flow were paused.
+
+- [Fixed] Fixed the issue that the node input variables of sub-flow nodes do not display.
+
+- [Fixed] Fixed the issue that the "Set Resource Filter" variable displayed "NaN" when the number of clusters entered was not a number.
+
+- [Fixed] Fixed the issue that the "Set Module IP Selector" variable could display IP lists even if the service template did not exist.
+
+- [Fixed] Fixed the issue that the results of the "IP Selector" variable were not correct when the selected cluster/module was removed from CMDB.
+
+- [Fixed] Fixed the issue that the "CMDB UPdate Set Attribute" plugin was not available due to parameter passing errors.
+
+- [Fixed] Fixed the issue that the "BKMonitor BlueKing Monitor Alarm Shield (Based on Strategy)" plugin do not display exceptions when run failed.
+
+- [Fixed] Fixed the issue that the error message was not user-friendly when calling the "create_task" API with insufficient permissions.
+
+- [Fixed] Fixed the issue that the option was still switched even when the user cancelled the switch .

From 61f07fe54ca056b43fbf3940bac71855fddb029d Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Thu, 21 Sep 2023 16:17:37 +0800
Subject: [PATCH 094/112] =?UTF-8?q?minor:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en/LC_MESSAGES/djangojs.mo | Bin 49878 -> 49945 bytes
 locale/en/LC_MESSAGES/djangojs.po |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/locale/en/LC_MESSAGES/djangojs.mo b/locale/en/LC_MESSAGES/djangojs.mo
index c4846fe62ff1fa4b046effa0b3606cca2e0674f7..78f6252c32a68fc237bd463adc53fd6bd757b3ee 100644
GIT binary patch
delta 8950
zcmXZg3!KkY{>Sn2n;Bz<xtJMqVHjqN%P^8#lRIIuZq*1OWtfO^38h3oTCB^uG(WN!
zm$7n}%c!WvrLrX}`)@Zr;*Yd8*LJZg3hnFde0n_g@jSQh=bZC7=lh+XJw7vh*{ty3
z>BNX7j{mBKIadSERdMbZ<*k`&b?!p0a{;`F5qR0WiWRB<X!Sc-6z*JDW9Q--IO2Zi
zKBYdXg>yYCIM?Ap=c+RPkL{dG!cuS0y+dIzGaSazbky(Q+~+*71i=mI>Kt+0a7@5a
z7>83(f#zWhuEs>%it)G~HSQR8!qcb))Xw+)EiuUjo$E@0O}hce#@#54#nGsMubK-`
zflE<=cj7QSfUMPJKkVEdEW*lIvzw2TgNmPrdcGTKLr-7@=66q0sEI={3a6QKP&+Kf
z3b-DXfvp&c`!E_0VLBc|E%-8Og1gue!+z%{?rio!9o;YtD&TVzD&bU&#@U#G#i-Qo
zL<Qc5QTTsY4^LQspt~OzhgwKFMq{3}ce3{0s0@s<{>k0Re>M#>XwZ%}p(fm61IkgU
z{M7pYj#|J8^Pi}rxPp4_SJXnIdiV{bqw1|u{k<?52U>kx5Av^zK9vTY`D)|>yKShI
zo<vP}8Po6vDl@S?oy);oRDVCz1W%*lJ&!u`1=haW+=^PjUR1neK?>UW1sm`m)RElA
z=@{3`2VR64x6<nCPz&6NTEIb6CO$`{{u|UC_$S8TdDQbatp8VQ4_4^yI}%Z;s%G_E
z)DD_s9(KW&I0ZFs7wWY-gbG~o5pNu7LCL6vWS|z%z-)=})E`3P1YH4zR2rVai8vKm
zoV$*bu;Zi7F^Ah@R(#C4M%4RZeS96Ypw0L=mZNr_Sl}0wf?7aLd<Yv_`{;Y^oc}}$
zI*aM|8k}2>&8Tm%`U%vTok#8L4#r_*AK#vgiPRgRUf1@hg%zMOI2rZ)JgkkSsJrtK
zX6pUFLP05vWBCe{jC!B}YUS-w{XMK+fExF-Io{f5n#I<>8g&G_to=jtFe=`0461O-
z8qT41co{YE4KvW!2a3aZ+S5=AXn;y}8%)LyW?$6v&zUcyGCUJC-zuxW)tB?v>$H!C
zWISa9{)<}qFQ_kLL_g<hVHWCp@epc)5#~g5y1Bqyftq-u)eoYM<O{2x=|}z*=!!Mm
zG9&x@_9U}5YC(-r0rRZ=QLIXRu(gjz?QkAye6d-A%G`R?^Y2>ySdfBJc?R|1b<~5m
za4?2H;TKY9jxk>~XJa$QEkVWk3@hVF)KQ*C#k-1%|BKZF1Ds<D7pzP{85o9I;W(>L
zGv}MjQGqs~#_dF|hdXHPDFgjosEwK^8x^;awLfU>ZOzWUKj^yqg6ofbzFm>kx1%oC
zhp4-80JX#8s5^5JHBr<cKT$kt=QU8zHL&(v)N`#+cd4hfkHR$l{hwqFi_Dd%Pw!^b
z1i4T837TUX^^T|o46yc>&6$`=dok*{%{U5o;z+E)c`75buq}pE*ZcoB>o{dzLIwC4
zmGZmR9`%&}<CJW6M(ykcRNxur8>r`2;Z)p+%3!^xy=_tB3oxh^KTSbrISGsKuc*t@
zbci3=8g=FmquTpheF!ShICH8w*IbGT&bf7{4ZUmia#XxyL&(1ZoS{KpL7m+#)O&sh
z^<Y+^HwU$|`%wW}TYGm@CLTk@DMEdsU%=`(4Hahv>Tk<h)cC7~L4T&<Lw&#+sE%CJ
zPCK9ic0-+gUsRwm=8LEWO+k&Dg?c_@_4Q_%dB8kso(Njuym<q4R)JwYU@B^YY*gU;
zuqt*!WuPCnz~NS3flB!n)Pl;*&ru8i8Xv;bW-yZjS3{Ax0X6UvDs|VeCdNGD12#1C
zP!o4SjeiBTplPVra1m-FC0Gl0VLE<k?f>=$UBqyHbkI>98)FO9%7>zMJQnrf>zIkF
z%mb**e1~)KiaBWnKVYecJ?q>MoQFB;$0nFE(z$mqADip_zfEBr4fpf1GRBpnQdsFZ
zyAxPUJr^@@KWb;EkvG%bzz$gOJi)OT)xQbzaKF`m#s{d!j`sasFrN9{Kne|T6e>^%
z`4Qv(j(j^@-7)?j8n2@!{2sHh%UI_Y;z*3fTc`zwvl}fS%X|<uzPHsUU_A9X7*t`I
zb!@VZ{ixI*v-a<-{ifBUUhuzgGEmRwqbBTUK9Bc~3^nm8^JDXZ^~a7U|C%Ugyx&1v
zj8Q;TfIgUmW3eGF!#em0YTN~Ehd*L-Y(BwfU<B%QorStHt5F#`h+60oOvJMj$iH@Q
z!#W}+`oPuA`WQ)n3#+#=yP@8SzNm#xu=a&kFF}1-_n_kc4Hf5G)I!dqHgGLSK`Xgy
z4GAy$dIsvjrdIESdf;)h(AvkK0#7$*V-)p;sPTU?-!gY$W7_wl;s<}Qjyu?yhDtB_
z6!u019*qh#(dyH!KHFSk?Q2m1H=&Mbul1ioZSa!S@0gV)-J2)qQYmPH2T<Sa&X|e?
z);<aqV3O76T74;M!p)e9@1rLE67R>KuqxJn*+1VFD^Y(0bp!)3Q}2Hfh139-1;MR)
z#sBko4MtGkh!t>~wU=SHaOXb2Uom2;b7iO>4NVxhdxrm@otxvmYo^WRzA!;E<QwH?
z&m+4*9=J+D6Fl{X|La$TTKTh>fK#zHE=28k2kO!tz-0V?)R|wm_FplRdTO!%wc84n
z!S3c@45K~{gG&7b3Mn`ZmCB`<gxgU^@-gZ)`x2GnDk0~NVhdC%!xsB*eheyJ8tVDF
zsKm5FZLl3S!Oo}!PgqR;RhU9U6`W}U-$Z@MN>G>Z1Jt;Wto;bqqJ9ZAL8T?m6=EFf
zwH$}azyhp@JFI;V>JA*oSUkIg^RGwYKQts_%9}pLIjFO5g$=PiYG)%+<6c7Ta1LsL
zE3qoBv-Z8H4IM=-;54S-_o$8BK^<jeaH%h(nDtN-KY)6$joBHs;vT3Y8DKt(3N#5d
z{ts9g7orxl0(I6qP;W&UD$Y5)4};gOA@ff@KohJ+M;<COk6{CR8I`(H)Xuh|?m{^#
z<!4b7|Asn}%FFz?c+93=8?~{ns0DXNHWG9LDLhKUNYu*SN2T;LKfoPBrTjE1b=R!@
z7u1nNFZT;iLH%IKuzD+020Ec8>}T!6F_rq5dv(r#76nbb0NZ1Uc@j0S`U=0mW~hbz
z9(C*IqVB+A)a~Ag+Tq(~nf33%1ls?Ky40s}Bi_Nm%<tBh_}d(@(*HWmHpin<cK~(U
z|Ap1C!Yb|s)<T`_Ak^7Eg*t-an2+O83*L)5x&x?;96@F7TMRa)@B;-6OkeFUR~9PO
zO|9M<>r?+7*2Wi5x49V8aTDq;9KtNTh#45O#{YjtjZpPMRNQH(`R1(Q{A*BHM1#&~
z8)_%zRzHMF^;f7PI)i%f2h_M5s2$x#1x_gS8>o)jVGgSO0n~FH%zRYbUZp`lus;o2
zKoROJCt@;A##*=tb+$WDJ9!7w@E@q#{sSt-*HD?cjhZlNt<Ow#)N9)w?@f&A?;oU~
z6+VTvaRh4O*{HK$g}OW+qbB;w{00@^lzGm)Y+grg=oacuME}{(lZ<*U1C_yGT`M#;
zTcQ@!4)vbrqjugO^%_2jO8Hn+pc$w@^H3=dp)#=swUI66LDX|!qvBmb<_WrM6vor=
z3u?mA>->seLj|0RO5IZIgzHfgUa<D7R{ssP(~58T{v^~!(lH;iQSqNcy+u<ng8AK>
z_X>O}Q4_5}J-8jUfIZk651}S@>-|wgVFc9})c6FffYniFT-*8^noTg0_7>O&+h82?
zyM+|OaTV(FtW^i@wfbkM3C^H)c)`4Zn$T_VJBvi^EEO}cskQepi%@Z2L><u#3=XHT
zkU}K>gqq+E>a~pC=mXV5?Wh~-QWc=Sj6+cin2aRHO~d(EZ<Ei|Zp@|rAu9ewYrl%h
z+|5noUpv1;gC-7a_P0G2J5#TP592Uv--3Fu9Ha0f)Pj!SYj_g%K^nNlU%r=6<Nk=+
z`4TL|bvO_sw~~JiDBS8-JPLJ5#$y=%9<}mW=6uuw7Nee9hWZ<@7WH<#i`vj(Yd?yL
zcNU}ZI%*-eu_9IuZu9@bNkUE34r8$kYN7&E;QpuyN1*~vKut6Q6?nE;jC!sF3$PTm
zz#FLeQE&UdlJTg81RGMQM4=UGf-b1{v==JSP>jV9s6a2G7Bt7&OHe!6jFoX0YC-#~
z{u%1|f0*B);$B6*q(S#11%2VFZucv!hYHXbHDMlV$33tyK8Z0n*IbGkzYevLx2?Vx
zbE$uf?eHqr#rt;ne}+GfQF{O9QK&`7V$^H1`(6h>5>bKAV0XNTN_mT&egO}nGS(H9
zvEHaJ-Y|^ES5P~hgH><=Cg5t!#+?|c_y0HrrS24JXBSZm`N>S%<zKVbxSRHl=8srP
zeRCQ21AEe$gX=I4zrfWP`HugttjFop%W(vDc$fTZr5h;3;d?j>|AKmrdcEgYJ`#IS
zpNvh_j|q4abwri+_zY!WRq7*AsecWXp)IIP?#4Q}4;AOTJ><V5g{ph~4*Fsr>f10M
z1MmA(bwe(&8;!cf=^yw7W}z-udsOOsVjCQaX}Ait(DzUoK8!kwuTal@{{i_=p>TtS
zRIL1=@2G=`)SIIEyPz)DAk<EVTYa4MzlwUk81)I>Z0(<5I`xyN34cZ%afNcfpv0gR
zGO!UH4Y3XOL#3z~_24Ji9KSRp_xXuhqb}3qs5|ot>XW<zwa`-3CESAA`3_WO4x%y>
zJV8OX`U>hjzKWXgChCF6{XTFi)}-DFwS)dx1B*}rr=yN$xmk)@z(!QOUDkfU{1mx!
zLHC6XIE9+<vJJS6T6y>ZzrZL|Jq9&V0&093YR5UK4KzU=T^{NVbw{238>q{=5<B5e
ztfu$>zZ4W8_Mi`(gbGw0wSz3w#JQ+UHAPL_5*uSaDkBq7cVIf|xn-!^|7Xm=t*A^K
zF~7kS=6B~QD8OCR>sa|CA0QpI;<~8*R;br2ADiJIY=R3=mvo=?e}x)<3AK@*QJ3;J
z450qI>v5ry%#uLGP^+x5foh>mSxv%z3xrN&-4}=tMb}9Wq?FaI6CMbJhjOwX3A-Bz
zP0sEehzK3d?jNWe%B*`nkQR!r*Cr4f>RRtiATd<8e&;|!Xk`6C(Me%G{EkpzqomNc
z^<%<ZSm@vNH-`nnLdzTE2jW6!8%zpBh6d#1RjA6?N@YuO;sePHbIJTKlU1hTk60nJ
zx8c`;=+GOD+61CPM;mn@L~L${K$Wsyxl!E{XU;!g{`SQ`%)d}x?%-dGwwLvJDIz;i
eRQAO3IrU<mA6r=D3Z9uTv2gsvveO4{2L1;_2@z%h

delta 8866
zcmXZg33OJ)`N#2j69NeYl8}&uMIa=G1PEZ*sw`ng!z!z?HGu4k7&ejRLJMdp7U2aI
zDoap{fC!49?2A@Fup$itDo~b!MWK}*=wA{3{r;H8b3C7!xpSYHd1mG&WW|EWujfYw
z=PQ<4?)Wby!ntZ#67SrXlozF`)wv_}oD1PmEQQC+6Ih1&DXX8uXCj@ugmHB2)X=%Z
z)cZAdu1l12HGbn<68*=ubS@F+dIPtd!XQT2fa7^kCeOLgd0`5IYu&*);<%2OfcaPf
z2ciOv#aIlmA}+!>T!ZSj1>4|0)C62d|GW|=y1==IDX?hwD6(*ukL9r|D&PQf0xIxa
zRNy5z4A&xab)`Bv_c6A|a(E9FC+2Y<KLz!E7HUDi!6?ReEhs#MZ7~`P%+aV77Ge}G
zKxJSNmd4c>gKuM1+=80$G1LI(u{B;o4V?ajw-IXV+F_u8ohg*XK^TLhusRl^Qo95d
zcr`}j`<RKl?D<9WCTb#gF$Poe{rhRC_WG!a<fESV&nN#G6rQ0$D=I<__=<H{g-Ydm
zd%g`dfnDY&sI54Tdhc7*M88KZ;I7rHboS44uoCT$S-nSR@~?wFhz9LdfI0XwYNoqU
z10KUvEI|dnf!P?_#XoO~nm`^ZUKiAvnqcjLxd=6Z6{vVy^gt^=VjaFjZOL~y7jIho
z#IC;IER3an9%_P1P!lXhWnv>LwL4K~;1g8;!>Dme?D@CW9{j@|+(M=9XRF6{^D9Wi
zX0&Hu6C8-@w-j})-bMw!X5K_i=r(F1_fZpw?(VIGns_ZFPT+DWq|nd-C*vSw4(=pQ
z!<s#uBZhn3yoPnDH+|B%+Bg(7p@rBRSD{vZ3pKGjs0rM|wpg~OZ|{n+y8pc?XfK95
zXmIWY%%%RK)pw!x>@aF&=dc1^wf5Usk$Sma{<>C2O)M962KuAkAB#0{F6!*8!!+Ih
z;}kU0o2WpyQ7=TZ9L>Bs>UmwO=c4-MnLVw2xLIiJ0cs1DTKgO322{Kq7^tw<8a~Ab
zryVtLiFpwf=qASD|Dh%j-N&c8Dr&+t%qFP!JDX3TGCUkL-fXMS??e7|omSIO3HMru
zzo7>F2K8mUf;BLrF9#88p$6z=_BMx@6U-T?fnTzEF=|WRv-<wN<X?e~Tf<rNs`($&
z_45-dj|!NAdaofSVM}Z8iCW=U)B+04nW)SyK)wH})wcu`l*;|67f+&IJd1<yGHReU
zPkFnU1I$sF%kwFyIPYLN+>P4G!>D*CQ1QR9`b8wP3x1%W0opz7XV?Q(FEGcOFQ5Xw
zh+4@K<QTYOYrliKcCNo4s1zzrIaGV9wO2FK{qw-p@deim`CPm9R$q*I@eQnmYf&rQ
zfjTosQ7if$HPF9MEB_VsUi1Lp9*cUfGU_bVv-W&U)&1{h4HL~-s88=g)Bv#qeV{~4
zrCt*?fk&<VDRVfc&|ZjoZy}DsB{&*?MNM=B``Q90VXW@|Ruyos`8g`UX;jM3Tl@Ez
zL;bdyKG?79N!0t#n9rf!n~k&ZB~%7W|JGX#)jt;l%{Y&O_Oc&7gYTjaPeOt3SOvA`
zwNdTOtlk<GsE0Yo9Ai$y1ji36)Pi2M`YKesEd}IX0rt}%kE8bPEb5-0L%kR=#2bTJ
zSv)F06>G19+T%x1aoVFk(NAI(EI`GXf%@6<J5>J@Lju32muXPIU+qEcP`}a|sDN3h
zy>EgF)XnUJn$SR0zY(awldQhL44Z4s&E~Ga3Wv=S)Lvb*`hQUalp5v(SHL9dX{ZS|
z#m3mt>N8L&{{w15tIUn4iGPG`ai1B4*l;zpH(x|`{2Z0Kuka!K5f!lPaBm7~;0#p%
zr%@9sKwZO$sD;eL8n_gz;s@6LS8w31P^ip<Ur?tzX@no3Eh?4WQ7;a~G@Na&MP=p?
zF2v(zzmc4H>X)zp$ByzpZjWOF>UVHEW{!5Qk?#L@6eiLT&t>JAn~O@}b$oCpa4GfJ
zvHsq#L9J{bauZz%=3(wQ=aR7y^}Gn1;To%-#-`M7SUqDr@fqJeMj;FHQGq5QzpS`z
z$T!19P4NHF7>XM3Gt9t@XPsM&PoOe!7OUfB)C3|}l}ttTuW$8U7)O0H1}aRq2SxT^
z4J!3pto@L+pRxM)sNZnzTYKhnexRmi7ksc~sDWpjZ<<H!`HknuzXpma^ed=_vD7nB
z0UBX8cE>t69n<kGRKFwG5>H_xOq}F1&<S;2N1)D3fXYxYDkGb)A|9MX{*{3edvFC6
z_!qOxWPiGoQ0-OCEYz)Nf|_VAYk$`2Gf`jG*HQ7eVre{pn#f^PysrWZn#p-<_{r+`
zQ7<M;@z2vxFElpWSbH~A;34KHjHdo9s{ixmd~+%0(7py0Kls8PoWpiBTt^+E`cr-2
zuBbr0%^}u40To~hYD?zZ^9`s4?Xdb$^J{!?IISKr?ZGEHaB&ors_LkLnxX=<vwB~v
z4?_(&6;p5lYT(t_5D#Gz{s;Ab^z;57wN+6m&qSSthL{p^t|x|c|Hn-C{~R8NrRXpj
zqj0*l2l#j-zxm)@JTa52iO1*gL80TEdHw^owaELqc?J70(0$}v<a+;sKXA~04=R40
zCH%0{{clJ?GjEIu_ypF(0jL$vL>;n4SP9=j?eRWqKa5)0WsJwDr9K16W;RC9-U5~3
zJWR$e_~7UNFbat@%s~CvT#UL_t5GTb4!=Mb_Nn|UmZN$G74Qls;!j9oT+}kZ!We8o
zJq|VDJo9nXM4wzn{*{WMH0W@QLY?Lpt>Yi9{WYvX`wr9qU*iz`26YWvEcY4ck7cOO
zM77VuvbYY*<7Ujn-B=MXEw}rBn+END)T{nOQx>(dCa8{WQ7i0&n&4<m!im;CAGM+t
zs0nPuWc&cN@}sD&JZWAsZv_-IaKvl=#WH3bYQ`z3EqT~%j0)5aHBc|qRt!K*Xe4T{
zXQFOJfQqvf>*GGF-$1<|+@(;NLgec{H4kAH_4cULjYqBQdDK}bLZx;yYT#q2Ejf+q
z_bq1NkEn$utnd>~MlB>0dteh}Vu4#gK`C8k9sYz$`9@Ug_FDUAs4Y2#n)xNvFDTco
z9<|bEpgbx=wNU+XF$Ev9dQVhF`eQ5I|4|PL{E-RO@hWPD_fZq;{wIIx`=ZW30qW3B
zMy>D#GqC6LFoE{hQHOdXzJo_`5Ej1S5AzA^s{8+M6|mJRpSne;)BZkI#;>qB{(#!s
z+N=G_>Y%nD7dv7r)P(1wwr&yXOuUB5+`E{AJ5l|vVW2&^NkOT;hpLxe<A1(a!kW}u
zVlocKsyGF87M5Tw+>X`p3^u|4T0Lj2kJ|+`U>~f815sNveJ%Od9u--`5{#i<jM}43
zs26vl`W-;6=m=`U=TH;Aidx}qRC`3Rf3KWb5f!&Gs$V*40u74;zn86Ps6<0Ytbqej
zdpi@gvbmUwYf-0tCo08zQJFb{n&<^oX0D<pR(72YjC!7qnqVEQiH!mZ8n`!R;26~5
zS&SN}*nArmV1v2U{K(vgTG3xnXW|rUpo{kWIx2%dnLnFB=uO`-2IJ{a5w-Gk)HTdP
zrMx+60zFWH`k_+!TT~{-p%yaDd>QrLo2Ymnqb9T$3-L2#yudyBmY;DxDqvq!>V{z(
zEJO|Xp|$U^`Z3f>|7P_Ir~$5FNBlQxLCxOwx9D*!MSZ9_5-aHbkE5U$XP_o94<ExN
zsDY1TB$l88oI&+Jhf#PHb+~>+J-=h#MP<zWna?zoK`m?mD&81OW_&ln9?Vw*^<}65
zHlbGdp?LtKs2@kI>?G>@a2eC^p0(Fl@1HkB4cG>?MLlo?4#3iQ2m=jpl!ET%DO8|a
zs1+r>;}2DJ)R(b7Y62aR#knr{GTy>6IA;TYUcr}818hgN??GkeQ`E|jqQ?DV1Nql!
zKTAV9`~f>*gN^<cOhdg`gwgm%)G2=rXXAR*2Pt!tKYVRb{hmUtd<YJ~iP#@c+Vh-u
z{luESOa7J0Ry0Ilcht;#nopx9P=E?N9Q89`0_t}B4z;4?*1iH2Z!^Z=KGZ~xpfYh9
zv+)9IoS0y<|I)>y2C9w<oQ@i>DJozdYM>sdz`f1EsP{%;PaKb$-~rSCC0GT&MNQ-m
zmc^*|eEcAug6?T$RG|7;9vh(owLwj&kF}3Ntz;^e!`Y|_EwuVF)cb4A_fT>7puVIB
zQCt3ZWP*XaML_|6MhzIb#jiL8bEs!wEcP{rq54lmt>gu(&&PVy7h_A@gAd~`*c5AS
z^(*d&`otGtn(qG`d$0}_coXL1c2vsU`+fqYP+O9K%2*ZD7q0=vVF%Po`(Qlw#{?XU
z88{2ICF@X`+kg-L{<ociuH7N?3hJ7b{(!rWvF1T6rapC>|J!XU53{LH#Adh>*WgLi
zccgH;|3hXGj-+00ho9&qtU&$u7%ZT$l!C5N<&XT#n_y?^9q|!8#{~QowMAc}GISl2
zu*t_h_4%j_O+#gJ4yNNmRGjy)HU1s@VcJge-;2WZo&KBs1u9iZySPI5C@N*wP!qg~
zI$ULU`_!jmbL#am6~~|^`g>H0m!r0#81>!<n2ZN71yAp0|MlQsH0YGyvkvil{NbvN
zT1l?eTc84TLIoI%`UFq4_E)ef_4TN@pP&x!SEvb{H?Lz|>URPP%_-E{>r*rs_2Mho
z2v?gYQ3I9U=QC6jb!IxC&dNyCM8~5J;WX6BXQDFmGAc8FMjh&pQP()wLqP+6ihAKB
zD)41|2&4A<6{KS|>J3o=yP~#cggG8Hfyt<Nv#ouR8ActtmG*oCGG5?5vJOX3Gyf7b
z!xF2XvFGPd6TE_2@om%!?xMCX@_;`>$*5EhLLJu8*al~zGPoc0{#lIC{l7p#1OF2>
z@J-Y}w=f4I5Bdx|g4**|sFn6bo%RB(j-yd4f606mbynU&oq^q`@5B+*`)4q*3x!M8
z;STCLMIPe7VJbGj&Zs~$P|ug50<K48;6v2P_JlX2Z3#t%pRV<6C?$NfR)Yxs#r{jJ
z`l0gS?DVRkq-`D2BSWE3_=$|}da^R3TPPy@&y0Sdm~fkiuZ5Ds*_q8l<-)@=FNEU5
z9cs4=#f6J%4~R*iv;Nx}o?AC@X;y5+{ZP0<*2akc4~2JSbqvLZL)p_prNYy*n?+Tm
zYxK75*>RytWho}|e_DvEinlQ`e74T%P?_-ib(@Duhi}x)3%PJky}VF`ZR6`j=Wi>T
U8j%s2ylv6SqRed>2XBY|2SP{p`2YX_

diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po
index 2c15a1d5ca..e98bded7d4 100644
--- a/locale/en/LC_MESSAGES/djangojs.po
+++ b/locale/en/LC_MESSAGES/djangojs.po
@@ -2919,7 +2919,13 @@ msgstr "Remove"
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js:230
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js:254
 msgid "升级"
-msgstr "Upgrate"
+msgstr "Upgrade"
+
+msgid "配置重载"
+msgstr "Reload"
+
+msgid "重启"
+msgstr "Restart"
 
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/legacy.js:103
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v2_0.js:330

From 05739227ba6f28aa0b679706d56249552d5df4f0 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Thu, 21 Sep 2023 16:17:58 +0800
Subject: [PATCH 095/112] minor: release 3.31.0-alpha2

---
 app.yml           | 2 +-
 app_desc.yaml     | 2 +-
 config/default.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.yml b/app.yml
index 2ffdf1ed45..c1de4d0cdd 100644
--- a/app.yml
+++ b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.31.0-alpha
+version: 3.31.0-alpha2
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index 7d18656561..ff5bd6bc65 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.31.0-alpha"
+app_version: "3.31.0-alpha2"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index 8cae0ff5fc..911fe0b52e 100644
--- a/config/default.py
+++ b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.31.0-alpha"
+STATIC_VERSION = "3.31.0-alpha2"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]

From 6a56d6bad4cbe92907527556177077b94c209e05 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 21 Sep 2023 16:39:00 +0800
Subject: [PATCH 096/112] =?UTF-8?q?minor:=20=E6=96=87=E6=A1=88=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/config/i18n/cn.js                    | 4 +++-
 frontend/desktop/src/config/i18n/en.js                    | 8 +++++---
 .../TemplateSetting/TabGlobalVariables/VariableItem.vue   | 7 ++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index cfbc1c0618..7e8a53ae7e 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1786,7 +1786,9 @@ const cn = {
     '复制所有IP': '复制所有IP',
     '复制异常IP': '复制异常IP',
     '清除所有IP': '清除所有IP',
-    '清除异常IP': '清除异常IP'
+    '清除异常IP': '清除异常IP',
+    '节点输入型变量仅支持从节点"取消使用变量"来删除': '节点输入型变量仅支持从节点"取消使用变量"来删除',
+    '节点输出型变量仅支持从节点"取消接收输出"来删除': '节点输出型变量仅支持从节点"取消接收输出"来删除   '
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 7307e53431..5e1fcce652 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1415,7 +1415,7 @@ const en = {
     '返回编辑': 'Back To Edit',
     '周期任务根据创建时的流程和执行方案数据生成快照保存，流程变更后不影响周期任务，可手动更新到使用流程最新数据。': 'Cron tasks generate snapshots and save according to the flow and node-group data at the time of creation. After the flow is changed, it does not affect the cron tasks, and can be manually updated to use the latest version of the flow.',
     '不使用执行方案': 'Don\'t use node-group',
-    '当前流程非最新，执行方案不可更改，请先更新流程': 'The current flow is not the latest version and the step-group  cannot be modified. Please update the flow first.',
+    '当前流程非最新，执行方案不可更改，请先更新流程': 'The current flow is not the latest version and the node-group  can not be modified. Please update the flow first.',
     '执行代理人在任务开始执行时确定，未执行任务不展示': 'The agent is determined when the task starts to execute, and the unexecuted task will not be displayed',
     '计划任务在执行时获取最新的流程和执行方案数据创建任务，流程和方案变更将影响未执行的计划任务，如增加参数可能导致计划任务启动失败。': 'When a scheduled task is executed, it get the latest version from the flow and node-group  to create a task. Changes to the flow and plan will affect the unexecuted scheduled task. For example, adding parameters may cause the scheduled task to fail to start.',
     '未能重用': 'Failed to reuse',
@@ -1805,7 +1805,7 @@ const en = {
     '仅支持查询最近x天任务记录': 'You can only query the tasks for the last {x} days.',
     '失效': 'Invalid',
     '该类型仅支持从节点配置生成变量': 'The type only supports "Set as A Variable" from node settings.',
-    '该类型仅支持从节点配置取消引用': 'The type only supports "Unlink Variable "  from  node settings.',
+    '该类型仅支持从节点配置取消引用': 'The type only supports "Unlink Variable " from node settings.',
     '重试子流程': 'Retry Subflow',
     '跳过子流程': 'Skip  Subflow',
     '确定跳过子流程【n】 ？': 'Skip this subflow [ {n} ] ?',
@@ -1820,7 +1820,9 @@ const en = {
     '复制所有IP': 'Copy all IPs',
     '复制异常IP': 'Copy abnormal IP',
     '清除所有IP': 'Clear all IPs',
-    '清除异常IP': 'Clear abnormal IP'
+    '清除异常IP': 'Clear abnormal IP',
+    '节点输入型变量仅支持从节点"取消使用变量"来删除': 'Node input variables can only be deleted by the node "Cancel Using variable"',
+    '节点输出型变量仅支持从节点"取消接收输出"来删除   ': 'Node output variables can only be deleted by the node "Cancel Receiving Output"'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index 4d2569ba63..2eb3b43335 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -17,7 +17,7 @@
                 <bk-checkbox
                     :disabled="isComponentVar"
                     :value="variableChecked"
-                    v-bk-tooltips="{ content: $t('该类型仅支持从节点配置取消引用'), disabled: !isComponentVar }"
+                    v-bk-tooltips="{ content: componentVarDisabledTip, disabled: !isComponentVar }"
                     @change="onChooseVariable">
                 </bk-checkbox>
             </span>
@@ -182,6 +182,11 @@
             isComponentVar () {
                 return ['component_outputs', 'component_inputs'].includes(this.variableData.source_type)
             },
+            componentVarDisabledTip () {
+                return this.variableData.source_type === 'component_inputs'
+                    ? i18n.t('节点输入型变量仅支持从节点"取消使用变量"来删除')
+                    : i18n.t('节点输出型变量仅支持从节点"取消接收输出"来删除')
+            },
             citedList () {
                 const defaultCiteData = {
                     activities: [],

From 52405208dd169cc58c7336715ab0cd0ff97a1342 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Thu, 21 Sep 2023 17:17:01 +0800
Subject: [PATCH 097/112] =?UTF-8?q?minor:=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/config/i18n/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 5e1fcce652..458ad76bd9 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1822,7 +1822,7 @@ const en = {
     '清除所有IP': 'Clear all IPs',
     '清除异常IP': 'Clear abnormal IP',
     '节点输入型变量仅支持从节点"取消使用变量"来删除': 'Node input variables can only be deleted by the node "Cancel Using variable"',
-    '节点输出型变量仅支持从节点"取消接收输出"来删除   ': 'Node output variables can only be deleted by the node "Cancel Receiving Output"'
+    '节点输出型变量仅支持从节点"取消接收输出"来删除': 'Node output variables can only be deleted by the node "Cancel Receiving Output"'
 }
 
 export default en

From 5c4318d363934d3b70c456ef7e7d09d034c676a4 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 22 Sep 2023 11:05:49 +0800
Subject: [PATCH 098/112] =?UTF-8?q?optimization:=20=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E5=8F=98=E9=87=8F=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/template/TemplateEdit/BatchUpdateDialog.vue    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/BatchUpdateDialog.vue b/frontend/desktop/src/pages/template/TemplateEdit/BatchUpdateDialog.vue
index 5e4ea872a6..59377b9caf 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/BatchUpdateDialog.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/BatchUpdateDialog.vue
@@ -472,7 +472,7 @@
                     const { activities, conditions, constants } = this.variableCited[key]
                     const citedNum = activities.length + conditions.length + constants.length
                     if (citedNum <= 1) {
-                        this.isCancelGloVarDialogShow = true
+                        this.varReferenceDialogClick(true)
                     } else {
                         if (sourceInfo[id].length <= 1) {
                             this.$delete(sourceInfo, id)
@@ -486,6 +486,9 @@
                             })
                             sourceInfo[id].splice(atomIndex, 1)
                         }
+                        if (Object.keys(sourceInfo).length === 0) {
+                            this.$delete(this.localConstants, key)
+                        }
                         const index = this.subflowForms.findIndex(item => item.id === id)
                         const refDoms = source === 'input' ? this.$refs.inputParams : this.$refs.outputParams
                         refDoms && refDoms[index].setFormData()

From 477a32b74577493803913056fd7f114629cd0d15 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 22 Sep 2023 16:12:22 +0800
Subject: [PATCH 099/112] =?UTF-8?q?minor:=20=E6=B7=BB=E5=8A=A0=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/desktop/src/config/i18n/cn.js | 2 +-
 frontend/desktop/src/config/i18n/en.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index 7e8a53ae7e..fff8ebb805 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1408,7 +1408,7 @@ const cn = {
     '转换为变量和取消使用变量说明': '转换为变量和取消使用变量说明',
     '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量',
     '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护',
-    '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量',
+    '如何删除：取消接收输出则自动删除变量': '如何删除：取消接收输出则自动删除变量',
     '接收输出和取消接收使用说明': '接收输出和取消接收使用说明',
     '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出',
     '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出',
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index 458ad76bd9..ecff355d91 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1446,7 +1446,7 @@ const en = {
     '转换为变量和取消使用变量说明': 'Instructions for converting to variable and canceling use variable',
     '如何工作：利用节点的参数创建一个对应组件类型的变量。例如某个参数是下拉框组件，则创建一个下拉框变量': "How it works:  Create a variable of the corresponding component type using the node's parameter. For example, if a parameter is a dropdown list component, a dropdown list variable will be created.",
     '如何使用：转换时自动引用创建的变量，或复用其它节点已创建的同组件类型变量，实现将多个节点的同一配置项统一变量集中维护': 'How to use:  The variable created during conversion will be automatically referenced, or an existing variable of the same component type created by another node can be reused. This enables the centralized maintenance of the same configuration item of multiple nodes using variables.',
-    '如何删除：当所有使用该变量的参数恢复为节点内维护，则自动删除变量': 'How to delete:  When all parameters using this variable are restored to node-internal maintenance, the variable will be automatically deleted.',
+    '如何删除：取消接收输出则自动删除变量': 'How to delete:  Canceling receive output will automatically delete the variable.',
     '接收输出和取消接收使用说明': 'Instructions for receiving output and canceling receive output',
     '如何工作：自动创建一个节点输出类型变量来接收任务执行时节点的输出': 'How it works:  Automatically create a node output type variable to receive the output of the node during task execution.',
     '如何使用：在当前节点后执行的节点可引用变量来获取该节点的输出': 'How to use:  Subsequent nodes can reference the variable to get the output of the node.',

From 1f2ae555272771be5e517ee6fab0327d9a1557a6 Mon Sep 17 00:00:00 2001
From: crayon <873217631@qq.com>
Date: Tue, 26 Sep 2023 14:52:29 +0800
Subject: [PATCH 100/112] =?UTF-8?q?minor:=20pre-commit=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=20Python3.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .pre-commit-config.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ad273b602..61544f301d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,12 +5,13 @@ repos:
     hooks:
     - id: check-merge-conflict
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.6
+      name: black
+      language: python
   - repo: https://github.com/pycqa/isort
-    rev: 5.6.4
+    rev: 5.11.5
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]

From afc5b2144523ebef2896b8fc9cc01f42d840063b Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 9 Oct 2023 09:48:00 +0800
Subject: [PATCH 101/112] =?UTF-8?q?minor:=20=E5=8F=98=E9=87=8F=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateSetting/TabGlobalVariables/VariableItem.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
index 2eb3b43335..90cf0ea912 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableItem.vue
@@ -111,7 +111,7 @@
                         </p>
                         <p
                             :class="['operate-item', { 'disabled': isComponentVar }]"
-                            v-bk-tooltips="{ content: $t('该类型仅支持从节点配置取消引用'), disabled: !isComponentVar }"
+                            v-bk-tooltips="{ content: componentVarDisabledTip, disabled: !isComponentVar }"
                             @click.stop="onDeleteVariable">{{ $t('删除') }}
                         </p>
                     </template>

From ca21d14f0e3e88ccae85c8d47ead763988b2ab96 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Fri, 29 Sep 2023 14:48:53 +0800
Subject: [PATCH 102/112] =?UTF-8?q?feature:=20=E5=AF=86=E7=A0=81tag?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B0=8F=E7=9C=BC=E7=9D=9B=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagPassword.vue    | 51 +++++++++++++++----
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
index 8f6ec7cd1a..6af5e05773 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagPassword.vue
@@ -23,12 +23,12 @@
                 <bk-option id="value" :name="$t('password_手动输入')"></bk-option>
                 <bk-option id="variable" :name="$t('password_使用密码变量')"></bk-option>
             </bk-select>
-            <template v-if="localVal.tag === 'value'">
+            <div v-if="localVal.tag === 'value'" class="value-edit-input">
                 <input
                     v-if="!textareaMode"
                     class="value-input"
-                    type="password"
-                    :value="inputText"
+                    :type="showInputVal ? 'input' : 'password'"
+                    :value="inputDisplayText"
                     :placeholder="inputPlaceholder"
                     :disabled="!editable || !formMode || disabled"
                     @input="handleInput"
@@ -39,7 +39,7 @@
                     class="value-textarea"
                     type="textarea"
                     rows="4"
-                    :value="inputText"
+                    :value="inputDisplayText"
                     :placeholder="inputPlaceholder"
                     :disabled="!editable || !formMode || disabled"
                     @keydown="handleTextareaKeyDown"
@@ -48,7 +48,11 @@
                     @focus="handleFocus"
                     @blur="handleBlur">
                 </textarea>
-            </template>
+                <i
+                    v-if="inputDisplayText.length > 0"
+                    :class="['bk-icon toggle-eye-icon', showInputVal ? 'icon-eye' : 'icon-eye-slash']"
+                    @click="showInputVal = !showInputVal" />
+            </div>
             <bk-select v-else class="select-var" :value="localVal.value" @selected="handleSelectVariable">
                 <bk-option v-for="item in variables" :key="item.id" :id="item.id" :name="item.id"></bk-option>
             </bk-select>
@@ -104,8 +108,9 @@
                     value: ''
                 },
                 cursorPos: 0,
-                inputText: '',
+                inputDisplayText: '', // 输入框展示的值
                 inputPlaceholder: '',
+                showInputVal: false,
                 ASYMMETRIC_CIPHER_TYPE: window.ASYMMETRIC_CIPHER_TYPE,
                 ASYMMETRIC_PUBLIC_KEY: window.ASYMMETRIC_PUBLIC_KEY,
                 ASYMMETRIC_PREFIX: window.ASYMMETRIC_PREFIX
@@ -141,7 +146,7 @@
         },
         mounted () {
             if (this.localVal?.tag === 'value') {
-                this.inputText = this.localVal.value ? '******' : ''
+                this.inputDisplayText = this.localVal.value ? '******' : ''
             }
         },
         methods: {
@@ -150,9 +155,10 @@
                     tag: val,
                     value: ''
                 }
-                this.inputText = ''
+                this.inputDisplayText = ''
                 this.change()
             },
+            // 单行文本框输入
             handleInput (e) {
                 this.localVal.value = e.target.value
                 this.inputPlaceholder = ''
@@ -160,6 +166,7 @@
             handleTextareaKeyDown (e) {
                 this.cursorPos = e.target.selectionStart
             },
+            // 多行文本框输入
             handleTextareaInput (e) {
                 const value = e.target.value
                 const start = this.cursorPos > e.target.selectionStart ? e.target.selectionStart : this.cursorPos
@@ -174,23 +181,27 @@
             },
             handleTextareaKeyUp (e) {
                 this.inputPlaceholder = ''
-                this.inputText = e.target.value.replace(/[^\n]/g, '·')
+                this.inputDisplayText = e.target.value.replace(/[^\n]/g, '·')
             },
+            // 获取焦点后清空密码
             handleFocus () {
                 if (this.localVal.value.length > 0) {
                     this.inputPlaceholder = i18n.t('要修改密码请点击后重新输入密码')
                 }
                 this.localVal.value = ''
-                this.inputText = ''
+                this.inputDisplayText = ''
                 this.change()
             },
             // 输入框失焦后执行加密逻辑
             handleBlur () {
-                this.inputText = this.textareaMode ? this.localVal.value.replace(/[^\n]/g, '·') : this.localVal.value
+                this.inputDisplayText = this.textareaMode ? this.localVal.value.replace(/[^\n]/g, '·') : this.localVal.value
                 const encryptedVal = this.encryptPassword()
                 this.localVal.value = encryptedVal
                 this.change()
             },
+            handleToggleEye () {
+                this.showInputVal = !this.showInputVal
+            },
             handleSelectVariable (val) {
                 this.localVal.value = val
                 this.change()
@@ -229,6 +240,12 @@
             border-top-right-radius: 0;
             border-bottom-right-radius: 0;
         }
+        .value-edit-input {
+            display: flex;
+            align-items: center;
+            flex: 1;
+            position: relative;
+        }
         .value-input {
             flex: 1;
             padding: 0 10px;
@@ -269,6 +286,18 @@
                 background-color: #ffffff;
             }
         }
+        .toggle-eye-icon {
+            position: absolute;
+            top: 50%;
+            right: 12px;
+            font-size: 14px;
+            color: #979ba5;
+            transform: translateY(-50%);
+            cursor: pointer;
+            &:hover {
+                color: #3a84ff;
+            }
+        }
         .select-var {
             flex: 1;
             border-top-left-radius: 0;

From f674472a8720225fd628991f6680783d3ec073c2 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Sun, 8 Oct 2023 21:55:15 +0800
Subject: [PATCH 103/112] minor: update pre-commit-config

---
 .pre-commit-config.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 61544f301d..9ad273b602 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,13 +5,12 @@ repos:
     hooks:
     - id: check-merge-conflict
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: stable
     hooks:
     - id: black
-      name: black
-      language: python
+      language_version: python3.6
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.5
+    rev: 5.6.4
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]

From ed9df6932139df497ec7d59eb43b42fd3aae2dc6 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Tue, 10 Oct 2023 19:52:47 +0800
Subject: [PATCH 104/112] =?UTF-8?q?minor:=20=E5=90=8E=E7=AB=AF=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en/LC_MESSAGES/django.mo               | Bin 113735 -> 118889 bytes
 locale/en/LC_MESSAGES/django.po               |   2 +-
 locale/zh_hans/LC_MESSAGES/django.po          |   2 +-
 .../components/atoms/job/execute_task/v1_0.js |   2 +-
 .../components/atoms/job/execute_task/v1_1.js |   4 ++--
 .../components/atoms/job/execute_task/v1_2.js |   4 ++--
 .../atoms/job/fast_execute_script/v1_1.js     |   2 +-
 .../atoms/job/fast_execute_script/v1_2.js     |   2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index d3f262075143a2d30b51e84ee07c9db09ad35094..58e61dfdd2cdda35553a562a61cb2f216f06e1d4 100644
GIT binary patch
delta 25730
zcma)_X|P>YcHhsH#3V3CJV1gc@t*V~J<TJ72E>y9&GUqiKtdoUF$y6h1W4Ciah$5y
zPNjYA*j<hjcXgbUtKy_^JF(jd>7qMHH*V8(cifHbPPNM){GmU%sC>&8SLOF#|8@4=
zS2RgZ)jR8d)?U-zd+oLNx%Udb^}nzE>F-?E{q*ba-#Ud`!}ZXVrkMp@I=5+HUDGrV
zJR*KP9dDW$1<~4Rnj0RE77))*G|k(S0-bD{1)z;jwXM&bZkio%COsP*tn7ZiX<m@E
zyTATEa3}B-&wFeNbc<bm@eBLrVEe_UnQsQ@=7N@{&`-xVBlJ=UZ~#rW&;Tzx0*|Pg
zX)ia;)ZUiP$PHMrbni@O<N!~vlt>0p+JtwT<w1;{h5<CKpt}ap)ZT}kadqd_rpXr2
zh-E-&wRgj$ku^xY)-+e#209Gdakgm=nFE@7HR>IhG_eG|*PCX@ZJ;#;%`T|*^WLO=
z`;b4^G|Y=)2XO~)d8298n+Mtsy8XOuorI3NWdNn0-sZ^@6WDmONP%*~K-XFml=BO^
z;c8y*y~*SEV&g*7+~l?aG+cOnbj-Y7XUdGzXkILyKxrQ|&r+br3OWE<_*T=1z70)}
zpj#~i%2@lYy)#oLehxpESRj__y*Fir#`5iAVE~O<3f}DnrB!&h6`s5|?=;O!$kg7P
zYbMkio-?Wew98uX?gfp#>s}p$rZgz~Fu+T1@b0#S-h0=qn1P?mrKg~@(feQ545>s|
zl5~{CySh!o+HRIXQx25AK$#05^#knzIeGO$lkUPW{wPROUhD-vnA-8M!w+8L_Z8W_
zfv%_V@j&wUOrTAm%Yp6(0Rm?>1ik~l6JC*M2)qX81zH9#{B$D$Y*fti(VT-9I1?*y
zcDZSWZ9JHp!NY;H0!|cUqw@YzQGTl+fN-~6Hqo%JGOLBv39d{`D`<8gCD`IXnws^c
zbx%RZ1I?lJ`9SI&ptKwJ{_%BpI|p*`%3Oz_=I)k2a`;>zIlK^PU1d_a|IL5sIsQv%
zF{kK}4uu+Pu%-sLE7|D*XM;SJLhFJz209u@p5F<y6$A(@qd)w`l3kw#A*HEvW@_%{
z22Xw;{PgSHOwH}Z+>t<v@ae)k6R6*LAy~o9qFZEJel4Q`{O&(;bU%S+8w^%Zv82x2
z7<S}+W*}*f6x%BbdLWSO><FZV@<eHUHjtLVxj@{!0k==IYzW+)1)LmEXtbb>fizxD
zCLzy!o&WWuUX8!~OU{HJCjINAVOaeVcsvS?16T#mxxNMTP{?J;2^_aFTA5_QtX=oV
zz4uo)M1FrpMB-C|tIT!wDM!YO<fcG(!s{<8FC|Tl3x%vWBWw3p;ckhyZjcc?gp)Ji
zZ~ha~k{MbSoW*eV2a=p!EU7eVOS$cY^bBOa|4)6=3kHqUm||&GL1Tf~FSCy1Yy`K)
z^7M@_y4-&ZEqU7?WHWCL)lG=&801|#mXB+k*Ux^M&qi||90JSK_kOjqU3c#R8l4>C
zdR8>?o)xLOI%pVP40CmMGJO5<uk&Rg;z);r4F9P2*~(EkA*Gpc#gcqKW$rFE?hmAS
zdL)pN=j^9ljfNn+V9&3xCi+i*t?Z`Jt~~T;_A^qUyYE`&J3~%=KU9#bvqs@k;Q?IV
zBpMG{>sl<c-}rSe(mzZ3qolPAcyKT@1m2$H(b0-GFC;Zot6H6Iv$loJmOvvk9}ILD
zRO%D>TmNj(jf^80vh}oTU_SnhGHgEoIUY4F2!)j(4y;{57t?uHTl_q%N%_uimP1q+
z)0yD*KspiJ6X+h$u|V5FfPz2y60YHm!lAxD20RswuUCSKPltMTA&^V==S`GG6w#2@
zIDg}}nr0XDW2kh7qeW<WAPv^$K-X%2IZ+gSERng_gBQ2P2NPrWO<Ldj?Qja(7ERLn
z^MB!S`7u<d3mT$L3GV8$2joMXYPiNf1jPQ+f64m?)Ek>hz{zM6dL@v0@NS?(AV6UC
zG=TQA{tmb`cvAK<5b}<#MdJQVXZ<&Chv0OWfWTLe=g;ET<w9fr%`dy_--GHo3?&Gx
zEb}2l+_~9~e}}BH`am$%jopFN-_t4B?yhxds$<xUETSP@551h-Rcv?%n}FwuoQePc
zk8|z!zf!FxS#-_So2WPBX&{%nA&`5d4nG{8wLF}`S_<B<ws)H5zy2%6Un|CyQ{7oz
zLiJ#1Dtv+w@~$Thm-R&;Cq!LB>rt1@kN&l%<P&I^_dVVYsK3FI+z<W@YXSN{p|Y{Q
z#NrIsbQ}(zkhgmwCs6HmHJw8+WV!M5(eKf>iYw`F{@bSM{lc`{t~z7ahGc$Hn3)4|
ziBY>Z6CrOVLI*-l$m>SPZx{E0yokj^EF`%(Ap6()cr6;_^h!a1&*1tDpdIa7|GvC<
zm+TKEP1<#V;+A_sy?S5GJ(x0r>{B6D7jwD#Z|}JZ{t&8Mx-F!XU;4Pjsp%D?{`qjL
zPI&XE`#cU8mC(|0D6sYbiT~gauFCROQpw?ix1#YZD9`7I9j#Ztjfm$Il}{H_8FsM|
zYAp_6t--dT9$5{;M_+9kIS5bcvC%2OoxwW^ass{x`pZA0c0ipKn)lYQJbwE>@ZJsm
zF;sn;5*A_)=x@^fBy)|Dq8GFV?;)#ze4J88-94etW)0I@LeP%tm3{>@7M6~Hlz;Ic
z6D^k8Yl5rH_nsgFUX(9@JkrXCR!4*P7k^wn%_y@OW+XU0kW8-(r1##3eFl^5en(o1
z5^ZrEo$~r;@g@K5uldCBW2i=1f=)1ZUY=$b9vQ6s6Vp4Ekc*{^Ifcb*-PO1bsm9X$
z&Y#%*PoUY2!IP%aD<-=e?W-arjgpf`I#+K#su67*wLkCWo<wyyOkE9v8MoX%W>bEC
z^q-mk+LYY-tfu(9(lt$<Fxl)^w->^iG~O%-@PEa%FAe2){|kFi8J~LjNz%1T{vC+~
zy#zE+N5YfP`9O8us{PdXdZa)6x<AeO0Thez4pJs5EJ<TpLCzNO78jm(fE(d?x|V{x
zB2*<Vhg{ssgehld1WTiMcOdQC3tj&en9G<9xRWXtkB8t!5FoJH|6f?8$LX%H9ioQk
zKv;-d9_k*_8LTxYVIL0_PXF}a>MqCL(InUE@ImSTzA3Crzm>@84StQ)J(%u)y`*7I
z>8sbylnSlcny(_&^7+!EV0b(^QH)!u6W)Azr2p?CG%4DZlMbjJ=4UFCDyc&u`@&V+
z*7Qs8kB3AZ;_OPg9)&sh&#gc&9ezD}7UVP5Ta}u^@bu)+ea1<B4qIPoYLVEoPH%qG
zQxGp=0sn%|*?J%qPTQxt^xReP)x&<G-Bkh_FX)~?8dtybDEr+t>2l&w{S|z*sQ8Fl
zyRQeb=4%0>7Me0VIgkzl4r(1}PVg>+yq4-rlTO+H>b}dNGg-yed%bv1hB2X+1F2$N
z3RKQBbO(mNl8csy!Cpc2s*r1%-Tzv-P7b|;hY&`!|9jVd8MG@*Yc|_<odjE~b>g?3
z5s-_O?0VqmgEaF#&XxYFSFM51!}a!8dVrz2XIJZb9L4oGY66^$Ld(3|)O>ZSXbC!E
zxjGvW$L(jF`6b~w*OYj>5N}>62>In(qp&u3@~BZH|E2O+FqP-t*OcWKgIB+s)|0ac
z2?Ro>t`;jQzLIruNXVTNP-AEx;$3n7>#P*JHC*#+=ju@_Q_I&fHLhiZy;3C6^-iZT
zaC)iPCwrky5xrXdsh-e@;He+}WS};#_BJpjUyJLG)bh77{za&6sIlVou|&wTEB7ul
z;%zKpdK*?ko(i7!J%7SkTkK=}*I8ZTz7U5o%(Q(8yZL#+@`_(CM`e=7Q+eVSYn5jo
zE;oSudHwpj|Fr@2>elddFUT)DDp5`%CEVp`)r(sj*t81k%bAuh>`hD4;Ci6WJ%|AQ
zmFq4jvq8^=S-Ef3>&jS%SdY)cmArcFmlmbzv9KrE(*=1k-v;lp^IxCWweIff^s!#6
zT7GC}8rJDl<Izf9A<YOS1>|uPYVA4vu2=Bq<?TqNph0&vn+x)kD82mklrra;a3>wV
z6+Q=Q-Ki)$iB-xyK5KOTbd5V(iE6)Y)ns-!%nJEEL1<g><lf6sI^K$EZMC<S>K9V=
z-Sx722Iyf5i$(kde3yxxAa-i%{DYv@+@lrN==snp!v{lF8`6`3>ao>#2Cao??0*OF
zHcdV_)iYWrVqIpHTGxjKx%5hr>`3r523~YRKKBYa@#-}*@cuIkkv2Lx=og(E!>m@Y
z&+f-T-bge~t<LERt2;h=zEyE0?T^%QR6d*ka@-oMhfes~2t%jWI|6Aro(~kaqNg*E
zHy(|d*110ucCKwk-??(r)#raCLwGi7EmnPKF&UemBPmSJxsuE$969seR!`yQoettu
z*?tCC7a5&UT8E1(tlo}Bc$#ycWBUoG@o~awefZO~I%Dd!AT4{K{sF3z^Ro=fv<<4L
zc*^REr{4N)RVnC?b2L74O0Y`;snuB{6g9US+t0}&=-KSY_t}s15Dn=%H)?sAZe?m*
zpPUaN;|%I5_7}sTB7QxPHj;M&ecs&F1FPX~9oB)=`0+|cg{YLT{rS07EgXrFy{u>L
za%Dv2bbr%{U&md6Mzp&3zBoFfde-SQ`z#O2zV|*DjUU}i>a;%;>7!m}&bag@cbd)C
z1Fbdct(!BV4P;8EdD<M%R?v}aI_>X7K)G^3*#l4xAV~EG8=#yOkhVa0y)Vz%HUYi1
z*Z}2-fL2>-fR{G<yxyI2N0gb@cbeUP{YbR<#!ho_GRN7eF-mTm7T9S&)M>`ey}cU8
z85N%C9=&*Hr&);PC1@UthdWKag@LZm(*ZDZ0+bV|=Ird(=H9R6FssvSFb9;K1*Kt-
zikJpx`dIujjZdtUmvBHia3JDIUfO_{$A;chV?%xq3Okp^)=W%A`n3_;z6_mWZBSYS
zWhnyX?hhKZT<>qj#-AsG(Gm+Nrvj8qasZvPCOq}_#GGna!EeD^!mkU?SPG;FZytm8
zPR!eIFTTLpM^KIlD3bz|wHkDXt@J*aw{13>^EwUluD*lh$%uPz_Wa?WgD&XAPfx|!
zJb&nrd><P32s{PNF#+Yy2+H1qvc`k5-=Mz6!i?oh^Cxr!T-a&y6%~|A0hF2pNEtI_
zk;i-#iZ-0hpsYHeoTJ{H1uK;Fi#yFJ`vYkiZe3!!AF5s*Px=B>F<yY?A{{^(54_Ca
zf!540csU-RslE3XEIC9BOUsCW(hexIet_3+?W6n<0J)5-w`hEyMs8VIVjz7qWS&ae
z+~u8kGdTp!;seS#0A+TAuCpGfotF>Bhq@Y>`71m^Ym#n;Zil}wpYaCDm_RCf=H<$U
zrw>|YuJo84gucV`3()L4DD^?|iM|kfZ!>k3L!Sv%TFlMo&CpXk?}BE90p&6Q?UgKF
z>Z$E@s9ar!rul5a5h%+ND33BA4Tv%anAr$YeYtLpSItbQW_cD=v$PI62HgRbnOC4$
zA3)jDY{M={o2-$Xjo#z@SP0czt+=PtjUS(^gCWO<Qs5crgFL?k&E5>4EQ0X*DANdD
zA8BN+x!0WO(4{=jfy(Ay=#b8SPo%(EXs+i0l>LI2YY%iD1M~}|S}^}UyI2c7#q)M(
z4)Xv?>+mw{`{;kpEKD^|zTfjQ6{@0kD^zp061oa{1e!|_l<za39Hq}e*#%m2Y(SdW
z8`pO2ZsA&+SP4}?8=wkjTR!iFs;9@Hiv1O+cBw1b&RBr5UVzdKC<6oK=ne30RQ_8z
zmj}%<eA7A?`n!{^hDu^9RH<|Xsz6Ub)sr(&?07c^Zv@TV;8V}32b{LFgK{N+=Ax(k
z2WI3T?H@yEs|Smr8tnB+w<SFcRWMIM)xWdQ$<Qm%tURE5;9woJsh|fyQy*;W`OXKK
zfAwbLgnP3EDu)N4DqJV?`E=5=P|07;XUq?vT#WFtm!K?)11QrEURSAc!zR1E6{=Yu
zfy&JSsQR}Ys=<CB`P-qmhO-}Z(t{3K1LvWK9Qp;Q>iIj+oLbN*95k~H)CFb{1?Av@
z6vj;tn+`$k?k-TqK7caa;H4{&jtQMdJfXKkmA*@%Pe3Q2UK8E-fpUfe&`SlW-!r$^
z;22cTtD%zJ1ic@+4XWwtLNz|v07=p)y8|!70_9R{5$}G$EEWTTGJNe;n;U{^Lgqka
zU=dWSWHnTMe*~%k4nxPGr=ZGi!Wcjc3NH)()~*Niwr!^Kp$g_cs1oNu(#N3+=vk-&
zIG6MtX!aMRkZ=i-tWi!)%A2RI7+sU=f1o)t7G59q4GK-#?zUT!-U-zZk3rSG8mhzI
z1QbUg?%4*~Q4Wzi=zlI1n0fvH%|Yd+ogS0rP_;}zH$#u+GloDa(ngC5%7mtMJG?t~
zxePrC&2E756x#*ncY2@$HUZiTTD7~pzkyUba0I#xn##Xe+G!3*VbKOs%FW#CNm&L}
zx~_#PJ0_q9p}U~j)xGpTPs}hgZjg!(20=Nypqw=jEwp#`wTS0}SM9I3U};SpaE09l
z)h=)Xsu8|$fcmHEjR9DFlywYVAE^ho9&}IchN=!MhALe*Bz+XBb^baulM$3%7(lt?
z57PgBbM_Fywz;fac>UH)%K?L<xTPEL6zJ?jwy_AR^|BHw{dG_!>gMF{?*bISv21uA
zs-9hdE{0+fBojtk3t9@Abl7HBK-J&-p~|KmP)+7VXpSIAM>nj1GHF5GEImNQH|>bS
znF&>1EXe1LP=&P%x&ZnFbU74rppj0C((t1t(?MAQK-wdx9`y)KhhnkY%mzqpIaEWl
zJL%(4h4dm+BXkamJJ4m&L(sF2l?nlR8V>CsO~B|e2fP%j=Z*Qi11c}alXlMlP@@NL
z74+)kE$@XB7T@(`szEjTXQ0ZFH=vrFx1qVV2av`J>jS*Z9(b&>`0N*`!L?w&IoAWN
zig@O!PV>ejzVU(PkUm|b%y)R1(4e#m%E<z0OovaqZR~W{YyBP=xTk3y=wSy_c&nc2
z#INI!0LlE6XFU$LLbvfe3%VNm40MIHL0XFFfU;Ad487&C{{fd2K}EdyIcM{Rq<f$m
zfhVCF>{pY25t@AkW${WG+zz00JD{Pw(D@H$)<BSE@!IFTY=)p}Sp!wQ-U(IjPC|9o
zK^L^KAQji<1%G6A2zrfMKw07kcu`~NKg^svP_Fa=ULKs`NoD#O_xcW~p65Z;yG77l
z&~?!44oH(jm>{hfBW1w&i?-5T0nq7pBUF7n1l<jN9-1FQgEB0TlraO!us|v-Q(ki0
zLa1hYB~<gj9;$)f1C^g+P}z75%J_7fivZ2yWoRClKnvmE29yp{%DmjY;AM(|WPHlY
z=G+BUc*~#~o2~i$C{(^)gDR-YFO&ai3|6`VWgsbzQ&6sNQ10EJTvi|@?yOflCCieo
zhAMIIhmJzGLS^N7sB+`{E9`$7+P7ig1jHRYn{sscRmXnrHOEW~XtrfQ_ZF04!^>p`
z%9RgN08`F7$A+L9kNHr^-g}n*i!lL1z1j!W0G);^($}G?VOOA|P=WxB7nIWkPq{MV
zb!%;eYIt`-RV5#VDkV=q71;TtSnC3F4TGcvbAXq9f|nBj+A<(_`?*f@9Gp?8++hKf
zdZ5gaf!3_8=jeZ~O`4Y!W#z=8Hyrh5sKg(GjzZsrrg2biuOQsg${nm}+J4@H{~VOM
z-Mk4Mg}w#N={cYCj}pvcpx~WvmN5Zk|3Uf^4r!3Ge&z+I({ku5<kdY;%{mhAlso}t
zo`7=1LETeD(C$yZ+Xk}Xav)N1>6Mm;On=4jP}V}=cd+&0&$qJra;n9HuzKq1cNPxl
zum3?AmojJ3sKK8eNE4)Av2>cVAbnHXI{3~nv`C*9`t>Y;O6079^lg;uvwnZWDYQ%T
zlK~fl0D-k6TAbMv{5kMH{>AcLiidP=G-(;@>qe)bd!+$iA3Pb<H-(-UeLL(NdP@6`
z=lG>SN{owva!&{xTSdmU83~w0IzTQ6o7dNCUe@}G$tPre>)B}*p?faS#k9iy<B0W>
z5(lEM+Fb$111Y2j0x7HY8yHtP2dq@mSIW)=ePdP*@_}{e0|e&ALTH~fI#0X*8a#ag
z=lI_Uq{Ct>`ecQ3pYJr!z?>AK_k;A6L|GVt)!Ej-Tw{-lzCm_|-J#!J`wehWFtx<?
z22#KDeV3P(em>(F(|4do`uez3g1}k60_S4;3}0P^8GO3fe)n%TZNq3Kq{14~Ds9&V
z;s(}ttb_jRG|3$-WE9JP|5az}ccFUu{}Ghl_Wi4*c{qjiBM)zl`i|6->y@V=aw=;k
z_C>3zkkcVcXmD4;1q4<-`bn=;o&x&wuWzZ$)-M^{vC%+EKrby#%7)UqqqOR~2j`A{
zeqt-mBJ~AUaC6%(65_}FXJL(oES!NgpCA634gV0TK%yZ*V0myxi90QLnkttXnOhh<
zZ7KH$QZGDiH!}Y5;}y@1vrK069dz031J@m?-Pd_0XW#sF$NK}Q9EEZUl`Wuek^aYn
zb`<wQ8=A*mC#X%)s*!VDRUy+)-uwc8IZ&Q91M5?JK;WGfRu<cqf_yI8b$IB$88F{M
z1J{}R1R~%44fjZ2nEFF-*VI+Cy&SxHZ0d5Ir6OchyFU5N!ToBn^51zkPV+q>sQB~~
zH6MDN)e29)N*G+FwcC1G=k6TxhtT}Sm-y0(ZPY92IGlH*jhp8Glizaxcnmf>co{-X
zM$4C}kN&wgbSKw5I4<lOGaIdwd{L#XE`0pk<<l;ouy1kxYXZG#Xq23q+Uh*fmqBd|
znzE@8<$BP4fpmUyzVcYfYTNb>qUiJ!eD~9dq+#ZFGF_M&d+&L5ck9Vh*8TW*I?Wzv
z*wM;d7f3tbRVR($pN8+n_z1|8Cq!ekpD=d)(faV5YvsCzDCqtc*Q#x|TA1L*(<fi)
zG;dd26=4sNroy#MgSjAdlr!4{X>lI(_{-IaU@ixFgU%0VgF728An;c3Pkz^HTfe_^
zHTQW#Nq8`LLf*Y}jBtl8fi6TVH*mo2s~``8+JpBFKtEw>PgDUl1>R#<f;?SyrfNPB
z4B5Iq?I7{L`+GhU%&d&+Ykf``<iDM2(R6~Ry?Qv%DRlM2t@8dExL$VkQd7D5v)?Z#
zau3lpp`zf20x3-WDAlEKwZ~sm;hG}kY*HV*t!OMgf~qZE6Lra32N#QBR5SVge^-vL
z1w^AvdS6wZ&kkN!z1<j4sdp;SW1Nya)^#<L?f>y!G1+O3z(77!?gJkPR8LB+UKa-C
zs5Lpw_aBPwFr*FZ2Y*mrKn5FS&6QLB+!rm%{@AVvBkHqvJ<WkLe>3Q@XkD%P=Ro}F
z;74EeY4rP0P1RpO^B`FKm#;R$gu3WzsCjY;mxjl5A82#PsT#GOs-ft{Ci#s&^ydCO
zXbN_kbCrfllxti)^Vq9oDywbG;ko83cfa=^{k_0nL5G$99y5te6a}ZA4kk_nl>-;C
zF;LqP<xz_j_a}c;K9&hfsynVl()WzWrjNLq_^zvj=K55qECjt3C_i8byb|swf9$n&
zeQ<Q<UKmIf$+|p(xd&fkZ<i{st}$9)ZM(Qye<2(XiRG*nilqOO@*$10RjtlTFK><N
z^x!GoTszdwrNNU4?-g>=Kixm7)^4LQdMX5!K!Cu?<rZsgwO9^5{!isyyqu^C2<>`h
zQp2Rp{SNXnnyb6!pX++&!b0N~f~OsOIe+k#&_+~-_S%DGo6{0}2pK*F6DMV?cTaJ;
zSc=8^3D8YbSp10fK6qqEixfrfY2VMGQ<RDfj#k)N@9!TO*W4o0UbfNay+s4xtjDzn
z9|!FxImp>kJ`Y-HpT?}iU02aD-h`^EzpkBqvsQt35#Dll!gpFm;5kI@y$`mu|FtpM
z;ByhR6_>^r`p&U3-!lep*mCf+aUv@dTp;YMwMUSyDQMkS+qEZJKE10bN)TlfZ?$M|
z&(;~Lad33)hVG?B*Hgv$)ZQ1i4n1qBa!)CqGk|SY%P=i>M@pTf4G#Akk|W{M=Gu?%
zy$^N`-D1gd?{&7#P#z$$E4AGw8z5qKD|cc!TC6@_x1f1L8Q2$)*<R!T<=Si+H0Ko_
z_9-SjF2~3mk1NRTo<Z~)p4QSn)yha{=e`WxnMRNWSz{_1i>%Lm1y5V}TVuPRB1>!j
zbd+L}Y}qRU2+u-jap@N=@WzqZ$loQK1o2^QTn<3cHfB2v%lU2&_t&tLl6;ugLi3tQ
z2&_k7CVzISh6DWhi61<~HC9ZoAxK?!7dLvcG<S2w%F8V)+_lMA-iOQfDry<y4jLYy
z{R)&e-+4A(okmz%{XX^ne*3Wg1xD}A9b-Dcm5wa7UT?>aCCWN%J<H!x+E4O#XLgJh
z<T^ZEq;)zTHoFVRtSh!?>UYsxvAFh|s1-X8^{v8(=jZF2p$z74cZ{r=3iCXFb1|gL
zs=mMEXS?Vd>n+<k<}*@X8p)^m+fl-qYaj5|7KGK_rJW-i9LnRg-G@~<eu_W1z84$0
z*);cJVU62*AMRX{zV#t>(ZP=P^|_vu(z3+1eDBTKb^jV`ASzw7xFbFA3^$)s@A9tk
z`2%wBwcc#uIfUogFNJ1A8+%$@mim9UYsM<e-k!G8K62Yqb_24>O|50SXXqGUc5@o;
z%_ZgfK0uaF{THwYulM@y*yhmg%kEDZIBC_W+&vz?TN915Slq(XH1Js80#eu6mnFHs
z#`7EH>C;)o4LpV6J0`%r>3gF7ror<z#a#!w3;exmIS{|#$WEXKcNaYUcXRJ75>M43
z)6!nZ=hJPLMNXH_u3WcfP%rv1!us-_A$>@L+A@TX+pv|3JFS^LJn4Fqzx8Eag2l~&
z@?~ptJ8jeWo4_JmI4eOqjq3XJ>%D1vXX?~hn$6C&nueBPU?qRq*4wjphCWOrghOV=
zfA)3);|q{-OE%=wgUG&3yDo=OeD=P)cgAZxxrI3HEjIXKrn%MK2HCD9(+*^T+qu7q
zuKv|RwxRK`wPc0A2{*}3Z~DIRsFUmVEzz5`dry18aGvB(7hfA?%zC=hvb|r~*Y4kr
z$eNPSwF;fx*5m13&=Zam?bkwr$t{tKfj&~x;k|7>yvrb6_K?W_Wt;swLmUt&Zl&<J
zpR80=)iQ||zQE5ei{mc%ezRrGbwC5!(|LMDO6`SOMti5{4*^{Rq47Kemrw9_#OBbs
zHYHOU&SW?*TNlYqM!hc_80vj**A$gP2jt*sT?Eo+N=x{A!)?9Jfg!)=!Xr<SXs;&$
z!zs1uz_8{Y4qqQP$6FC7Tt^812-3Qiq!rqFmktbT-O#dumbYl(so!p0?(HR=uN@fH
zXV&N}aXV;z${a16+XuDMrrxUB%bvKml6}8eJcF3LEju{#j&@nW9^#MRvqaO8gRv9w
zr2pKvE}NW<Ol=%o+GO&*gJXU%y;`at0O%HM?uTxM+QKEQ<SQ%a2E5E7Nw!FqKV*=6
z-qMZ$saJT`wHi7TX<bNaQ?}8IR^ZMrk>c0h7f`;$-(1VsH20U`jiia|oSl}iGvASW
z6Eu->dJV>p+lr@Ell1XzUZokK`WnWRF4}t^9f~r+)0jCnXzV-E)9j$HR~*{MCTnre
zf2f7#ONGaSd=(ovx&>=9`8(X@F-7_g;GHjOZucESfMNblAidK@iz~a4<Rj+Meza~i
zPCxI2cIW-x?;jq{ytx~J^09P(fKx$+CwqcW)#d&_XdY4yU{}ifX^hs#1{}|}rh^CH
zs4r-3>UImdskiaSus)Wvc<;oKm@JI*oAc%jGJ8u12m3BT`e5cJEa|!nI*-4p{g9Es
zs_z!kb05)iw<E9&n4f9rH>*0$wY{{;lyt*WI+z1T|ER8SawE#u!hNI|J<k*EzT1iI
z`rcdhXnXv**{zn8bFKsM+RI*UV~iK^H{H_q<GVG%D^RgCcb>Nun=3)L!O>Ns+FBfs
zmg!9aM9-nJI>SJvkNRdnwDkV=(XrUeZ#X)vy}?%P2#L{@zXATZ{q!~;9l8@qWUk<4
zBV1i;v-Ql;_#X^7_};G^ov{yD`$Eckg#-U}{^o}T-xgVuhk4fWbH4|@zd7122kbar
zB=gf}5I<>Z4xyE=-dI{^DelK@llvqj&cM;-c<wO@PBqZhMdMvGbRm5h=7>$15e?Bq
z%X<C})A~Hz;T)dQ<pD{!{pa5AK6d|%K1ZL+7p>mkJvOYj5Tvh74SouzcJ6oaHv;!%
zG<3oBp!HTA8;Qw1aBRpQN~XqS>t=^`*E+N;;BQ91v%N1K8_|T@W{K*6QSXCeLlcgJ
z`&E`|PDUoeMN2>0Ug!AuSg~Qd7Rz{3qqq5ZTVjedv8tTd9`}CSj+gdVX@8uj1KIYh
zJ<wwLeMT8i`mzifkGfTCu64clkI$HGy}q|OPJT;%^{2<b@aMg+Tps<SD=Ru5{__6;
DgyRB;

delta 20741
zcmZA92bfJ)+yC)>^v-BwbOxi1(R<0L(R=h3y+lcbAaeBHHxj)QqW6}lL5P|NL39Zr
zj}inSdB4B2Zr4B8e_!v)XRUjcz4qE`?{j9%^WIyW@aT&K!K<m`&GI-Z$Md|*STLvO
zt&8t@<*O>{d5>CpUN}C+odM5F+{*L*#e=OqZ*UxJ>v?&wLI=-VK)h2&&#Or}PG`?s
zL%%v*J+B-7g|)Cfg}Su+3RBX|dpUhU{fO~BJTEu32QUTxh6VAtpF9v%Vq{M@hlS>L
z45Rjxm9LvGkW+i9dU;-Q|KmWm_&X^r@fQTL#g6|VbUtsExdJuDHcX30ktOi1U@E+U
z8S#mk+)o}SDq>l07u|~4s6CAu<)Pm+PPTlb`*_}Gl#XK)tl8J|8skDtf=|ph{;D{Y
za!l*zd1;9HSPWNT7QBpM_|gxHTR-CRhn~k$de?9!R{O~F%Hkz|c--)?8T~ykiqdY>
z7&rY5aVr&>^s$T1L9ONiOn_&QHTN!HV*Jg@kNxO)QNdvYJTDp1Ip#{tM0tyO8e34l
zkLj@5K<+%Y!t^)-b(T4((HCPbT!YQ=G&aP%pEw7j&i6g0*8lxXM$>y>6|eoc@hc_X
zGl<Pd^psyeeoXAJ!LHK;^K;Bj?Q+zlzD1338Pno@)JeP{o|gfV`zPa9iui((qF<ZG
zu{PxkesqHH9GgE4O~~7aYIP1Z)-}wEPyId#V)Bh1>dtf@)#`7of{EAxrLYdp!cqR&
z1mVG{K{w`n)Q#GJn$Im%@7JiY6AyFcy!amF5>}psjVRB-n)m?2vE*>qz8)r`+zK^r
zCwvEoBC`p4-;mK=d5*eU-U!z*9JSkWVKkOREnp`r_eV`^De7(>K%L-M%!L19EM^+%
z?tUAy6Y9cxVg}CdeG<xe-gIlQ2J6#c6KazNM!62D%q*yh<VUuLSJvWn&6b#hcvsZK
z$6I`ddDuLQ2{^xZ)dF`=EAa$1@N3jkryT80*aa0IfMswzYHJ-rUD3~|{=ZuJk@*I-
z|C5Yy^<kKWawZHaQ-(|=Hbb3Y2v)}_sDaO$H_eCUYt)h_9_yAoCu#x}QT^UEn_>dW
z?_0S$hAw0*>#xjs0=n1pt-*S0um`o&r!0Qe;`gomkC}9wJ3$6i`)sHQ#F*t#=c$Q_
zu(icIk7NC{={_W|DZoVVDCKe!+=ouwiO%e11=QwhX$~-Fpia2n++!X?t;l)vnt2a3
z(LZC!sAJqoo>v4@VKuCbdK|~$72Jy&XwGEUei`bDHcs|;Ce0drWZ}QecvIZg2t(bW
zC`^X$U<B5+a#z%y>2KvB<~VbfxzyZ%YQGn|;~~r$@OpaDQ+Xf=G??ZZ48a1FN1#r;
z9<^8Zpk5DWF*Dw?c!KG!UuH8B2U4FOwNOjV&C~sq$<qh#Qq<-DZKjyv-YPjTwA0M)
z*noC@F$EsL)Og0cg__=TERS)0TPM_V*G08&hMIm4<o*Y}VPtfo`KX4=FfXn{4fvCJ
z%Y0<MLG?>A)3pmj-Jq;iE`?gRs;C>)*PMX4DKE$TUTZ$e$*AKqGX<~o(49t2=p9Ui
zwNO{k*zAJoC=asoRC6h6;@f8V_fljHUZ<#Gez)*bGcenAPl0Nl3w1q3tX$fxhS`WW
z!Y2439>b$nKkaij&H~f}wFNc()6SrGmrO1KfiGM|9xP0`l9l^nI?ChCMdmitMm&M~
zczAB6o8!hSj>U<$z;|(qc>ya?&OTRP3V1EFC)1C>F4Tz&%;Uv|tx*d)548g8Q7f>=
z$_KGF<<qEkndUnSVJ6D4sP=78{X1E?AMT<23C`gBUhxImXe=2{!Ws)*#~)Ewb{X|K
z^9my{^CI>umPEZmMp^l|l`|}M&p=!A1JndR#l|=lHSt>*Oiw0eiJM_{)Wg%*d>^&7
z`e7IjHYcI3Y$58(R#<s6YA@}w_#xB<oU!sl^EGB5o_HzOtpRc_bpyqqUIOJ&6RU%o
zc}J@sfO#p8M4f0Y#^QF&fiF<wWnAWr!b+5jqfXc#HKEC<J-2pQ&{dqZ2EU^Qh`XFG
zYM2UBVOC6oF{pv6payD<+FV0q!1E4cF3QPQx(OCVjaMGEVl~YMsCLbQWb%>u6m@S`
zqB`tHUExV9U%+jYZ(}K(yUNv{!#0$!p!${l(pdwwa!t&x=3uLzj76Dn>bYbNk~z8B
z1*U!FmrI*9czdlI|2}HmXQ=VwtaB@!4iztDRy7-%ZOxuol6Ie1c>`|dbbC=-t<MHG
z?q}w7XJc<UnUplxfqG9K#RT{#>cp?CoNyx>nsN%%=3a=s@d?(z4x8N5xO$V{FI{+W
zv%7!A%sQyiI%8`5(8{ARit-E$$K9A3&!O)B9aO)6P`4@R7B|~;sC|+fwSmi6xdEzu
zuoD>#)XyAcer~S8l+=HXdWoDw4RjB6Vs9%iEQr9iI2e22&sYbmvPrbw(^2O+hI#Qa
zGSQ$HZ@XK^6sQ@cGjpOk#GtOcGHShhSbab9GgP~YsC8b5=`i^Y_mgKNHl@52HU0}!
z`}jMxarC&6QHQeF4I7{yrCq2izi8gY43uA>>ce)qfeK?Z<tnIg`k_uV*6L?kc@^pc
zwpw|Q>N^uSMn=!xWz@a%cDsR-pa#rh<ziN@Znn1ghgKeK&O=RLlljeVe{lxBxloKC
z{5R@OrsJKjg(!l$o~l;vi0VE7^+b%c@(k45eGzJ!cg%<8OFTzB?p~(M6ZI2noTp!h
z&J*+k-?$T}MJ-ri)Ie=f4ZEQx^szb4oM)~_wL5@Xms1wMjk-~PS$)ENZv3>U@hW3h
z-RY*G3~yb`M1_wUaD%xQ6H)#S!|@zyfZxqGsP?J$JF}Si%~F`uV<oX5HbCu|p*So^
zW;PjZf$#(F%CllB%6U;IE`#b&8TF8~!U{Ob;s?#k=2I+5ee#2DLRC>0)(}VI2Ur>Z
z#Gqzg@{l`G70gPx4(fzGQT3y6Fitm<9d_-<qE=#>xePVI?Wha7hKu9z10ZUgvER8{
zFcVci_#Nw?gUo3H9q}<P!luXh9)r)YO@MEiC-~^09OtCF$3fHtXJIE?k9x|}oN^EA
z2vqq#_QaN_-3gCi7Ro=MCjR&|>#qsKJLA4o<v~4s&F~Za8g+t_XWf;}L(Tj!>Zv)4
zW$`|0<?@_!4{bHn33`}AQRkV4g>f^cz*|8w8Oc0B4V?T3XGSy1ERNdUv6vW}S-gYU
z+Z=*A!8j}LvhoqsCj1N4Kkkq26CjwJOc??>a45Dy-MgPr4X>kS{yS=d$<DjyJpxs3
zXZAupZi7%y$#`57hhHjU6|8g7?U`wp+_-a)c0q3$nbdUHgH7-h>dhW`+4Fi~ZOnx`
zu>k&p(U|y(`$k_1)xR0$#vZ6!F%31r4d!0+J4{FXCrqs8{{b02X3wp`zh<&u+yD`%
z70F{pTf8`GpjgyqY=&B~zBmF0qbBgi;z_Q$6-tY0mrLsTFGNOHP#V>tHfkxGqc%x5
z%!mUq3}>L)FUNei12usg7=y1+dm#TcH(o2$M7vq}Gt>o5#L)9U!vc#?1FuBQa2IMq
zhb(@^yk+s{X58zpUn<nZBT@Z|neU+Db<H-Y34L&#^;g4@Rxu5;QC^Ii;eJ&8QPjkK
zM3sLtpQ7S{8_u+-fupQk0d?XAs9W3~GhuhsIHPX_U1kOWbzEd_vj!(nFQ$t)1Iyp!
zcHwE%ru+wWiz08iTTvACUTBTwZ~&IY&8YT&peCI9HovjN+(9xq$h1P;!=YFMXJab7
zijnxxOmoMrOexeAR7CBK+L#5qpiVFfHSXt_3wNQ~U&ShTAGLRaF~7Qd-2&C1quCeJ
zQXY!MaRz1#a4WC}<(t3p?H=pibrZU4KE&+ApQBC`e$Sn#l{p%9o(;&Y33_|U=$?OX
zK0vKRvfufE3v;9H*}JG))CtvoFm}PYsP{qOzI$)PU@^+gurE%;toRz$Khpzek&xW~
z8f0{WHmHV!%r7jy1NCwG117^Hf4JW@h2wC_!?6v<{h#}Xn+{l!@>+Zk@1r(h<%h0+
zBP>9<9j4^`-b6CxaUN>Gi#QltK5|QY9(7NzpjPG~CdNdM-GHf4_1RDtP}FQ__C@Wf
zsi+IMfSK_&1~pLNi5nm(YWHTvmRK5fWj=Pq$Eb-l{nLFqo<Y^ueCn=n6>6{SK#lvr
z;?K<l&uGscN{`x<{hxFHr;(ZS+<hA5|I1xrMa)6G8OG9K5NhUoUO11TcKdnEh<~E)
zd5V|r#FbIEv<_y#ZkPavV<H@f8gKeb);|TAg#>iMb(kAZV}5*wnrZe|u0u7m5vC;G
z4z;QJpiVRzb>fAn6YRzbT)<H)H+pUT%sxRfdQ9GWh_Ysy@Qu4ADNsw912td)i<dTQ
zqbAVS>ie6+%_*qy=AkCM)Z&{lHRa$w%bdf)1nyvCO#hGT*aJ0zewYe}pq6kFYC^M6
zSH2WAkv$eaYhJ}x#P6e?q8k6Y75WV6U(}mRMz>&<Rcyzhl+U4_>jqvR^o8Ox+(&t~
z|4+VbVUq%Z&_9aIK~4LfUp#+I*r7Oq(DGk1|Mmyxj|v+TH{iw6W+j%!yZ+An*=nwd
z7x3Pv^aQJ8)A)hVO3g=I@G{iA)}bzVFJ{GWQ7d;F)8b!#(E>G!j85Qs%|b29A}oq)
zt$YpD>w%U3^>-G?7W-|YfLA9D-)YSJNdw-%xO~zl4|qF>KTH+yUa@^vr3rXZl$WLp
zcsCg3czD43TBG}g3Wn!fnkf+aZnqUR)BUJh@f~V2Ub8r>QLt2wiJ1eTkER)@nV!Nh
zyo_n^5C2NRsMyh20-@VI2X&QekO_GEP`wUf4?K<GST<`Q^ugE&XHg#RH;FD*B00G}
z+1$88F&^dVs1avl4*UwU;YrMnfA~kDqneJ+?#{mwwQf65`}eqc2|uL#JC?&XIRf5v
zoP(cWft-QRKL{+xB$QJ`2KXn<CWXr7n@CPqG81*ZpQG;7SC|E_VtRb-A1+iQI4oDd
z<A!)oQRBYA)7UR}AoL5a*gS#I&tikHAn_fT8E>PmDi9S2{X0qy)M_+FU3CZ4DvU(6
z{{nTL+fdKzG30tvd#A~$;Wf;QPyOvNm1<7N8wh=d%)!v6L@m#4^C{}q$IIsyH9P9I
z#G;<o3#e&4^6M3j369Pm@Y++lgWCGl3pg8~Cf(BPhMLO&)T1%coQpd9YShNtW%1Lf
z&2klWk@r#KB`WB~Pmhe}rzjE;JC3|Ad>U%3&rzFsm6bP|`^__`jdvY2mlyuvBK5--
zM!QF0BX%ab*S}sQJh-EfoA&|K7W@el;$_sD-a^eYS&Zu)ftqJ-vzQr+<%!p~@+8!`
z=b~OAt5K`|2+Lry!lCsDdezAcA<!CiQ5R7iZ=g=}$ovO&1CkYSw>3SgTmsu;B}|Ho
zu{*BCdYGQykt*I9HGV(TxPwFSARl;S^f@*YGvY4P3jB!LKUYw1_rFowJy|h#$5Ns0
zMl?oZ1yuhIsO|kJ>V)$xz5?~>u^%;l+Tz?*&hKR=qbrHT2#iLZu!b67bF7H%P%~eM
zdT!UE+U+opp(gaRc@K5vFRdKEgnJItp~k6<K|SUT$f#o{)Cv2WLr_;R0`+7}#QwM(
z^*~0Hbo~lqd&=ceE3m-ai5l+*)I=|#CUoE8f0YabLrd`w0li-mlybKs7Z#yh6Set<
zpgthSp=Q1hwE`!td=WL#Ur`tG5cN>~i(2Z;rCs}6s0qZNCRVO=&;=?J&=u7~&9npR
z#s49y!zk3#I}LS$m8c19N3F~OD_=sjzk}Muk5S`zW!wujwV4N1Up7caGpvc~*bp`I
zHaIW9F2xF%zMT6kZ&KcEw$Z3fyBc%iDbxfXqu$U7>7<EfMXg{Vvz+-ZY68KgWVEE6
zP`mp>486y&IOU1>4(>-i-+_t&?+I2!O}t1YH}Nv46IDaKM;ckVnb`@|zMqu`IfLF9
zGJ0Hm)D>+(Jq;Jlo2Xmz0CkVwpiY$F9d{4Ypa#x}x{#cxl`L%W@;HNXRcy;jUch3M
zOIFrIdH#Bk(c7{QYDvaocARbT9jG_gY1GQxM{ORjiZdaupqK(R(XHmUs9W$8YTRE@
zPunxpElOOKJ*VeCJDJv440VOmP$!s!J#jH=vn8wM1`0=AX&zL&;#dmHp;qQ2)Cvqk
zwVQ;R_*~RPHlWV)4F;7tN=DD^8EbGKHP9>6012zRB~FKGp9Qt6^PsM<H0p%!ViYz(
zZOTv0MVN>3LDU=d9%`i$)!_M8CZdL$Kz`J{uV&UqO{4|t#9hojsEK`on#dSbyDv}^
zT7hc64YfDE!T5N@;@_jrbG}B<Wv&s>0Qb!2)*$Y?u0A<x>B3R%@}R!*6vJn@*5XTR
zx_i6<wV4m0_SRj@fnF_l<vCIDVnH&oWNKSrGU`pZ0`ub`)aLsizKcm}yZ1n2)I>(1
zHq~^D#ueBQf53W}yN>%=pg-#IJ&Z#!z@Jan!eEe$CU6|JNs`rbn=J=wa}`A0+hW)V
zE1_mS1GS6SpeA?#_1yo0+N?KGOaBM1!e=-Z7t{}U<1u%GfH#u!dmG58VX=np4OR~I
zN^OW*vL2{6;v{o5>V0v<{1r991dW`jQF|&YYE#FUwNS74&Zs@}2`16=KOvOir!~|S
zFShb3)WkMhd^c(j9I*Hq485pOoAD-Q$496Mg*A5LWkGGmT&VG)QR9?QT+e@1G8&++
zRkT7~K@Zd(7=jvLC054`SP-A128?XtuBZTN4^%+ilAfrQ8jJdZvI@1gPM}ui9tJf)
zyrymf$x!z+qm_%GCQ=FY{5HTsI1sZ1m=J2fBk#G*cpLTjJw|<&1e&>(h>sd44Anj-
zY6aeD#`CXCeFB<DTh!+1g8Go@hn2BYbGOv1@O{dgP)nS)g&R0Ks$9g%6;R{WGuz-Z
zCfo~O;`^-v-c4-XhUZ@mE48x@sC(K5wHLagmcBRYaT{okLaoSjEAK@0`xf;SoJL*o
zj~2g!+Qbi0=S$W;;C&Q_pZ0@fv}9A?cP>Kh&JCzNaR4>YX)J`-Q7e_Qql<^5PM8<B
zU^G_28#n=TcM61lzqJuH-V4-36Lfa*U@9_22{gwToQQf%_MjS`LQU|ZmG5E!%1=-e
z%i6_FIL3@cU14L?%Dr##o~Q{7MQzTBu0H6kav5(U>O{Lx4ZlO((+j9gc?)$5UZHk%
z!mchJg?a;4L|s55EQTYn0&d4f_!LWHjc)F<U>HX0`5$9}t*E8kjk*Q<P*-r)%9l_t
zrU$5Y@w>Z;CP9@mpe`T_*2ZYm#0OywoQB%W7g4t`QxE#<`Hv){?`}m<S5gD(U@O!w
z+`dFj<P@so1=K{Yp`Pm(7SG(%-LhP$TUZFSg0ZOa>!SL1M130e#GoFxeq{9S{}l7$
zbX3FLsQQDbcm7G#z;{pszOZtNUT#7;P%BW@%C%6pvLk9D{ZQi!MU6kJ7tg;=yucc6
zM&0B6sFgU0+VwY3n=RD`ZmDyac~G0J0A|OssQ#@`SJ(};a=q~k4#X@x_wV+06YbI`
z=&o=;ANOV&jwNWg2sOj=sHfl;)C7J*o$v)}k0k8t28uwn%V*_cs0*lqT7hP$iFHQ3
zH$KGdI44LZip*}*(%(eg^Q8S;ha#w@tB86b)k1BmhNua3GY6q=)dW=gSyo<xn%G*@
z1h!)}JY@C3#2*Gi|5T6`b%G(N4kJ+adXmK#q26FCF&YnH0ep<Qr&&I76DxsgR|m6W
zchq<jP>=0Q9E)3#&w`*=zQ0@2mdG2?>yFv67wQTpqwe8CoQ<n+E>`^5UFpxLE4zdG
z>G=t2b0!<$_CQYjfX$E>b?asiakqE{Ce-tPnT+nyEo_gE@d`HjG~hkLn4tmh7@H>h
zXYQNKJ@$;Qc=|ARk5}Um%3tGhEHgadEySz18i$Sucwb@ENOzteP#1OsL*M_OkkOLG
zALW)bC-$XW4=3Y3)VsXyX!kw;BI<>cYK$`->dlrBb6{i4j~}BR$Hk~yxzXwmVPVR5
zF!cGKeym&Ktf)N@h1&gvPy>`iEnRigy=;owWbIH_(i8PGe2SXb6pTgR>d&J#-LI%|
z3XXH*mK(?OuWur?3FN~rI1s0yCX#5pJ5fs1dm<C+goROGBw|q~Y=_$YoluWmAJmGD
zM12!kj9b}UOD4GsdvB_{;I>n_mzq&m0<`l6U^^U)`jonao$xu9!dBDVCi77fUWYmH
z0&1mRp_V$yboc!~3u<##M(wfs$X@i?pjNVD&@vyG15rym9CZsOTX`1hDOiG<=o-{O
z>oGfS#oTxvwQ_%>k8x(W6U|1g)MC_1u0V|++-;eIsGrS_qh@>$HN)qo=eu2>1hvFD
zQSC~iR;mi>v1^BVFMN#JWJ^#hd=9k&H_V5~1qHn~7DzDDoiHux9%n^$h_QGDi`PI6
z*xc&7TK&hUi3Kh0qb9fn)qXu{WxuxacbH1g|HV*-D@I-MD=WvF<(4uXYJkkB=e_`H
zVpUKBHbgCD8`Q)*qc-ON)Oa&3z7W-J18Te-lJk2<$Y}STw+7eEyQl#kq26q-FdL?w
z?LKacqpr9vYV&nKJ^%espAkOl_l9e*7T!bck>a1b3ADtZK6JX1(PKCRwK>*dYdnaW
zX|^xiuj2}t?NJk(f!gi!QF~wm>dH@`CUy_?B6@>Sn0JmFuK{W^x0_?ne>Vc!%_C6*
zkGBRs>dNP1W898>@AQ()4TSy?w(q=vx1ab4)I=xEcjL@Mt<(}!zXPa`^>ho|V_6$@
zp?w$d{A;G83FN~$sFgTm4X>hBDDFbHqy<q|SOvAz9dIa)M70Yn3WWZqAwNb_?u=v6
zN4=0TEp{g^jhb-Xpk-R4mZ&Fc=00jkx1jFrX{?LaP@67#iF>7%!BLch*b(C`4R}?t
zo4F3#P=12id<~YlP2C)|0>O4<w43|myEp=O;|Uy$W0t!YM_`3psRXDi&xpEJ<x!ir
zI%>d%SO~kI-Y2tAE4CG@<2ls%B36d#gI*LFZHDS*ebk3Za~y;{a0=eW-uTff7r%)^
zD7XGH5c-p%i>Q@qwc5RSdZPB!eAH4eMLnLIuqJ!xAZFI{pX{rEx1EZ7s4KXR+H}uQ
z@Ai~y`CdSWqNs`b>)e&kN3~mt`Z~TJb?bgcUExdAgc7cI69`A$f;^}dD}<r%|7FN%
zW;IYJXpVZUI-s88{#XVlq9*vQ)n79IK=t=FxCw-zCSC;fS<nQV^Xb<LHSX3;Zk(eS
zRNxAkruYy`Vztd~={`l(k3c;ovrr!*tIhRRzXkPXJc8PsS1tZKs^1&btq9xV>cdeh
z5xIruUo$U2Kuc8~W3dhv#VM#yy91~z`4)9Azqj~h)C8}guK0<S(`|JtnHSZ+2-e3E
zsK;<LYGO;b2Hm~dPCyemYz@xihm@b79?Q<#+^v|5e^OqK8sLlV?gVR5<&CJP;xOuI
zI)!?S!*{s)VrC80hf}K{89gT5FcQb2Hqlq8nVvvxuDhtmF0j+Jk3<bn8FfqQqi#VH
z%!|EHZ@gJp7*C+aeU17elX;hW9D_~Bj3qD+wM3D--M#q;wM&Osd5k#)HQ;R2W;}{I
z@fFlWo}%`^OVmol-{V#`C2GRiQT?KkJrMLNlhKK4p{}qg>M0nA8fX}5Q%*wNqC=>G
zenf4e8|FRKCVq@Ot)Xws>ACs)DDd|6PAbTeh*>_yDC!RD`Pcit5NWP<3dbBCmA6M-
zI!z#H_g1F9C;9VMe}-~#(!a#=s{{F4&<2xnlH;hOG3`r{YS3;c?sQ>qiN?{rjZ4En
za0CI~j$RDuOTR+Xs4(A#P>&I$NB)qene>qnI<DbC%ex56|2Bh>jCV^X;oxQIEygpb
zbLyyNeJ9dJul#|O3vtFhr2WLQQU07fchZX@l_PNky&eQ#h4SnVf|qE#ob)Sc07=I+
z+T>;xE>g}!`X6PzuFr&Oc?9WKn%F5fs27j6C22Q<#6uVQyZ9^CR{TZV)YMH5_-Ecr
zAG||RM;)w3SVsq(M>)Bb6EaLn$_X?ajwOw;y6bk@8m?>TGju-n>8-vk@q47iR#vl)
zq^p$g#Nh|k>wb|oX%ZhGw3T$&U(zhR+9)b(TZdyrb)06<>BNq5!e*2glkZAw6Fw#-
z=DL5vZq&U?n&*c#PZQiki(Hi69>0<)M5`Q(@(TGm#_L3z_~c7dmz+_4C8m#wp;*g0
zuEO(_lh8IFZC{XL$X6p3BYqRVrp-UZ^+z=P+~xhHTdd=A(rg-JrXoKlIEyzZM-i_;
z8bssQ*avm+@e(>t@!u@8oky7;UA=4Me<SswuZ|_w?vX2cai}XxT?W#&P#ezQkjfVn
zs#@bnd`&9GM08{&|2Z9Xtfbu>%4=OQ^xvt(VrY96>svcjT%f$0q@yOOJawPpM$#|j
zr(n^7bo_%xxvk;9{}~_|Cu%~fP2GE>`F>=}$mG|_eMibq%cXvcmIWg2Fi>YwL85I*
z5%kfq&|lIrO|@l2%8-61>6naHNcUYa^go1Eb{OMTww{+L^YdlsNJHHBleWs1FFBF^
zq?|U=b!ujjdeZI-Vtj219n1VSts?V{r?iyX)x_Q>)uhEu%t=fiY^Cvg-0bgYm95Bh
zTDPK95;c4W(gxCA3M<g<6FyhzRgCf#Kdg03zKgWx3GoiW3G({dmy;FUPHY?b0`xvc
z+V2l+T`Kn;B0BET@-{7W{6hY!M&VdZ%dP&6)=^nTTkTpR$w_Z$(S;Vd7<;cCNB^BR
z$&&wNt)gjh)Nj)!JouD$>1;HOc#0M^tW`N$>3D<xTHZzYtYussBOP8x>QfN=3a48C
zCFEC;baW&3!p@`ruO|BL#^EPyo36+vGGADq2G)LVsG8>lcaR>@cOvN|`89sKw&B6M
zloHZw4v}w3eaL@=Uy}YIy*)OQ*~qAe><o!0zh`;1`PR<ZpV(_sUSb1Cy@^l9dYorA
z@oy;Crksa-L|p!eZ9IhzR362d1m7NiSUxQs_|h0U^!-Q2b5f5`j=`z#_@90XU!WXK
zpO&PV)PGHy<xg!FUicunx5qQ`U1^by1y4n)M6bP+3u7s3<X>%<p~83qe3cI!|Cr<G
z98IUfBpusmqa(M~D_?-RQGTWN;lcI)Iqg336-k4w<#+f$daoeX1q-VyM=9dvi9I8~
zh<FJ`J4AT^@zgjBZ{t^?*1T9T59K4Ik7=*JWYodey7c-(0`G=8k}A2l_nV)zLsVeA
zU!p^S;5|D0P5dP8Bef&x_?Y(RNID{j?O@PqR_CION9-xFl?2B9r>+S7>X0rFFM+LT
zx0?Ds*0Ck!KS><H(7&05Q5a0RO=PI6@O}u@^L*0rEQ9=QC-}+Ye-Jxw`BvmNP`{G&
zH+da#unTFL^}C6uNhwG_Q-6x{?25yGhWm@&4{vneP8-2uKesMZLj&<W1H&1rHK{3e
z|IjvpwNaB<l;cwFMg9xgyn_eg=&hj_*9dC=B)WxsJ{*h%NFNa&Nm)lttVdag->qYo
z;*<-K@)L_7*3IgIoMj*7-qf{JV>{*&zvCb1m?m}_E!$Dsg2?}WOrowF!B43Fk)&e<
z?biRN?Pfnmr%b_Jv@AgM2P|u~&G2W+>HgFDkd0E(4Ho+E=fs}8ZDaKl=+~Xv{Z>}P
ze54k{->2<E^1qQ!qq2TiKg|E3Q>ol@X<pNYI!-<d)sJyFvHf)6S1;aTze4B8;5Kq2
zNGGUyf;xW3l$0A_EdGz!AW}loE>dDf%gpVrrgo$sXw#K+m-s>IKOnE8C}yCYj&Df6
zkOmSvN@_vBBHXi=os&0RN`5`57yYwY`-C`~_CFGPNLokz$5_eg_2bHD%HJ{88B!6_
z+v5Q7OMbsD;lcYBZG~+aK}RgLqcM^+hx}w*Px>GAsc84W+C3ycf%G?R-XZ-;(%(KW
zrEO30Q%E|#CAO13Nh$NAu9tz-#MQm;-L}DgA<&=3mudXpV-1B&q&BpxMcq2u%^;n#
zc2&tAA>Rxql5UZHurY@a|H@y|HB)dZk*w6zWu(8zUnYOWTIp<YS+w0Y;#2A>Qa(-n
zU1GJZ-F)(q#G6xp*<$(~(f7o!VNzljsY^$iL~I(d_Slr)X}9PWR$(~hjkHNa%1&xc
zU3|t%MSeD^BB?vEdbE4V7>y|F_zjc$o4RER^1C8$7wLqn@ZOjUiDjkdSUimVu)Ni+
zqr8lKJVw;<4P_lUDCZ^ruPcWBTrUB!s>H_7zd!lcr03+H&}OW@9BudebPo?cAe@5m
z7`$xV8&ZCIOd^w(3(H3eBd-6^;4{)a+Hb@d>c1epBwvHr4Dy9BEoB|&$zPz~Ld?z>
zKiSwjsQ)l7zj!EWfp5$y)^Rfa?$_=S8Tj7s*CSJwuc%+dfX9hvw>F81MKS1ee^ZY%
z`hO<iea2}j5YbT@Z}`9T$kyT&(Y5sHXy<VCtTQcE5kE`d0qGd|KS}*ax!*RzeDuGI
zxrpy1f78a<?Dy=MDafxUy*;EY)TXA@Bm97JV_GKB9Eg>ne2LVOx&<VCqI9RMV=v|6
zcr{ewODc7@sQZ!lr{r}!qnwTM81f545w3_>S@vV@USSarsC!}Y!^D?Z{)peASE=Ak
zD>bLpNYV^ibR!ib-<~t{#!e(13rGn<Ile>D<^U-pDI2j~)@B2JCQ=?sYD7K}@kBP$
zGPe3Yu`1M;h#UId2|14M8E88xE@_x`s6%`?`D4WLkisoK%kS_(wuVnAy<w=|NexMB
zXfX)?d%Pm{BY_39JwpCC`Lj04X>0hU^%?2k{~#*(Ev?29`Oa$ZQ`T{kUhn*8^ptin
zKU2Se<dc%nZVzpS+Zi6?Oya$Xw<6!r;+<);jQ9!4_3`KbH*RI`Acdc(c#n#gIx|NZ
qVg)I`J#vyyPg+E~EjDNlCNzcE@-6@N9{yvT+#l_jQYCPC(*FVFozLL_

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index da395f337e..411a801dbf 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -3422,7 +3422,7 @@ msgstr " | get_job_instance_log"
 #: pipeline_plugins/components/collections/sites/open/job/base.py:714
 #: pipeline_plugins/components/collections/sites/open/job/base.py:801
 msgid "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"
-msgstr "JOB task failed，<a href='%s' target='_blank'>GOTO(JOB)</a>"
+msgstr "JOB task failed，<a href='{job_inst_url}' target='_blank'>GOTO(JOB)</a>"
 
 #: pipeline_plugins/components/collections/sites/open/job/base.py:537
 #: pipeline_plugins/components/collections/sites/open/job/base.py:778
diff --git a/locale/zh_hans/LC_MESSAGES/django.po b/locale/zh_hans/LC_MESSAGES/django.po
index 16de7330bd..42115435ea 100644
--- a/locale/zh_hans/LC_MESSAGES/django.po
+++ b/locale/zh_hans/LC_MESSAGES/django.po
@@ -3566,7 +3566,7 @@ msgstr " | get_job_instance_log"
 #: pipeline_plugins/components/collections/sites/open/job/base.py:801
 #, fuzzy
 msgid "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"
-msgstr "任务执行失败，<a href='%s' target='_blank'>前往作业平台(JOB)查看详情</a>"
+msgstr "任务执行失败，<a href='{job_inst_url}' target='_blank'>前往作业平台(JOB)查看详情</a>"
 
 #: pipeline_plugins/components/collections/sites/open/job/base.py:537
 #: pipeline_plugins/components/collections/sites/open/job/base.py:778
diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
index 4142a6f4b1..6c4aeef6b2 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js
@@ -111,7 +111,7 @@
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
index 91b9f152a1..211799acfa 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js
@@ -122,7 +122,7 @@
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
@@ -393,7 +393,7 @@
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
index 9d9d9bde1e..d646cc4020 100644
--- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
+++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js
@@ -122,7 +122,7 @@
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
@@ -341,7 +341,7 @@
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
index ccae0ef1b8..1a9816cd24 100644
--- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
+++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_1.js
@@ -743,7 +743,7 @@ job_start
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true
diff --git a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
index 292e7f1704..fafa4f23f5 100644
--- a/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
+++ b/pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
@@ -975,7 +975,7 @@ job_start
             attrs: {
                 hookable: false,
                 type: "primary",
-                title: '刷新',
+                title: gettext('刷新'),
                 size: "normal",
                 cols: 1,
                 formViewHidden: true

From b1918b30ae73ffa18c1e306b2b04158e892bf39c Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Wed, 11 Oct 2023 17:43:57 +0800
Subject: [PATCH 105/112] =?UTF-8?q?minor:=20=E5=90=8E=E7=AB=AF=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en/LC_MESSAGES/django.mo | Bin 118889 -> 113747 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 58e61dfdd2cdda35553a562a61cb2f216f06e1d4..bac0d2db4412d398ce8c41089cb230dd8fd30c3f 100644
GIT binary patch
delta 18845
zcmZA82Y3}l`}grZGyw?^T8I%s2oQP*q4!Wk1gRp@K~S312T?&dQ~^OsmfoA7Q~~KI
z&4MU|q9TG6DN?0KmG=Ms&fHwD*Sps<erE0|J3BkO=Op2|wBWfT_tOPWW=k{G<EWX&
z^IpW_`8{t{TF<LeTT#!u(aQ58@Fs2!cwUCqp7#`YxADAzsj!{r6~d|=J#Q}Y&Ye83
z9_3VTdERpRHR$4bUGW~if*mNlO1l-9g=XG^$#WY;j_vMw1*zSInei_yj(7dAKwQ}o
zJ=`4TnHw>j+5=WTZQe&t?PYz(^TPah1JP+WQ(EZH4MZo6?HM|sH`V+UHO2<af!`xb
z;GMv%cm`j<TV|LamMSiCaW5DB5~Hb2L5*_VZ=Nc;$f(|)H-yqYd=2aM@w{d@4>RH|
z^Rd4yRrQ!jeLXKbQ6Cd=8Ro&`7>*D8@YIbWkN5LDmeM<gQ?SneJg*Y|?hi{H5uV)N
z^WrFNMUC;Nzb19{gz@jX=uFgV?!t6<5Lt8YC}zOFtbEfiktQxUbb#k&B0AGticyr;
zn<?0m@)gX9b>8F7V{6QX!%=6Mi5h(Y7Qp5B2Bu&WEd0K6AnJTSVK)8m7#U6Ps#QGl
zQ>U$-VcQ36MxqD&Mrq@dh7NR{J~pRgK5CbsCiN|9jN_OCub@ui4f4F)5a#bsTRn0H
zB}Kn7_hEg?NBt7%B4XBk7@Cl`1J&v<YOGV37jOH$)5RAVHQ1f$3aZsZtcB^>0p+m)
zPQ{V_p>z?!i9t8!9Mp|kgPPA-RPRTqu`>*H<-+(n<+4^Dk4-7h#CmuYBe2{s*S;a9
zr`#GfZfC54gOS+;y|2mWuG~f4EpNE%7=hYt1+WB`LoHxuEB8lDY!T{i?n0g50!HCe
zOv0!U?(VlWJEJbF2j=Gd-ut19=S{W-%drs+)}l6PV5IAi)y#vMNKs^ac$F;vs@V!-
zh<8Cve5}PcnctX)FdgUjPFmnRY9(%=27ZKE>MWz&3ExJ=2Vg}Ui`rUyP*-#e)&GK(
zZ<vo!`#<AHu09;|P>#Z&G8M_hVhhv>2H{IM0X6V1=AY(u^AT#vGmLgio*y-VYN&oM
zo6RvD<u|R|4MP_)n)O#^ECJo?Io4pcHQ0t)>H`)(Y4Iyoequg9#+@KHs(mzS0`X=Q
z)OqS*dTe9yx5lvk+I0O0tPL;`{GM{<kKKn(>T%9|W>wVYYGn>ElTjyJZEiF7qE_S=
z^OSiBHPL^P$f#rL@t&7}S+Ne*L_LmU@C0s04K(u;*M2eTioW>7-~4>u;0+7kGt*3P
zTO%BGhvG03*1$-7)yiE^cc#CU2bp8cspcYc4XXWi?1p<Vf57YEm6*r_L7?#@*I*D9
zqdXjS;?=0Vx()SuID{|aC5xw<?E1ZE#^QU_7ey`9B6HnjKTBAy;6;kM{D)@dWcOBy
z!O%`KyJ2J6^})=z3$x)t^DJt5cd-hl_HCU|%l#^<eGAm|yCe5M=nW;K6U{+2T#SWr
z6>7j=&9mkW^D(Ml#wo5{IO+!FwQ_mXy46PAs6OV$Sdj7(Eb6u4qnwO7-Z3-tN)O#>
z)P!nadVB?S1<lO2F(>5@tUS?Ngqrw<ss5$Rd4s1ZYM9FwzHJ7kx$c=!%?qHeC&9`U
z%sLoNyeYnh{ctaSZ}pR=yK&~C9;o%G>8Ch@-bFG62n1%hib7b5a&;^B!JL%Gn)A&K
zsEzm|>f_<AnRBKauMCzU-V$HN3Fc9(PC4H!eJS9z(1A=}0$WfgE;gGN8@53$=xo#q
ztVXTCHY@MO`jk^p?V{#5OJWq|BvkvhsQ#U;+!wb|ejk%LzgK3iHX2KY<FW2M*YRi6
zl^sWY&isp!_~Lx_E0#mOLPlD7pOtejaL+(HvnOhTA7V3{h?@9W4CW#eztGL_CDg;y
z%zP8IwfbT>4m8K3u52Fa%09L7I@Dg;V(~qw3pi-y>*gcOO+3RQu3H1-U*ragN4*59
zpeEJ;HS<nZKL86;9)UX1N=(9y7=!mw<Grxh8Hd#=mqDGdKWajsp!VF##X(nb$QoQm
z4Ul>XU(_%wX2rai9ph00)j|!_2DP~c$$;m5g9RvuEp-ztjT)~CYQ^fAjZy7d1j!U3
z^C9ZqE=6_NiMqo5Rz8XwD4)afIBS`!Ka6cDpFs7i^qI3RYUN%tyO;y5{u3<CgtN^e
zvzyHR&s|{B3cqrWyuouT-S}5f<K97ymui(;>71x|d9$|J#B68wz;d*E-^y!n9jDul
z+G@SmxN(P=lby}HC1kSDU=!*+`8}q?e^4j>*UHa*!G@-s8MV3RVK2Oeb+O}G_cVUK
z*6*7$BDl`ozeKYEYP7d78}_sED2$_=j1jmMv*BUX{XdWD_XKsDo?q`~n-jH93Zgb}
zMJqQ(wGVbCqk;OGBhBgNa?C>gSE!fBe$+shP$%}j<b?&1*bWC`cRYp-ur`}S>pdBD
zp1oKYk0TQedTBPgb<B*KQBE^IszW^L%4?$5ySvr*HHV<ujYF;TJj{t<o7_*HvDlpQ
zBGmZzQSH-i*2dA}Mn)YfVOMO7dX%=HuKYLiBIc%iA5|Z|#SK&nOHi(b8mBMnM5C>K
zij|k4F5pWmZ&UqS1oo2Avv(YI@4T&U;EbpN^H@32$}gF1EZ)z`qs-Z;39L20-s&&N
z%{Lc{k%S+j?qp8h`C5ns)b-T1awk;x0jMWpgq4#~Z}<7AX`VN)n-B0X@zmRyGEda6
zsBvz86*^DQ3w-TPoCCFBrBDO4LpAJ*n$WxE7<0C{8r5zWYF!Rk{2b~=-Lv}VcDV6#
zpvJ3-d3C3ohcdi%F^UQwHQ*X^JEo`n14iIs)Bu;w$EfyMcRKT!Ma}Z~yvIsnacqp*
zF@tevkjykP+5!=~+?D6Wtdt9*PFxYyp(g4fX^mBJq{Vle$IaVVj{30OZbG$D7uEzv
zVNa}y|6ouvFSo~?s21j>+yHgL9;o_}I1neBnZ9xDN269^lDQZ)!HuX3I)w|;@B<)f
zoY6nHTQCJx-u(mXA44XEKqtJ3^Rf9pzQ^DlY#ZQP=8t^zP)@bq-Qyr?f>W_Gu0}oO
z*$=pfbvUYg1$$tt6nDb!Fc0M;sEOZ9Vf{6MGzZ<6szRuTuLZu3U!hJ=?vT5(*{GR+
zgL-NXVI{nRTDd}p-9uXkb%O5ZVAOdgVJTdPnel9p%nM|0p#}~+;(Wo3Gs~cMcM@j6
z78dVl_A&>dPB6yGTde#YY7^c=^-uk?`veGvk*P=^1_xtn)V(`~YIqto^UJ6SX8OfF
z?~$l-d-EOC<MsjSDH)5)Q}Ihhtc4AJb9-je?{3_gNV}l7m`pZ0Y{S>^0P4*id))Kh
z!TMMLH)ApU1503r6Yd**c~t)vSP;9TZp9?j1lO3`%^xr)@n126p8u<4^qAeX22agQ
zf4Bi6Q7cl&EMf67sDYADo3RCI#roiI9Eh60V~b}z=~gHQs$Bu8=f5NwT|os@hx(|c
zd;_&fy5bA?9)@Ews{Ilyf}2niID_%{FKQ1IJ>|x0jhbjzD-S_k&^Qb||H&4Zj~aL>
zYKB`-6WU|(gXUR_-!)U8cKx!VCLW9GmuS{N#a}hsq9)YyH0!U1BdlT)MpIsZn&D1V
z{r9Me{fsLAW!^@`181B$Py@$Vxhm?!jZwF_14dyt)HtKg1YIVXfI7}MH&}xoQ7@+7
zFd3`-$?d`v)TVrbx<#>P-K{8%dM~uW$~XWk;W||NYp4llJI8M<v0#u)44KxbdpH>D
z;xx>PCovYUo7vC1l_`(9f@-L}Q6KZ*+o%(aM2$Ng3*Z)1`;%A;ub}o$F#dwO*DX;E
zI+=Yi2j#(729xoH0Jj3WQ~vWWzTM-i7u|#|n%6NO@w=!KMO<<xYHf}}oo5YlYl7Z(
zGP>tKnO9LOk?Ar&aA85zJ$o5-i#ns)55%`|7V3QvxZ>U$@t8=t1@^&lm=_<R`bS-L
zCWPev*CnG9v_&=iz?@<6O{kC4BbW&@UUR=|ioju%hhbYx{kQwWO-HOoc_qG%S5TX<
z=5^P<DHfyL9<y+MZycE_I2$$KZ#WQJ-Ed3$3+kSpK&{Mm%z)`{x&gDH>Z4H?P}*!_
z_Cf8biKq)WiZ9|h3~HdjEjPgPsNI_vTVVy%mHF5SZ=xpF{2%w}co0=z@3y<bWvIQf
z2{rCji{CZV-Jv~uC>Lr|_P@*hpG0QnUH55J^q#xIY8XSj1t!tq1Jum7-FNOq?e<^r
z1^fqf&oe)8C$5RQr42AQcExl!4AbKn)OeF0u>P6J%p;%^uEK(tf<^HTYNq-Absg%M
zO)(4c_NYzO8+D>ls1wgaonR||%msXJ<))9UpV>P|Mvuue_fXbMpL^_XNoLei#-Ii)
zX7LJUebfZnS$%(Vm^lG8-fYx_7g>BAW}_V3VVT2NiokhnhPj@&j@?lc=!;o#5NZj>
zqb4*Jb>)jt6WM0*L*_|rP5cV#DXRO_t<Vspe`#+P8Qp?qR<RKWQ$CD(t{Z!S&=-m!
zxP$UE|4EVP@bQ5_=#L^ZQPaNUmnj+_z9&^6wEU;chyK8#ap51O4tPnlS&9|#qQALl
zbiL(i0^XaHZsAMVJZ&JfQgcujycjjFRj3Qzj(PE0)XJU19C*(!U94`xsC2H^RMfJ}
z$I`gc%BN7hu3Gu2zqwd+(zodYUV~J8r!k8@AMoBw%_n_Wz}rOpde(sVFWYBX_J9{h
zc~Q=QcZN~+MFhOBG`e51ctnv!QGw8RyDw2Q-HEytKcF__DT}ij#mmQxdod9DXi7%S
z^Z<tAam<d_{1e6Fl1AkTgl_jt)KxA=CgANr_1cZyF$E*AQr<x5gRv=2r98}ktwdtk
zFmk=4-ME7>4duzG5vO4cuE1#AkNNPL|6Pf==A-ht^DjlM+a}ch-Dm!e{U~3?%Gfq0
z;7!Jv_&yfP9|-+HU<qcVoH;hYpEO@9S-HqKa=MZ!sOz1Mx>GAK51zza_{jgJWZmG<
z0s)U3;@w7#dmmG<Z^1z57hFk&0->M9KEUF{H{pwT4s}(5xIpOdC^4wjXokA#j;K`_
zfoeYkb)6ef&+A^~db4>cWYq8!7RKBD#`x;>J}w*xeTK}$(56H!&pGop>ei<z;ubX@
z>b4}Ip4OwNY25G|mWmIKDjM)QP&$v=`Y#o8HbzalmDv?FmjS3pW1Kk)b@tCu8*hun
zQ&5}bB<dospvFsI+>M_L8PCt05ScWFye@naYOLv~&AiOYUzj`1gQ$&n8a0>u{=kGr
z;qywkN8t;6i|BU$bV5XMQ%N`PU8pViD?W$EQEPe@HP1}(u6HDAo(0WBGYMZN-pI-`
zQ0HEXdWCF2t@<OZh`CFJ*25oDIy~n&@@jhxHTEOve_6U%hLs6!t8VtMmX0c+x{vsk
z=kquP_35(!U%+os^FEEb>lghRiRB~5B)XOQ4Ap8a>J9#rKO?bnXuRcR+(WP#^$y=-
z{)}4d^X45tQ<<o$nnA;|?%`;IYS9OEcZQmyQFmtoYClcK{`iI8t4wsv=jGf?zCram
zg*xvA)OFqSH<yV|7+pRP`b3z5I_Hn5NA;MM&!Nt73pIy_exb6BDo(24_ShU$bRDYK
zZq!WnTloU&TsKkc{@DMzY~`}E1FUXE9$Cy^*?n|$s1gW$#h#2>?G2b8e@E@+$9|=9
zi3yrvAG+yfFa-4+497A!9c$oESOvqX1-x7S(sH#DMpbt^D;f1Vn2$Qg4%Cx&&ios-
zLihc`<zs_7SIHV~{#8)-{AEnW#@LS8pT$JVHEX&(JplDQ3_@M6kNI$s#rL50=5f^A
z@1gEZrdrPI_$lQVY6bF!rm~ZOrgR9k(0`%^zLi`duHc;7uGgp7gWyWkUC3R>HHyVB
zziEZoI^&h2W(MlKORdE=)ZN`@9zpHi6IOo@^-QLFNh9s6P&sl8Io+2PSO^cGo`O4m
zp^CMd>l`ENx{tDCRNp12sjo$yYZq!Q_hDK*Z1LYvcjJtC1=atK|8vE}f_KPme%VD<
z*K^OsHq?DgL9P02ze1(B$eFLWkC3%kRJEuz|JNT{DWcw_`mXO>EJ1WFHo;Ta5EB}>
zuQWqZyXYY5i%=N<3hWgehe`OWf1^@-y?G7Y$J9pDIrd{3yo9<Ff1|GT0WQNpqkuOW
zKgY3{&^X|Yz-|7}%5jl1nz%Rg2Gl-1Y~J$sRxaOiWK%chG;<+p@2s@)dephTw)l6b
zt+L<ZCor_zQTOR@%!iNsK2;J!Z>W~dT#qiOO*a6wf}>G)ZXLda+x%av#0UM?+!MPV
z^^tuPwRi5I=8?6zJ5O%ZM|mMDS4E9pAGL$pU`ZT-(L7V@P~#nb-QDdQsQvR8_1uTG
z2tAYjw5nxayhV91<(k;%4R?L(@lDG9wW?*p?=ax|Ed$;I?A1EJzc{N<Eiq|CdpGnX
z)D-4g`5V*{9YWp4<EW{gw)jodN9aTU>uM22X20nswgUCtZ5wJ~_oI3pM_t%eKV$W%
znDyi;b_#@k&bWpjQ%>j{2>ndB9mD*F)nkiHf6ILX`5rZs-%%HT&dRs3809Da(&~w!
z4~emFyRA1Jb(7Yc+fhBgMa}9L)T{U`>ULcB3)P5!YeE<I&1p9_CF*r`-_Dz%9?tQo
z$0XUxJ5ek19qO8YM4j~yD_=l;0Nh8l3-6{YJ5VDw&nR+riOfOWu5+ku64zZVawNq@
zeo0Pa{f??RiyG^S|3*@yB4c{EuL*Newcnv0u>+`w{}}4K+fDyOQn5O^;@<DLD;|t$
zF&5QxA?hXgIjY^)s29yosPCf3Q1|Vc->PP<ItR&(=*gC32ffzIt!cmB?%cysTlEtx
ziz`rPID@)-mry(5AOBWO_lR}s<IdF=weyBxKKvBp@H;GwfBSFLDxWZ_uRZdpd$-Wa
zt5D-_M$LRT*1;72K&^;`(fwTQ1k{Smz;w6*wR_j0?r92YFFp1P)Q$_E_CNR1S%9O7
z?({p?j!T%?-`$htIF0CfoQ1Ev>t=KwHG`WNiBJ5WYDWhb4RY(T7PTIKp;r1jcEHDY
z0^5BU@NQt`!2xeC>sx$?drjU6x;r*^sJkN@a1iZ&z$I8`SiqZym+^BPJ3Qd6z{C-u
z^8~$9WVG<tP)qOxb?M<F-6faAK9pPGC-@`kfowU-{XlUJwS8aw$QgqbC>O#QY>#>~
z4nsX;D^cg!9;y$rwq!~XxQSYU{G;7E7De5QL{z*IYJi%kmvvLro$ZLa<2_Ip@*e7W
z8-tqIEKI`rR(}Sy18!kv&hJ$i;|8vadMmfUBG?b#!#Svl<QVHt6oq;y;!r27g4)`z
zqE6TY^|<vxJtTurD>@PNT3(4?rs4<n@c}QWD|>UIyW;MsEBhbn^*tQh<435E%nR5V
zQ%!P9-vzak=A$OO1@q%s)JmnB?3Owg7NA@NwF4WX_E_u5fney>)s29bvbXtxIRdq`
zpP(i>)5;4`ub)+@iEc!_0=Hs5+=&J83~J?`OAdHGW=5T75o)DYCZ~5xxi;Cq{Bqvl
z9ji~}yLOpSucKV3l`M(6fSRZUX@vU5+XMA@4nu9FRj7qLiMr5h=0nuHGfZ*uY^eF<
zL+)fVuc%d2wu*YL!fS>au(Q?w&+3PvCN|FE^HCFAg=)WbiXZ(-uHZR}+9`KX=Sw%$
zm9wJOCkEBLFzR~CqvqWRwf=2U>)#DEPG8iH8;%-pfyI}j+HFIPx5w!pe<efkjMZH=
zZ=?D?LT#dS)7(ofAL^r|2I|sUqBc`c)bl(T^`ST)tKmj`1@EBld5!7r+;5{^&+j5n
zRnVJ9Mvu)FY=Z|-lPosF{l=k^`3`Dg^H48}&rmme8|tEuq9%3+^<v2|(|sP4L5<f2
zb(4Fb9_Rj;mh*cP$!OrI)?hyB%0I(qxEuM-;N_YX2>mws!`T6EC-I}GfoIHdyL=f&
zQ(lGYw;%P97Bkm9W-U+``XOqfld*_iG@p{uj8ag~<7LzmWtr!ev;yi18=;oECl1Dm
zsCHrV1ED|8l*1B~`{HPvk9xtxEpR8Ujhb*vvnvMU2)su|GoO!I(jBOKdmLZIE2#Ze
zaiM!f*1?gK$6+VTx+vh)#{T9OY)knGYTvb4?DlhK)C%-K?c<?~dC|N~W&(k&coYX>
z@)GwV2>aA6RW{U>7ed{tmr<|Mrl<kiVoB_W`cY~jYQ=WqOL!7>!h%a(eIjZvG+i2W
znbrjK;m{dBzyUY`Z(uJBE_3m}aS-LMp9MmH8$E|wsV<+pH_UseH{NHcrCyDCGQYxl
z?4bjwTatT4z}tvrgJg6CS5ccTu+qJ&qp$-Vs-b2&f0euP&rt2wp&rMdP`B<p>I&1Y
zb`#2unm{b-7L-P<SS3`uI;e>Sn~~88I-?$|o~Y+|C|1Pjs0kjj`U~a*)Bu^*xC!Jz
zeaKWry}LT#8+@8|L5;g}tsCbEs(cZf>-m33rW}DL>)g_fK{c3wdQ29gJ`^^XTdjTv
z>ZN!XwK*?a{4T0rhV^c|JgE9u)JnvoCSD%1=+a&$lSJSRERD0)`$L-K4gN(@^SFY#
zuqRfI`O+;|8PtbdRcwSws9QT3b^g_;mEMgy-$AQCgZ(H!K|OqZH@F3#iT_ak0_mUK
zTe8ueU^8mK?Hm1$P5C9DD^)j}p*~u=ptgR0j71-{F*c#5briK>ZlfNhu+6T0Jcd5}
zQOn#KwX7YmFusp^i!H=b7(7Zw1E=5OzHJmnJ!2hkG%iD}NBmZ|-a*vP8*Sxea~5jA
zMW_vS1a;zzsEK&n+<i-ndgjBCbqsn@WHjUAsE!p;H?|?_M6aW+up??`k3emJ@u-b9
z19d}EP~)6N^}lA`L3XD17<mFi-)eJlr*}}8&kM`juP8@)rg;<NsQd=?4lhZXrES46
zlkNZPc$GdMlk{?^Nj*PmdB0fwLCR%FPl**(2l8j3EoR~z`%p(S+LtfIf9le3Gj4Wq
zZ=ns8nugbi4X4Z-&x<F0=2vYV7w+2->M)#i!ynW<D#&X+bezK7mUj{M$+HZ`GTvD`
z2QNTx0kMOq{iNd+>pPA%dX2wFxg=-YM%qa%n(}n=+*vP<RGGvP^tu!LH<ah=Fu~tx
zyo7XtG=QYz6m1H!3cpc~BK=KSui%5BTK-f?zY4?-xIw)%v@J)wWD<{9=pXH!u(skJ
zZL?ALNx(n&damGkiaHu#L&7>b;%v%cR(_6QvQSQ^;cztRBda@Yr>*O{hCUbPP@l`{
z+Y!G+%3x(R>qI(9`Ftw=f^*tWXq!F5E<#_DzVR2fh^RA?%KFw}FHs#S3_6+E_nfc=
z<pt!s5L=5kNg25AU$HB7FOz2b;csLQuBAl*O3#i9WJ=O1hEe`Se%A0h(<UwX3e<%$
z$^~M2^$*5Ztm88Lg>pvP7NPBZQat%Oq(tI>;#ahJLR^30<7Xr9o^G*@>7;2ic#(>t
zoZt|ip&UoND(M3nKf>OqgO7~Rae)8kq3vwS{CMe|BL5euH+^+1w01XK(Mv^LCF*jM
zHiX)6{w7r3r%>A($KoSWA`{V(m;7`(>R3v<nUq($V(7mUiN(|QBsQ{ksyIq{D@jK^
zQWffk;1{Gn$WOr1#p!sBMg^_m)Bg;Ri4(m>s!!ePq&a?UtJtv9<bEI(rR5^OWvgP5
z=NafNQgNc~NRjl>G0$JvDtn#9L@JUllXQH7CrDRZG4%h^QFbWf)wG_!Q|4#E(2<?E
z??2x<x=0w2{-pdi(rId@l6uf?1~I-0g^tC3+t#r~#!^~D?dQbaB-NwEpO~MRKE^8G
zPq@zC)H*t0GOb%vDu)`rBWVq3JB3ft?GwHa(JPVi2|v6|e39R1%@gA7fgj21V<tZ<
zx{=rh^2O-Am$cJ=uTA-a+lc76M9Xuu(D4WPlNyENb6S4spJ@}9XOz{hBoan?OpCW^
zQGl_x>v8mJw9OQD&svqB#rJ;Owh_VGw99FuX~YAxsB5h%(@Mu<d}?_Y;Y%Ik>KNhh
zI#HjQ*b1Cz{TGs7M$*xh*nK;X{x8@1KE~lc*DhzmS~4@NPh)F8D^$&Mf}2P;=sS+I
zpZs#aeY=R@MM}@nYbKFzNxjMc4?iP4Aw4_Rk@<pA_t+WIQ-0m@YV)m~u|Kg#q{74o
zka`iHj14)@G~!=Vu1~oT`N-7#g?%iAj#Pe+QwTmgu30_@9rz*`I`m~n$6ZqQP>#W=
z@ARL33Lm9hf<CQCQ>g!nG}WKjKBClaa?g%C<h#%!CkvjHRGnViDeHr@yfyMqw$EL4
zECIfrhmI%a7&@1rQz?>;4Ybiw(CU>hM%_ridWVSM>i?W}2l;BGf!6W|{F~mN5_=m<
zsVhf$;#G*<AwQpZSw`DKc>wWjI26y}ico7_tXPQhccgb|uYYEtgRgbDyjnCqqmHEN
zF7Ey1Ki@GfFxD^Iu~_gD9Uc<jk2^^1Njl!8{b7=hNMf59w2sxeDB}^kO>8NFG5@Jc
zpkD*hQQ~E>4edUszPEL3Mfo2RM=<n9gm4N2N#}?Rb`{={P(9Bl9S<?cLp#B*7QaU9
z7t6OMzlQpyq=)2nq{6pJldRvLm_o`-I!65g&a)*I{~6}be>0-#6+3Mti+$I+ObiXg
z_Y90+s5YeL)IFhXI%}gQQz@sW{0{jUw5fr+Qt7Rs7uRrV{~@}bd=VUo#Yq1nK7z82
zdf1S%4!>)sJY^`CBo!qVNvx~Y1v$$O%Dt#-rN(y5B7WZA)hT<@BwDtowk47O{}@kQ
zWrFWh|1(L)r?gxBpSJ7#n9fnbEwn5~^axh6+7@_>a?by>-eaSbbAyHcJDu3AXKk$h
zWBPTYcBhrqun4Io@i%FEo%~<qv#YFs#4^-B(z$%WSv0R_L+vA<hw7U+jMz@P@aq(B
zfnW8l*x&|o!%06<a|?A`#w?T@V-o&N>;uwsq%EWjjP@e8yN=qCj?ktH=_2vn)b}K>
zqcrBGosO?be~{iI_C2X3{Svrm58euEzKHy4(mV8zw)W5AG}`}6>^f-`_3vVJtJhB}
zqbUEtSO-Z7q-V!2;=lWS-;M}gv1n^-#|S!-s2zo|q?zPD!PTU{sn1HgtJdy1`Hx8t
zX;XuAfuw(!wTQMo$WI{Y_?Fma`aDmWpKHC`q}N>Co8CDa><<F{X?&c<|2>vdh$6M6
z-7D0sqFplSu(hjA{yXw5a2)9@>4=Rvi1-SBVV9`jL?U^qd6kjwkv~rUgtgMyQnP4V
zZN%HuRim6j{Y7H+t=$~*vBck?{<y{Td!L_(pTg&f{YG6*(s*K%h;_i`{NA}`*YK*t
zD1Skl?4*38Hq@nMysYG>k*blp5o<`h2aM5_vW~wn%wO9zD#-7Dye*_3U4{49oJTA#
zJxAj=*cYo<-73n9$){mN9bZ${5kt8!`KPWJ`o|sVh}9<c5&ip<e?+=V{uXUU>&wwb
zzjwEY;8ntz34esgt$P#7&yMkAa&TcqNa4iw|7f^Fx<vagFrNAuqzB~d5=$mu3Ug4_
z@eBE*^qYtI7~@wPdlU8jQuB+4(iZsIoM0V4!OMRA?y-TN{J!0z@~ohKJ_GI}p3mB3
zAQs1<cm1{9v+Muq=ndgCRf*`RfM@(ax<|MCm*`6Rbh2}}de)g1%ZMK$aFw)|{6D0=
zq=L^HVG;UY!~(=OlmFAkS?BlY5f$WDj{22@x1QQ;w7P*kDL12KM$Lg(MasXET2VKb
zq)(J?lyz*UTn0~uN_<JB?ksgb6aSFBjysg2DSt$MUMRv95v#<0Eci}%<W=hKTl^d1
z3oZYh-}0UE!6{aHgH|I*$+YN7N+jQbGxWmFBpq`}=|VZaL(ygz=><|Wv3IP^8v2Z*
zJebs!e0t*PZKf4%^?hQss4ts3^t%&s96vG8MpA0hQ0vfu_!9Dai4`J6SbVDAv1fFX
zTa+F%)MZi=(sEjSfd4)ICH6CcxwQR`{66xBY?Ksh_?h(?;a}+)7yOo1qlx@rwO1(X
z*iWw-{~0}tUCc4+=aPI<M%rzo%`iK|O`Jl!7xC8Qn^^oU+AJpiBjrYT?Ej5h)7wqq
tS1Mko;(^Z0QIS}2%FmAc<a3ec({8;D8pDJp5L+_hX|GLBdj-08{6Fe1Y8?Oo

delta 23909
zcma)EX>eB8dA=WrO(wR400Ba11GE7`h<&jT`!2+eKrChzVD{Y>swYdQ?W9xZCQUqP
z+IZ5mlbNO+(xi#gx*qJdiQ{-pZJM~_On&5te`J{cYkp*=&+|U-J@<UVw7oOmz0ZC3
zbIyC-bME~<>1Y2v^5d_M8hr4|%i~ILN^q<yNs_6!&Z<umkVYiQ@-?K}U2l?91_W*)
zNyZ#74iN4SCdut#h7KjkOrRA<Gw$(YNwN`?VJD0ND_c$_$!S`f_R7nEn*fjCeydCY
zJt0@mKi6Fc+h>wwh6q592Q<rtK5p!S(Af}R5h|BZ5zQL{8lp<d&Lv4{y0%a=2391U
z_7`e;aQAeGqzJi9(8fz12z|$H04fV;N)akeUoSMWIp>qaIY2d%0dlM9m|-;?kh+j0
zcf<qQ1+?*ElI#=(sB|bwdxmwkLhn+NREP)E5m0qNnV-AEy1OBNIY}@sj2#GP;I&th
zWT|LC8-ONUm90a#Hi}b(+)vsyyt5NFt_3L|A26Vi(ggDH1sXGymfjuSxBxb;C&^gx
zicnRc<!HZXX`!U@7&LDLPe5)TXu70;_65`f)O0gRc)g9QdjuLM86b}}=cfH7ou7iA
zTbLk{O7E7mu`h223q`0_QlL!;$gP4lKG5hrc_v9F;ZmB`jp$@+aPLtSq0Q0)Z2?fj
zvuf3TTwNN-+fYPvZ=g++h4k)-wo3RJ2rUJ28|i<Is9=eZB+`)<rwk?u=5{h0SC<2F
zUqGG<Kx_xJi{$846OFn}W_%A2hdkIbyu-EaW}|L2#}@|KZH7jJdB6}o9yhcSXu!}S
zAOORj4TdLzu7qbK>;lcf>4s*5W_|`O0c4cKtH$=uGwg|F*qfXrRWfeGF5oIdoB@3S
z$tb;_4azqI0w5mDrj0SWBeR@X1*6hLSwPi>m|!i2I5bNGcWXeshU&mQWr(c<2z=r6
z4@XT?4tVE<u{J@D-4llB@T4I+yl!YoWRki6+GjP!KgTtgWAu<Vg&4E5N{u>5*>Z!`
zK<Z1PB}Qui+G~iOpE0x!2*5CnzW=$9T@M43;?OBGId=6%qu(bVyfWyixgnU_ZHN&*
z6=?m2^2QT^WK=J@K{lhuGVH*&eqYgjgsbyFzzhnO*qF!64!ut@M9rFDyDgyQhG=J_
zAx@NofqTLbr@>`IIB5aS?!Z}QcyKD<aDzm(0j)5^{!%g#Y2@Slj|X)q{_!6v6W;gh
zFa2tU*)D<uR%jGJJ7~)FwLq&(&P$GAJB8lzBr{^{I`8-N7h^2H9}=N>iBXxk%0A{u
zV~|{FXfkN|q|#L4(5O(*iZU{GKLihkcw+{Qz=JvI2Y&63k(L;t*+yvrWxFBD$wh0V
z5nJ+Q$D}JE^X{K$r)LB(QDcIosR1<@!g}d-#7D!ZF{Y<ipI5nm8`qGxc_)kbxT&s$
zIJZGsrEU7C#%ca+2m7M2edA!5rr!BNWIJx&axj$~q-s<+@ER4WsyeV6&X~D4JJEf4
z|Ht{#1aU~40u6tVK3q8h#iTeAs#uiIQ)XJQvB(g|X^kN!&&3CW><vQDj65U49O$2X
zF|4M>XCA6I^NeKZYCEU-CX-{^cLt>D%wD(^XaK5j6tx?#bs47FSHGl5`cuDt;MZ6N
zxVSUe1zMiyQPGk%-6Yvn?U~MCvN(guT0=Ep?=Z9rDAXt5AN^^u8ybh8$;QLVj(Pjb
zq1&|oQ#@qNG=;f9*su;FbP|<!vBgJW4$2!}37aT0#y!CVL);O}H#8q;zo89400G~B
z0j@!-1qJneAK(#VUWx=6A2;<_g@9DLA2m?yQHYu}`}x(cCdp=8-^P_XRmLHjV~CyA
zWoRVVm%gB=Z3)d?GMb$dZA^sKHfsIoYvvSay|JkE?|-g-`4Cs`F2FDz6I|70E08vE
ztl{i`6Cn8~e}U%@T(z*V1ROFR(bI<5f@clw1OhP3mKxxCmal;8j7DWm10t>1oFr;r
zIp%+I+XTx&1TZ|bKR<~cmkaj!YcHzl@8HUNGvvT9vrL-|QtO=${|cF9b-5AQj4g)P
z-eWG9t*&utieu=4EJRH@?s__#5^QJ%>jX^$ISKy%AN$&OzY)zQT2#&Dlc*NtG9Z<@
z3Lv$J4PI@YIX#rYoC;d7HWZTNU;YyP&l#i2$>z)pp{g@D6xzWMY1N~K%6c=95+W|4
zaj(<nn}4MtxsR)v*V&#9P=Ad?x%d7Wa{<@?#FaLdhFFy09FAQ^BhqqDqy&n+&O_rM
zXtFrr?#*wZZ4s5yul-Guq@O7pKV**`8>0DPW~L5EC5C)0CPZ3Hh<Z$pNb`nBPZtY;
zG>J)rm`UQKfaIU^<AO2h^iDtk58-$Zz!mLBe-|FSL-v~z2W^xgJNa4=&))OC2BVBX
z_Na-)#hkAG^{%Sm`?xZf#+wxLi?2(Rnwl|epEkE_gcgsu&5fW!#k9B`GR!rA;_rQD
zNS0@kOb%_l8I4APc|ODJaK7qkgfyineX5w!u!;>)X0Zr!4rYwFXW0#J{(X|rfq7z!
zg^mDBHrgQ|CEyvLpMMv%16O4Q$2~Jlk3aq%p1X1V5LdRT#4OkvkT24ClBq^fQ4^Y-
zw@NBN+D@^dY97(US%cvXA#g?2OuqxvV3u|RG5_p_CNfO7BaF(-*P1{Bnv|!3)YHs|
zOoyHKA3q3hGs0+^848vgqUpJY_}sf%dobG08<JV1XolnHnAe{~r~Hp!(vIUpT-nPM
zRD!AT^i&;a$YACliCVFUR4i#sDNI`CF2-?4F{b7lKa~5AaP?*s?=+cSHrRv4Z?}-x
zOG+N<3|)L!BeFPRe_G2mh-|W%8VZbPCtp6QQGP!7Cyak=if*-6V|<$F93~AIZRXYO
zv{|FZwSWNrR~-9dSHAVnSc5|U#M6(Gs$KN2NGPZ&z>eB&o`|j*itASFC&r^8{rW3<
zoAn;9uxQU9VUWxcHOc}~wvg5mXj%at15Lv<3rI79Rbs&8>=Xu!Ia_HY_Tn@{T(_H4
z{~4Id7!9bAEEWe$a0L*6Ve<bk%+jNDXV?mn-P2<h?BtueRosJR<|wS~A;Zac5325T
ztQC!NnGRm07U8jGo%)%C53kW<%;tfp_Qz8i#FAV+cE(i5%*J#Usf>;<Jpu*|cS;oD
zOsY?dFK*HPXCXAq_{>QK6nFFS$RtZ@g~^^CLd{H{1-;iK;t;DN>9`l_;NO=5K6L2u
z=me1VST`dzhN0o{u6xKyyboI%X>yXtGIwu!(qj;3U;+LKm9ue2GMubUap{>7(b>X0
z(WZoe8Uvbdi2bT(9%jFqMqTVUSbqu62Ni8mWA|}K#&k|VsF@}W4>!b(fPz{ARA;mS
zAkC#X)2I{Hzqsvms7z*Y)ml&5VKYW_&JZisEkj{HgXVysujGug8dx(Zo)vTrw%Q*n
z$H~EGa1(-2uK!xK&jD>V(;Ur=&z)d~IZyPoQv;-8MZ4<w89*F)ZRbM!*{aOIqj0?Z
zg%-e2+_Is%>PJ%5j~oCcBhhS4H?oJO3a6kVrmKq<v7J6)&rb=BIfq2c1!>bwfk+SE
z?1jZfqeu24@}DaEjL1CKy2dQOVYK+!G#;F0NI<}3;%d<r(V46*CP8;fK=z@0kakDy
zkF%2G%y3MPowG%mOe`PE#5k5A)=Z(qpjJBefzpd??d*wGTJ+@VtsYUI(bx{X8HkOO
zp9RL`%W&L~SbiM(KM2K)7&A_7ONcbObgwc)+KLdSmSHC35u<V4(;Lp%VvgZI&gvNF
zLfDMKOx6~&>+cKZMD%z%GLzJw%o9CWvpj2axeQ3}>zBsuj}5R@<IK|nAU*7`L@9}w
za0ABWgIg9@S%mrJOhzZxqQzlQJz(RWgaG_A*HuuefliuPy3f?(${2?j_s{A`o-Nix
z3)6JJ*`w^SfHaxMgEpZ2=li<M-IPL(`B;_FP21BjPNx{xM)C})(v%pG`i&^Fr|<_g
zgCCW*HIV{4UDd1}NJGN(($`bWoa5$>I(jNR36!~GQC1SOl&gO_xc^j*yBLXbz0TBV
zw#v*B={bRDz0v4i(~&w_iehc@GfVLUDci1kIoJ=VZZeBOybpAhiA_LQsZr;j1j@|q
zi7<Oln^qd$VX|D14jYR5mfsm<7L1vH2XGrKZJgo}jT130vrMhgW`Qm>Qz%<wH1>fe
z9g+6EL`uAP&J;cWOod1m9UbIF=P@(O8LYi~FOU`z_EV;FEW&J#ww^a5Dy8*G&3onH
z{HNp0VBB@YBP|T>UMCvjbi8WFPC<`*AT2!XGtP6p6IQNuL0`EtcIf^ek|taYwG6X9
zWEdIi?~xd$#+*r}9S)soZHtHSQM&`%Rc7x1<08WyO6IU7!fb7=g~u`1J~mG{_Ky;d
z^Fwdb;*5#s0=47;^$#E_IiF;Zre%;tMMD->JhoO(t4u+?&SC%5g<x9^k*lmBvYI<+
z%g>=8sL{;hd-#<eL`^!*jaZ(hGnp92JLjE{Q3ee%_A_RX5nnRIh2$ASj~ctUW7*xA
z!#I!_ABbdFh(h_=?(eN)VM`2eWjtyFkr9^D?McCY9d`#;i<al~`Pv%RvqB;1mOPNR
zJ-t_JKe`!K$bKl2qqI=hNWI~Oq)U20i-po9bv0Z-N(#wSq5!P}+C8F>{Z0hPXD*Pp
z0LVKKi1i0HfP7SdxCDZhzF4=u6W5W!29Wm%&^$>M(cDH(ODEUYFf&INk}Z1taMbcx
zA-ORe+u2g<CGpA(EA1-^Nu#I}qJFH5@Fcb9%;ZAS1j$>t`nI^LkoZ#=&}iQs0D4XU
z`2dpbjeV(p5vRk{Lb6O0Aa5*?8wO$#W9O7N*e}!Y#)^3f3Xpdk5aMx~+W^hC4e8N_
z3Oxszom&kZou!bzP$Sy|xRyv8$SneSDFX7<AE;Jx>8~0ZPa%TZ5DSnG1&~k4B6L}r
zps}@mby2qh-vq4{zb@#P6c8hPyaCs=Z~C$Y@CEE`1oA!s@}vOrS`9Q&R?>UZ*H=Sx
zdLhBMv+Y3iB!qKXJ)`PVxXvutPftndno+TnzIQgN2ae+EeFEewBapWi$ZI^1w;L$e
zX!2NIn9<2CU{fLSM^qr63P7$|gqSfU&Fb@7T%iq07m!ySARnW&Ze|;kzNL^Hkv||#
z!*#8?ZpW3a>h<esTp8naTz!%jA&&<%&)_1iXBcSSA3&w)%QIVdB8FL^M}XW8kY{}n
zE$8OQUjjhR<4T(wyV-NI!xRJJt0B=?((30F?8#&&u3mhAd<=j*yMabY4=5X#dyN%q
z*)ucR)I%M9?ZR~f=-qw~Z$KUs5X+uuKC{#ErW)>0=LRVtS{4nz@oj2luC<3OPj59<
zEpZ8aFXsgW$m<7??>T@xav;x|^j^~<F037)Z-HDMh)Wx|X?gRq%*Xr?50KZ8BIKh0
znxphqbJcoAxNU*v+(BH)yNIjjeG&3e2F-I6=&DEZZgUOm-NFzhklO(Ac!0bg((;xz
zE(VJViEr6~ytf{K+&j2g{Fhp~xy@W0@)*c@KyD4lqb;I&9H3>H_}i9cU9hI*Vo4!c
z0aU+C%j%Kkg``0(1@aLDst+`uNojv;hmFWZsIxBJ!PRpWXujluRtChUh0-Uj0;F%Y
zu4b=vhP497>obu11@d`NguIW_u2~JuZ2O#*>h0yYGQT$93fn;2fexvi=^xCh;R}vc
zszgFQOF{GO2l6%maa6~y*0lmx*_;C85fmXG574rHF3fIZrmPA10dy8NMPuZX)=Iho
z*V1(B>;^t!5K9Wkqj5QLJwHIpk<XYSIo7w4>uC9VvzKv>0sA-t&6E$IY$lGGv-+%i
zULRI&Ag_}^-bNtz4CFH!XoM^laee$i%aPklU!2pSCt&u-hTvyoSQmjj6M%fI(%;T$
z<QlOltdu}4@(kqT2($sTiJO(xhjDeUK)&h%`BxA?J+c6_4XAxf*lq$bZ{ZP$Th`L8
zg>m-B79inoExN=^UubJP3d**yYy){PKqZm_@(u>_jst=o_=WBa;XdH@?GZICpKE{o
z&=Zy{AfGllN_*xmVi)ZQ-inYHt0J1m0$R@XGzKl_`XCnR)~aowvD8%WG#lxIxidQ0
z*8RArrBk?a+FZxghYQHl2xuL6h&k<Qw=KY~P=<i2#RKv*2VzWRyVb%;xN@^J)9+W{
zN?)6CWttzvbq=nu4^*Rq0OWS}gyaB1ijSorAgfww`f>ZRdfWpK>@6g#aJ{%MWHZoH
zW;k6rZ@xXJ;O8OxZN%W^`~gGhXXkZrJPrpxK#XfB&3hMI&leysH9$Gnw=1BrXD1yg
zBv*#v{VA?KL7$3|ZNY0_c^O1cJ|H&><Q<bP>8NT}JC__QB&!u3kZA443-+rL+yRxQ
z*E$-wn>`VBkU$<FkcUx3Yn8?HUPs4PkK<&RB0!!BMab=dmTUNW23od1Zl7-{a|$b&
zd;skLN>1yMZzrx^n}B@I7ty@CLG$MoAdjbr=IbkH)F|&)Tod~X=^OK_`GOdf^@;(A
zxgr{qwebx5ZN!2GR$^ec59HGe$nB?H3%c36XT$yu$fbb1FMzxz0{K2ZeQ80f?fWmB
z({vob)un*k29U2SKyD4lD<qItNT4h`nisB)p1m$DtYmx_!W05ppw<Gp7a-3FAkVk-
z?!pc$3&$?X-z8i*74G0#D+@r40W}Gw<%_JOT?+96c_tLm+#_h-8lbhZ;c^o$7m|~p
z)Z#i)93a;N@}4Z>+Ju{kKkf?Y0~8W^QR8HE#+6WsfpG7E|8|l6Vcpd*;6Q;J@TO~_
zIY1sdkbei9_AIuy0ndbP2J&tO@*xB|BCkO5ap>6$EgLX|sx<3PMuW^?NDthEfj9gN
zY`y+_ne19tu<WK7MtA(GN%8#h(_zp<pBj^WS#F3O$S?8=$weT(EY9q|@tF+qk*Sa@
z0$=_)@1`1!h*L>(oZms}Ir6Zf7H|O!dlfP4qieVhGH-t_yiQV&ves*?_{LQ!Vyzmq
z4qs|STIAbO6=1$0R|athpn*JVh*^Kbkk=K%UTq9_MREEZ2?;Cfe8b3!idUO_&89VQ
zuc2lrUp90jGQ*_iw`vN6&vKgXjfUuCxgoB8TMaQF1<Xw1TXkguUmAv;hWek2BB;i|
z3Cm7)$8>zk=&Wpf2dVh47~)!*Ngj@{Z;=YgaS(@@C<mKwWkU8FZbtiqg?eEvG<=J$
z6yrNkZ5g?eX&!Ae#CGwOpB93CL!9z_4XmNN6%c@7FE57Cxa_NqFj0-+RormgMqh7?
zUaM#g&k$B#jWQBWAo4YHC_{$hG(ow}{j;b4?F&lRw{YeD{R3RRYy?B<PBxR@b7`Wh
zi&)<^^Qfat=16p#9G~!%4qoDnIye_(AiLqd<D)cGo&b!=KH*{^D!<H8!)gsN0X4Na
zD9ZwOW8m`ji*kqGz{$!L{<N^Te|(V&A^?WtZeW}lo#XlX7iIW;T*Gv8V9M+*B^0S;
zM&pF4lYiQ4G9nk%MTXc6bsRnP8I41vETb8|h7U`nVY&e@9J{ApMyIdWzNC2H`%+;r
zEAyf92k?+dE*okE9}d*-+*_<PNp_s-D(e^@id8uW4Ee6g@RQ&J7#`dd-7t-1j8UF6
z0WQ_o4EZkIux~UBAB4nPUsj9wWL!wvK~YI1I%l-FZ=!NNm_1IJ5R2FSuM{s>Eubmy
z8iD4U9K++c^eXAfYKF%zX2Pz}aO^go)xHF4{C7h2)fe#M4(q6<QZFdangN`E?|)V8
z!<|v%Lcqbu=(P0apJ_eUGBzC))phonY(_agm^4S~Y{T1M3(v>eC_Z5xIe=O;*h$Jv
zE_E8{0iY}fj##PbECpI<h}&c3D{dp%sjR<RLKq%@hNy-rli1Jvu26e7t$A^Cz0R8i
zv+l#M7m}^G8iDg>iJ`SX{3bA4{sHao80(*A;~I!)^oTNnz6f&?Y0NouRYMqazQko(
z8zL>xaCiS3h2(ZbWf4{v4RS10%-EYVEiNX_21Bd@+6d59pV8(3X?^xrEJm#c6~OR1
z;E%qk633q)sF-UP#UzwPq61ogxsOnbZUJ346`X(#o(GU1*+$|vP9qb^aR{`=&IQtN
z#hJ?Cgt!^-`XsY>5tF?2Eo}-W8CzEQI1rvHv~m}W#HCt$kRwp#ch_MjY&f2F*;Jzp
z%hgZ69ro0PWRN{P!gLsYg(1et=Ps4Pd4?#bnnI*(VjHxqurJkttSy=oamiZ(D$JNA
zj^w+4>)Tgbf1-M1>xULrCVI7Lu(c};G4+lZ+J{Y&`a0I8?VsHZTjN5q8wALk%0l2C
zL;0X!rylD^l_7guU<ypw%uFoL_3FLvgw4yt##A}!Pfg*Z%)7Sj!7TPN`%$YN$3U6i
z1+>q6&jXV0v~-pIJ#cUn-aMKh15?rCaHvvq_oS}t2I?|7f6-w$ZZHS-)$b~tcW`yN
zLUI`lMSz6iDxgvp4=~t~P;52czr}Q>=sW+QH;TW&m9<PgL#fUXof3@O4;$`5+nA|T
zHGr7K6_-T@e*gR7!QV`=x~Sx^YP1=RMzxdW_-ZH15j|quCZL;!{2|=1ZP@PrKvQV6
zk+`*PGQ`3oW!wVeY;^X$T(XL4&a<~OKB=FCSw=FtrS=c8VPS-3l|c(Jt2Bw(tL4UJ
zQmI6+nX`;W8(I?RG2g`RF)q94s3GPLfMMFsFlJD`VWxw(|1oTk!@em1Q;#PgN)=7v
zJP}!8?4mOm$!N4nGL4b}jmt8tKIp^ya1}%W$PT<Qc0-(LtDuONH>9`>6)_`%(-tZQ
z^L;>L<u<*yrh+pOdN{lJ+|KZz6J+40O}^6Kt+99LkjW0&z}aax!NAu(c5H=@9rEK8
z$jOr57hB2h8l;0WkDw#G5~{56JT~QKr2^Uw(B`NSI)hUKnnJ`my|*^|w<@%OS03Jt
z;04FmbLX%!LtO`2l_Wsp@(2x@zySn1i{%lBM+vkR28)uA#)BzAk%AyXahycct?MdT
z;y~fC1=nrh@HiTrm!{9Ht2iO4aCRx&djRXD=3z>1qDvhD4-}loIEBK;M3o<%(|emM
zxIYv}=d`fCl2aTKn_XKHV0&xC#Tl{e6%~@F(3-%({g}|Pry;W;$N_|-OES=$9%!(F
zWfiw`V5AN%f>Ge(5FG*fV(?3)3@X>>0bDn^5oiD@z*1;5Lqk^DaJLqp4%r0?vXJrL
z$e>C&nf8JJgr`ENCA141&>A7L0-swl34~Xhc7UHFP^uM%<a7>!U4SJXrUU<icEvjo
zh%JS{Bz)wQj2_8=hVKyVXb7e|5G0Rj!42=EtFUk;$q#Yb)U@HS+zpr65!5`!jbJPX
z{|>G)gR@!!$~-rMspazEroY=zHJsPU8ymPw3k_+JUb=B(E3*#zC-9jC{vmuOd&9ti
zTmg4Cz%7S|E;S4?OM)%1@+OK(5{~V<kPADja;u<&ru)%Jg$MKNjWr#mAYR3%9)@^G
zRp+z1my6t3I(t)tHbS{HB%i`(V+f~SK0sR>5Ui%RHr4382mU7uY74B=@lkxh)j8Nu
ze&Am_!9s_4>Fb-?+&6zq6m(#R%X+;AC2(40OXsw1^P&!EK$N=B!Wq&<_n`W{>kVvf
zoKYkPI_H}#oP_Xn`9-0r;kxb?XS@DyHdnSwc7oe>`;c4jvdbXrRM(olrINb<k&|Pf
zJ|0po_W>k%*FOz=prx0#*fIz0Tz0$5fZ|q#!dd;HvoxV`5f<0tt_-*#w*aY8@+C=}
zFW~-4xO*@)xB-n}=nNCUY57*Gzi#lVOySH8-F1A<OAZL%5_=<{2kK_f_zwan2Z^I`
z$lzoL<o#~EWFg0cdsiIeJg76ewXj~?TESN_P{VJOl3p2>a&X5vvlVwduHmyZjEj+Q
zQlR)QE|~yc89tq`2r4LZfw&pv@!*xTY}+JmIs;qesG`ErY#5k}kMq*4+ba3W5S*PN
z+W+_Kgz=e>62}>S_atO*gU>@@1fS`P+bS>MP8`IsAlSGLjd9Qn8p3A9s6aDC!}%I?
z`SVO3(pU|Bp>aT+Vv&-TcQ;y{T+-dj$7i)(dcrs##)k*K3vw&Gn=F3%`R;7}hCb-B
zLJ1!2(AgqA+${h)s5qg0!6Y!aA#xI+52<p{Zi^1u01yv(a3ue<jrH3@ED{KAsc=Ad
zQVOc%3<C$><VJz32|7P6S;*mD0TpSN<L+si$qtF}ZnDM?0z5z$a8wDG2l3f0b1*&9
zC0!bn;h>z8E+kh9rO)+Lr0;AlVJTEV3Le~MAig<j#pjB6X`!b=kGY^BPa%;VhXJZw
zs=cR*;}6PtNc3hRxPqz(LEjB&9<6Q#y!2L273U2&%fPt_4(@WkbaBoO>b%rb#W&N?
zX%!!6smtsQlnKRJZj<jNvO}J5&Lnfcu-FeVdYipt623Rp4agPv;5P@x+P%Y8BHZ!+
zn(~mzYRJUKfdh{w@9t>ObLmj2JOH34U~@aJUAW2u--!9+E6^BtnTjM?OIds%1Ibg8
zRs@iG8uvWr;W`P@JRr$MSw?S20cZT`!(L}!hw?3a>Lnx7IG+Qp#!ZY;c1l9dbcWnD
zpiY<LQ!xC97d*8O<4amU0vkf{Q3X>xz)#=YX=MU;4Wh`Pu+ES!lY?9@IFyf-(!$w)
zkq*tXfrcCU3N{`S2i7LxvuhByE|NO{?P^dHUuPHs;Cq%nNN<wS;7V>Nxkfbb_r_dd
z_w$Tt7hX=ky{pReW*P*-%jdj<U4e#&Yk;82L+yW3G)O6c%`UII25|QkIj)wbf(L$#
z??+{7f&|4%SM09h%QuOqeY<V2U>rY{O!^_SErhTmcL~JzGGk$h#}r(r<5QZ43<+4(
zSwg(e5jfKnfn<R36AAv>jk~$5l~O5jH@I^Lb)fLC2Xd1upga=PHNogr+<~vNoXD=u
zY5SgR`}4TClB9DSJ)mWWyo^U5H{(+-Y5CDvn!s&Pku=V@UmtAF1sV?uj}X<m;J7vn
zuM0r*GF0Yy7*NSkZUzXP^w)bDY%L$Nw~A|ntjZB2YF&N|=#BD|cI~a03`xk`ftMAa
z@>uNL{=N2}lofpX`Ms6hkd-e;NiR@9zl6^Wv!GM6G;uRsTDs3$kp60KHXUF`@j}vH
z83R2H+D>Tsqc<!qkrd9ovWfFBNc4lkL-EWPGD_6Z(uKye(BJ{-T_D!TlnBN!7C1}s
z*#+(?P^-LqLX(RmLCx>eZ|+-EnN#@oJ!qxB*;mD<5J-=74gBhge4P20sx_dVg9Z;!
z)oE$_{u&$Hp8XYiC+Ql)rRxpa66=676Q9bwvFY>sYdGMt8KUYDO7HEj=u{jy53v+e
zJThKzfRjg?7J3^Sf(_Y~n8)iHX;*JnVuCbcWjT>Oob$L9FZk!dKY+U)=bexTa3tR?
q<ng#K$v|U|xFq9PlD^zq$?q9t-7VHB`6c=3k9)uWac|+w(f<KM@{>jY


From c87d099b8f3758fd31ea7ba6b3c96a39596dd4fa Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Wed, 11 Oct 2023 17:38:17 +0800
Subject: [PATCH 106/112] =?UTF-8?q?optimization:=20=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E4=BC=9A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desktop/src/assets/fonts/bksops-icon.eot  | Bin 40776 -> 40768 bytes
 .../desktop/src/assets/fonts/bksops-icon.svg  |   2 +-
 .../desktop/src/assets/fonts/bksops-icon.ttf  | Bin 40608 -> 40600 bytes
 .../desktop/src/assets/fonts/bksops-icon.woff | Bin 24000 -> 23972 bytes
 .../common/RenderForm/FormGroup.vue           |  27 ++++++--
 .../components/common/RenderForm/FormItem.vue |  18 +++--
 .../common/RenderForm/tags/TagCodeEditor.vue  |  14 ++--
 .../common/RenderForm/tags/TagInput.vue       |  62 +++++++++++-------
 .../common/RenderForm/tags/TagTextarea.vue    |  62 +++++++++++-------
 frontend/desktop/src/config/i18n/cn.js        |   5 +-
 frontend/desktop/src/config/i18n/en.js        |   5 +-
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  19 +++---
 .../ExecuteInfo/ExecuteInfoForm.vue           |   2 +-
 .../TaskExecute/ExecuteInfo/ExecuteRecord.vue |  18 ++---
 .../TemplateEdit/NodeConfig/InputParams.vue   |   2 +-
 .../TabGlobalVariables/VariableCitedList.vue  |   2 +-
 frontend/desktop/src/scss/iconfont.scss       |   6 +-
 17 files changed, 156 insertions(+), 88 deletions(-)

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.eot b/frontend/desktop/src/assets/fonts/bksops-icon.eot
index d8c71d9d0fd5dd7bcc870cccdd60cc1173120e0e..0ed6cf8ed2cc224e7cfc22d8a8d6d9c66f5c7cd3 100644
GIT binary patch
delta 1001
zcmX|9OKcle6utM&yf+`uc>I}<XKYVGY-e0IAL`$@q_G1+d;~~TMeee(k_M|vXetn&
z7Rd#PRU}9l5ETn(Sb<W6RCj}fDt1IHqAozn0wmg1i4Z#~7KrfNNa*P4+;{Ie=iSBI
zy-mKqP3Xes0N1u?DDK?Z*xOpzII#?XZv#MgX|1>Z($|0P1Bl-NXdk}3`qs++FPE+W
zq;>(``J;cnw_Lt-VPor`+%pGH9S*tgCjfGP_2N=*(^~xzAo(Kiy}s6aa~=2K0k1PW
zcl?#!+WAen9|QR47T3SGe(}}U&h(!99pIBw(IP&Y+uOLabIv&R7sN!a2e|uunlE|8
z(GASvL9~nKP>9N;gVL~1{wD1sB~UIC_?hB|w}hL3yaIBAcSqF}XZ2xUBv<*p4dYzr
zN1xG?f_P7g_Gz2b;bD}N=jV}++pq|IxB&0Mmv9S34u&}npQG{+RXjo+pTI6I;tKZh
zGF~3O&(6lE1aMCp9we_IJ{Yc~mj?rY!yVx_zEBGuhiBm`+=Tl8VbBa~j_KG=V@7Dy
z+ZZ-#k}27a#SAP=)`NO5gMsA}%ZwArath6G2GdN6qh;Dox{ZxGpJTOV@v&)fD`y`a
zJCCO03!znDqkzfzXb>f2hfkUvbfRmKKL~?KKAMn%CS?)_cd+Bwu=x(nd8~&c=8thN
z@+E{qqgEaHN6DNf2*V5tUMnbPV|FWW5!-=)LI#m2<L-1lXHNt^$s!hK&)ABld%iQ4
z*K#I?64kAkFhG$QR?5y&hD3@d6fJM26I7-#RrJQ0BGThK3BTy*$8v$G<_mt!i8I-D
zr(HuftZYF}Wc;El8>c&}!c;BJTKMf4Qw3IO=!O|1qj*h8S{{`UWi6>0z8z06iE2uP
zhTX;>rZ<FN<;+y;k-4W&N+*)4DU31O>^i<o<y40JpcbEO)?TP)rJzxnMT693RiE+-
z)5^c!Xmb^>?1{K-pys8i{gszVxjfuUyOY;*Ebb&FG*DHXbhfbV=S?Q)Nvh~(>5I-|
zpC($}Aba{OVu{dWt?C=Cj84T8qEVP#SV)XjODG$gADFt#NHP9%f+_KIX}dFLpy8S{
jzn#q_T~(sYOS$FiIZ1a7X2hibUm7lbd{+@e{>T3V6CSS;

delta 987
zcmXw%OKcle6o${a^Y+-|jOS&$j$_Zn89Ony<9O^q{AdzV1uTe)+8}|H)@>4kl(bQc
zsvwZuE?5AYM#Dqh&>|rgh_I+PEKupPLKHTrt=Oe(KnfB<MSxUdZi3LSqx;V}|NZ9P
z(cHd8?%X2W{B?jE+gy#^y~gfrAANUx1pwa!fW@;Loz3mc-X#F`D}dlTudKhmy7T>m
zw*exz0j@k=Tj?yjk3P<9KTgc=Y5kjY-wy!f=k@bvJ68wSzX4F^Y46fTXKNF`gTJYd
zQf}&8XJh56xF!R<N4ey!&GQ#uJKkyk0`TF}{%I^FcGzpXr^59=KxSzkU^n!|-v6ur
zIUd1Z{X2LHc|S{9$o1C9U!=)>+wap1M~k7Ar$sk2p8-+_<P+LGaCy204*M+GqR(|m
z(Okm+h<g$_|3|J#`h7nwPE8>l)nN%%VGS<Br*IPq6^n7I1XcD>CHzliJc=i9372sd
zw|XD&FUlM}$wRL9yZQ#=e(#*N-0k-J{ZZ~NlZU5Z7TRzHz65$L%dOTXOvAKHOD!;7
zrHM6fLg#72;KS&Qconze7SL6b#LyKY7?xA@>=BI@6f|_x(wgX1=p3!Gl|;)NL_LW^
z$O}}|^JD0llv%9}dX?Itq2ZARQYhnO%9cTyH0V$IIf<iyY75N?|5ZQPZP6Tkvn{w)
zhLJEskaHL7ja<ZDth?lNgCqPf{Uo9C$lUQUr&2GFQKtIr<+KtpvV}~spyiXyBeP&z
zF;NyHO0g7Bcxn0t%^ZplM4q)&<wz<g1_+V$Smd9*ps1%K?7<+FuybNJfQ)QJ2lRX@
z5fg)yAY{iSikLwuTC6!nD<d>g;euCO7&ZbSJ3HrE!Du>H4Mj7>nj0LLoj#+4#R1I}
z7oQNHxj4gx)ngpGfmFRcwy^Y^G%dvw?5L28Ur1_(%*)X<+5b~1y)-|!I+F=hy2mD4
z2Kh}6sZ&m&A@4T_7ABpF!;?HJ(ok%;@F45PMZ*w-TC9Bk#Pd38cAQT<%%rSzFd&Fd
zH0|9R4yd*+(h;h5oE!YfPFuDiN>0o!-^)mmAxk1UhJpvU`xGa!swo5`@dIAzuGzle
yIU9tO8KK&qx!z8x0zZzZ7h5M!nz`9=A}h;hzK%x%5?j&$dN04fE3qE^tN#U72fnia

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.svg b/frontend/desktop/src/assets/fonts/bksops-icon.svg
index 0b4dc054f8..e1c5106cd9 100644
--- a/frontend/desktop/src/assets/fonts/bksops-icon.svg
+++ b/frontend/desktop/src/assets/fonts/bksops-icon.svg
@@ -587,7 +587,7 @@
       <glyph glyph-name="uniE204" unicode="&#xE204;" d="M1094.9377 612.7954C1094.9953 514.9382 1023.9288 431.5466 927.3002 416.0883 830.6716 400.63 737.1363 457.6891 706.6656 550.6815 600.8672 527.531 596.0323 427.8188 590.7993 304.2166L590.5149 285.7304C590.5149 118.8987 551.8359-21.7108 395.0153-48.2173 377.4449-145.4423 291.2289-215.0721 192.4837-211.7857 93.7384-208.4994 12.3427-133.2915 1.2755-35.1133-9.7917 63.0648 52.8184 154.5059 148.3541 179.6926 243.8897 204.8794 343.4432 156.1906 382.2171 65.317 490.8596 85.6234 498.7091 185.9044 504.1128 312.8625L504.3972 331.6332C504.1036 413.8324 517.3053 493.4181 570.6333 555.9714L389.896 555.8577C361.4167 461.3676 268.0442 401.9751 170.3912 416.2349 72.7383 430.4946 0.248 514.1072-0.0196 612.7954-0.1078 711.7107 72.4434 795.6868 170.3227 809.9653 268.202 824.2438 361.7199 764.4937 389.896 669.6763L705.1298 669.6763 707.0638 676.2745C738.315 768.569 831.7481 824.7082 927.9107 808.9703 1024.0732 793.2323 1094.7355 710.2371 1094.9377 612.7954ZM981.1727 612.7954C981.1727 659.9171 942.9731 698.1167 895.8514 698.1167 848.7297 698.1167 810.5301 659.9171 810.5301 612.7954 810.5301 565.6738 848.7297 527.4741 895.8514 527.4741 942.9731 527.4741 981.1727 565.6738 981.1727 612.7954Z"  horiz-adv-x="1094" vert-adv-y="1024"  />
 
       
-      <glyph glyph-name="uniE205" unicode="&#xE205;" d="M3.1577-44.5346L0.4511-37.3318C6.1651 11.4873 9.4731 74.1118 10.3753 150.5416L47.3656 150.5416C48.2678 106.9246 48.8693 83.3154 49.17 79.714 49.7715 69.71 51.5759 59.1059 54.5833 47.9015 81.0479 1.0832 123.0003-23.9265 180.4405-27.1278L180.4405 268.1876C140.4429 274.9902 110.1439 283.6936 89.5436 294.2978 68.9433 304.9019 51.8015 320.1079 38.1181 339.9156 24.4347 359.7233 14.6608 382.1321 8.7965 407.1419 2.9322 432.1516 0 459.2622 0 488.4736 0 540.8941 5.7139 582.7104 17.1419 613.9226 28.5698 645.1348 48.5686 673.5459 77.1383 699.1559 105.7081 724.7659 140.1421 740.5721 180.4405 746.5744L180.4405 812 219.2352 812C219.2352 805.9977 218.9345 798.5948 218.333 789.7913 217.7316 780.9879 217.2805 767.3826 216.9797 748.9754 281.0361 746.1743 333.2135 730.9683 373.5119 703.3576L373.5119 695.5545C370.2038 675.9469 367.9483 657.3396 366.7454 639.7327L361.3322 525.6882 324.793 525.6882C323.8907 546.0961 323.4396 562.5025 323.4396 574.9074 323.4396 588.9129 322.9885 599.517 322.0863 606.7198 321.7856 611.1215 320.5827 616.9238 318.4775 624.1266 309.7562 639.7327 296.975 653.0379 280.1339 664.0422 263.2928 675.0465 242.2414 681.349 216.9797 682.9496L216.9797 417.646C262.6913 408.8425 299.1554 396.3376 326.3718 380.1313 353.5883 363.925 374.2637 340.8159 388.3982 310.8042 402.5327 280.7925 409.6 241.7773 409.6 193.7585 409.6 148.1407 403.8861 108.3251 392.4581 74.3118 381.0302 40.2986 366.595 12.1876 349.1524-10.0211 331.7098-32.2298 312.9891-49.4365 292.9903-61.6413 272.9915-73.846 247.6546-83.1497 216.9797-89.5522L216.9797-141.7726C218.4834-182.9887 219.2352-206.3978 219.2352-212L177.2828-212C178.7865-174.3853 179.8391-134.7698 180.4405-93.1536 144.0517-92.7534 113.6023-89.152 89.0925-82.3494 64.5827-75.5467 35.9377-62.9418 3.1577-44.5346ZM180.4405 679.9484C158.1862 672.7456 142.3977 664.7425 133.0749 655.939 121.0455 644.3345 111.5724 628.7284 104.6555 609.1208 97.7386 589.5131 94.2802 568.3048 94.2802 545.4959 94.2802 514.2837 100.8963 488.5737 114.1286 468.3658 127.3609 448.1579 149.4649 434.4525 180.4405 427.2497L180.4405 679.9484ZM216.9797-22.9261C248.2561-12.5221 271.563 5.8851 286.9004 32.2954 302.2379 58.7057 309.9066 90.7182 309.9066 128.3329 309.9066 151.1419 306.6737 171.3497 300.2079 188.9566 293.7421 206.5635 283.2164 221.1692 268.6308 232.7737 254.0452 244.3783 236.8282 251.9812 216.9797 255.5826L216.9797-22.9261ZM1228.8 812L1251.0609 811.4192C1281.6325 811.4192 1308.3455 806.7725 1331.2 797.4793 1346.3374 791.2838 1358.0614 782.9586 1366.3722 772.5037 1374.6829 762.0488 1381.5096 748.4961 1386.8522 731.8457 1394.5693 707.8382 1398.4278 680.5392 1398.4278 649.949L1398.4278 434.4617C1398.4278 407.7436 1399.7635 387.8987 1402.4348 374.9268 1405.1061 361.955 1409.4099 351.1129 1415.3461 342.4005 1421.2823 333.688 1428.851 326.6213 1438.0522 321.2002 1439.1546 320.6471 1441.2141 319.6672 1444.2307 318.2605L1456.1516 312.7604C1463.5477 309.3703 1473.0971 305.02 1484.8 299.7096 1452.7443 285.7697 1433.4516 276.2829 1426.9217 271.249 1417.4238 263.1174 1410.7455 252.8561 1406.887 240.4651 1401.2475 223.4275 1398.4278 198.2583 1398.4278 164.9575L1398.4278-49.9489C1398.4278-105.7085 1387.52-146.6568 1365.7043-172.7941 1343.8887-198.9314 1305.5258-212 1250.6157-212L1231.9165-212 1231.9165-192.2518C1246.4603-193.0263 1258.9264-190.1221 1269.3148-183.5394 1279.7032-176.9567 1287.8655-168.0507 1293.8017-156.8213 1299.738-145.592 1303.5965-131.2649 1305.3774-113.84 1306.1194-109.9679 1306.5523-98.5664 1306.6759-79.6357L1306.713 146.371C1306.713 170.7657 1308.6423 193.6116 1312.5009 214.9087 1315.469 230.0102 1320.7374 243.1756 1328.3061 254.405 1335.8748 265.6343 1345.5954 275.3148 1357.4678 283.4464 1366.669 289.6419 1380.3223 295.063 1398.4278 299.7096 1376.7606 305.5179 1359.1003 314.1335 1345.447 325.5564 1331.7936 336.9794 1322.4441 350.8225 1317.3983 367.0856 1310.2748 389.1571 1306.713 417.8113 1306.713 453.0482L1306.713 666.793C1306.713 691.1877 1306.2678 706.4829 1305.3774 712.6784 1303.8933 724.295 1301.2962 735.7179 1297.5861 746.9472 1293.8759 758.1766 1288.7559 767.1794 1282.2261 773.9558 1275.6962 780.7321 1268.1275 785.4755 1259.52 788.186 1250.9125 790.8966 1240.6725 792.2518 1228.8 792.2518L1228.8 812ZM697.4197 812C704.9315 812 711.3915 811.8063 716.8 811.4189L716.8 791.6614C703.2789 791.274 691.1099 788.2716 680.293 782.6543 669.4761 777.037 661.138 768.5141 655.2789 757.0858 649.4197 745.6574 644.9878 731.4204 641.9831 714.3747 641.4823 710.5007 641.1902 698.9594 641.1067 679.7507L641.0817 453.4596C641.0817 430.2155 638.9784 407.7461 634.7718 386.0516 632.0676 370.5556 626.9596 357.1902 619.4479 345.9555 611.9362 334.7209 602.7718 325.5201 591.9549 318.3532 581.138 311.1862 566.5653 305.0846 548.2366 300.0484 570.4714 294.2374 588.4995 285.5209 602.3211 273.8988 616.1427 262.2767 625.6075 247.9429 630.7155 230.8972 637.6263 208.4279 641.0817 180.3412 641.0817 146.6373L641.0817-67.2086C641.0817-91.6149 641.3822-106.7235 641.9831-112.5346 643.7859-124.544 646.5653-135.7787 650.3211-146.2385 654.077-156.6984 659.4103-165.7055 666.3211-173.2598 673.2319-180.8142 680.8188-186.1409 689.0817-189.2401 697.3446-192.3394 706.584-193.3079 716.8-192.1457L716.8-211.9032 697.4197-211.9032C667.9737-212.6779 642.584-208.8039 621.2507-200.2811 602.3211-192.1457 588.6498-182.9449 580.2366-172.6787 571.8235-162.4126 565.0629-148.9503 559.9549-132.2921 552.1427-107.8857 548.2366-80.3802 548.2366-49.7755L548.2366 165.2326C548.2366 191.9633 546.8845 211.8176 544.1803 224.7956 541.4761 237.7736 537.1192 248.6208 531.1099 257.3374 525.1005 266.0539 517.2883 273.124 507.6732 278.5476 503.1662 281.2594 487.5418 288.4264 460.8 300.0484 493.8516 314.7697 513.2319 324.4547 518.9408 329.1036 528.2554 336.8516 535.016 346.9241 539.2225 359.3209 545.2319 376.754 548.2366 401.9351 548.2366 434.8643L548.2366 650.4534C548.2366 706.2393 559.2789 747.1102 581.3634 773.0661 603.4479 799.022 642.1333 812 697.4197 812ZM878.7979 607.2C895.0519 592.344 911.0349 572.5007 926.7471 547.6701 942.4593 522.8394 968.5559 472.4352 1005.037 396.4576 1028.515 431.263 1047.2974 460.5505 1061.3841 484.32L1123.691 592.5563C1148.2526 591.2829 1162.8811 590.6462 1167.5767 590.6462L1228.8 592.5563 1228.8 542.8949C1207.8504 541.1971 1194.757 539.1809 1189.5196 536.8464 1184.2822 534.5119 1174.0783 524.325 1158.9079 506.2856 1143.7376 488.2462 1118.4536 454.1836 1083.0561 404.0978L1036.4614 337.8827 1115.0222 178.7117C1139.2226 129.0504 1158.1855 93.3961 1171.9111 71.7488 1178.7739 60.2885 1184.2822 53.4972 1188.436 51.3749 1192.5898 49.2526 1206.0444 46.2815 1228.8 42.4613L1228.8-7.2C1202.0713-6.3511 1165.9513-5.9266 1120.4402-5.9266 1094.4339-5.9266 1073.6649-6.3511 1058.1333-7.2 1049.8258 6.3826 1037.7256 28.8788 1021.8328 60.2885L989.3249 122.6835 947.6064 207.9992C911.8476 151.5465 889.6339 115.8922 880.9651 101.0363 864.7111 73.4466 844.3034 37.3679 819.7418-7.2 800.5982-6.7755 784.8861-6.5633 772.6053-6.5633 761.4081-6.5633 743.3481-6.7755 718.4254-7.2L718.4254 42.4613C744.0705 43.7347 761.0469 47.9793 769.3545 55.195 779.808 64.4831 807.3592 102.3229 852.0079 168.7142L875.7571 204.2892C888.344 223.2664 901.9996 244.028 916.7238 266.5741L846.2899 404.0978 819.2 457.5793C809.4476 474.982 799.8758 489.6257 790.4847 501.5105 784.7055 508.7262 779.1972 513.7136 773.9598 516.4725 768.7224 519.2315 762.6723 520.611 755.8095 520.611 749.6691 520.611 739.5556 519.5498 725.4688 517.4276L716.8 565.1789C774.5919 577.9125 828.5912 591.9196 878.7979 607.2Z"  horiz-adv-x="1484" vert-adv-y="1024"  />
+      <glyph glyph-name="uniE207" unicode="&#xE207;" d="M34.0416 41.5991L32.2917 47.0012C35.986 83.6155 38.1249 130.5838 38.7082 187.9062L62.6243 187.9062C63.2077 155.1934 63.5965 137.4865 63.791 134.7855 64.1799 127.2825 65.3465 119.3294 67.2909 110.9261 84.4016 75.8124 111.5261 57.0551 148.6641 54.6542L148.6641 276.1407C122.8036 281.2427 103.2137 287.7702 89.8946 295.7233 76.5754 303.6764 65.4923 315.0809 56.6453 329.9367 47.7983 344.7925 41.479 361.5991 37.6874 380.3564 33.8958 399.1137 32 419.4467 32 441.3552 32 480.6706 35.6944 512.0328 43.0831 535.442 50.4718 558.8511 63.4021 580.1594 81.8739 599.3669 100.3457 618.5744 122.6091 630.4291 148.6641 634.9308L148.6641 684 173.7469 684C173.7469 679.4982 173.5525 673.9461 173.1636 667.3435 172.7747 660.7409 172.4831 650.5369 172.2886 636.7315 213.7044 634.6307 247.4398 623.2263 273.4948 602.5182L273.4948 596.6659C271.3559 581.9601 269.8976 568.0047 269.1199 554.7995L265.6199 469.2661 241.9954 469.2661C241.4121 484.5721 241.1205 496.8769 241.1205 506.1805 241.1205 516.6846 240.8288 524.6377 240.2455 530.0399 240.051 533.3411 239.2733 537.6928 237.9122 543.095 232.2734 554.7995 224.0097 564.7784 213.1211 573.0317 202.2324 581.2849 188.6216 586.0117 172.2886 587.2122L172.2886 388.2345C201.8435 381.6319 225.4194 372.2532 243.0163 360.0985 260.6131 347.9437 273.9809 330.612 283.1196 308.1032 292.2582 285.5944 296.8276 256.3329 296.8276 220.3189 296.8276 186.1055 293.1332 156.2438 285.7445 130.7339 278.3558 105.2239 269.0226 84.1407 257.7451 67.4842 246.4676 50.8277 234.3637 37.9226 221.4334 28.769 208.5031 19.6155 192.1215 12.6377 172.2886 7.8359L172.2886-31.3294C173.2608-62.2415 173.7469-79.7984 173.7469-84L146.6225-84C147.5947-55.789 148.2753-26.0774 148.6641 5.1348 125.1369 5.4349 105.4498 8.136 89.6029 13.238 73.756 18.34 55.2356 27.7937 34.0416 41.5991ZM148.6641 584.9613C134.2756 579.5592 124.0674 573.5569 118.0398 566.9543 110.2622 558.2509 104.1373 546.5463 99.6652 531.8406 95.1931 517.1348 92.957 501.2286 92.957 484.1219 92.957 460.7128 97.2347 441.4302 105.7901 426.2743 114.3454 411.1184 128.6368 400.8394 148.6641 395.4373L148.6641 584.9613ZM172.2886 57.8054C192.5104 65.6084 207.5795 79.4138 217.496 99.2216 227.4124 119.0293 232.3707 143.0387 232.3707 171.2497 232.3707 188.3564 230.2804 203.5123 226.1 216.7175 221.9195 229.9226 215.1141 240.8769 205.6837 249.5803 196.2534 258.2837 185.1217 263.9859 172.2886 266.687L172.2886 57.8054ZM482.9179 684C487.7746 684 491.9514 683.8547 495.4483 683.5642L495.4483 668.7461C486.7062 668.4555 478.8383 666.2037 471.8446 661.9907 464.8509 657.7777 459.4599 651.3856 455.6717 642.8143 451.8834 634.2431 449.018 623.5653 447.0753 610.781 446.7422 607.7925 446.5519 598.7202 446.5044 583.5641L446.4925 415.0947C446.4925 397.6616 445.1326 380.8096 442.4128 364.5387 440.6644 352.9167 437.3618 342.8927 432.5051 334.4667 427.6484 326.0407 421.7232 319.1401 414.7295 313.7649 407.7358 308.3897 398.3137 303.8135 386.4633 300.0363 400.8392 295.678 412.4954 289.1406 421.4318 280.4241 430.3681 271.7076 436.4876 260.9572 439.7902 248.1729 444.2584 231.3209 446.4925 210.2559 446.4925 184.978L446.4925 24.5936C446.4925 6.2889 446.6867-5.0427 447.0753-9.4009 448.2409-18.408 450.0379-26.834 452.4662-34.6789 454.8946-42.5238 458.3429-49.2791 462.8111-54.9449 467.2793-60.6106 472.1846-64.6057 477.527-66.9301 482.8694-69.2545 488.8431-69.9809 495.4483-69.1092L495.4483-83.9274 482.9179-83.9274C463.8796-84.5085 447.4638-81.603 433.6707-75.2108 421.4318-69.1092 412.5925-62.2086 407.153-54.509 401.7135-46.8094 397.3424-36.7128 394.0398-24.219 388.9888-5.9143 386.4633 14.7148 386.4633 37.6684L386.4633 198.9244C386.4633 218.9725 385.5891 233.8632 383.8407 243.5967 382.0923 253.3302 379.2754 261.4656 375.39 268.003 371.5046 274.5404 366.4536 279.843 360.237 283.9107 357.323 285.9446 347.221 291.3198 329.931 300.0363 351.3006 311.0773 363.831 318.3411 367.5221 321.8277 373.5444 327.6387 377.9155 335.193 380.6353 344.4907 384.5206 357.5655 386.4633 376.4513 386.4633 401.1482L386.4633 562.8401C386.4633 604.6795 393.6027 635.3326 407.8815 654.7996 422.1603 674.2665 447.1724 684 482.9179 684ZM600.1883 530.4C610.6973 519.258 621.0312 504.3755 631.1899 485.7525 641.3487 467.1295 658.2215 429.3264 681.8084 372.3432 696.9881 398.4473 709.1319 420.4128 718.2397 438.24L758.5244 519.4172C774.4047 518.4622 783.8628 517.9847 786.8987 517.9847L826.4828 519.4172 826.4828 482.1712C812.9378 480.8978 804.4722 479.3857 801.0859 477.6348 797.6997 475.8839 791.1024 468.2437 781.2939 454.7142 771.4855 441.1847 755.1381 415.6377 732.2518 378.0734L702.1259 328.412 752.9195 209.0338C768.5663 171.7878 780.8269 145.047 789.7012 128.8116 794.1383 120.2164 797.6997 115.1229 800.3853 113.5312 803.071 111.9395 811.7701 109.7111 826.4828 106.846L826.4828 69.6C809.2012 70.2367 785.8478 70.555 756.4226 70.555 739.6081 70.555 726.1799 70.2367 716.1379 69.6 710.7666 79.7869 702.9433 96.6591 692.6678 120.2164L671.6497 167.0126 644.6765 230.9994C621.5567 188.6599 607.1943 161.9192 601.5895 150.7772 591.0805 130.085 577.8858 103.0259 562.0055 69.6 549.6282 69.9183 539.4694 70.0775 531.5293 70.0775 524.2897 70.0775 512.613 69.9183 496.4992 69.6L496.4992 106.846C513.0801 107.801 524.0562 110.9845 529.4275 116.3963 539.0024 126.2649 570.763 179.1096 624.7094 274.9306L579.1702 378.0734 561.6552 418.1845C555.3498 431.2365 549.1611 442.2193 543.0892 451.1328 539.3527 456.5447 535.7913 460.2852 532.405 462.3544 529.0188 464.4236 525.1071 465.4582 520.67 465.4582 516.6999 465.4582 510.1609 464.6624 501.0531 463.0707L495.4483 498.8841C532.8137 508.4344 567.7271 518.9397 600.1883 530.4ZM992 299.7822C971.2744 289.3273 958.8006 282.2121 954.5787 278.4368 948.4378 272.3381 944.1199 264.6421 941.6252 255.3488 937.979 242.5706 936.1559 223.6937 936.1559 198.7181L936.1559 37.5383C936.1559-4.2813 929.1034-34.9926 914.9985-54.5956 900.8936-74.1985 876.09-84 840.5877-84 835.7901-84 831.7601-84 828.4978-84L828.4978-69.1889C837.901-69.7697 845.961-67.5916 852.6777-62.6546 859.3943-57.7175 864.6717-51.038 868.5097-42.616 872.3478-34.194 874.8426-23.4487 875.994-10.38 876.5697-6.8951 876.8576 4.7215 876.8576 24.4697L876.8576 184.7782C876.8576 203.0743 878.1049 220.2087 880.5997 236.1815 882.5187 247.5077 885.925 257.3817 890.8186 265.8037 895.7121 274.2258 901.997 281.4861 909.6732 287.5848 915.6222 292.2314 924.4498 296.2972 936.1559 299.7822 922.1469 304.1384 910.7286 310.6001 901.901 319.1673 893.0735 327.7345 887.0285 338.1168 883.7661 350.3142 879.1604 366.8678 876.8576 388.3585 876.8576 414.7862L876.8576 575.0947C876.8576 593.3908 876.5697 604.8622 875.994 609.5088 875.0345 618.2212 873.3553 626.7884 870.9565 635.2104 868.5577 643.6324 865.2474 650.3846 861.0255 655.4668 856.8036 660.5491 851.91 664.1066 846.3448 666.1395 840.7796 668.1724 834.1589 669.1889 826.4828 669.1889L826.4828 684 840.8756 683.5644C860.6417 683.5644 877.913 680.0794 892.6897 673.1095 902.4768 668.4628 910.057 662.2189 915.4303 654.3778 920.8036 646.5366 925.2174 636.3721 928.6717 623.8843 933.6612 605.8786 936.1559 585.4044 936.1559 562.4617L936.1559 400.8463C936.1559 380.8077 937.0195 365.924 938.7466 356.1951 940.4738 346.4663 943.2564 338.3347 947.0945 331.8003 950.9325 325.266 955.8261 319.966 961.7751 315.9002 964.2699 314.4481 974.3448 309.0754 992 299.7822Z"  horiz-adv-x="1024" vert-adv-y="1024"  />
 
       
 
diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.ttf b/frontend/desktop/src/assets/fonts/bksops-icon.ttf
index ed11d935cbc610b9610e58427e97ed01b427728f..59bf7604dd089fd7a403e6546f81da738e47b88c 100644
GIT binary patch
delta 1007
zcmX|9OKcle6uoz5-g`6S8IM2n@r><>iS10{=2L8s?UKYPRRJMDqAGHit<^MGRYDU{
zL1~d3kXUs=h%15Ekgx)!2&wJ@D6QCmSX3-P$^xV|3sfqE*buS8Jg0(pbam#Qd(M5c
zcw4uH4{i$^`R*bBz6k)Wvn%b@mp=Pr7eM+NK-+wI`HiLBpVzJcB)$W9>-WyN_Tu>3
z`K#P}k5{e31@$S)y)djoXXWChhffdseBX}%!h_`tXWJXr^7jDo7rFM@O8e3(-i3Ys
zo#Ou7EA5qY8?xPr09?Dt1MjR}c=h7R_H(}hyg&Ee7l#{nul}%e+L-$bA`<rl+<!j#
z(SJPH8<=!goa4O=!cgT0d3^;BdpSIfVs9N6koCX8zlG+bJP<w?c}?=-l6d1F0m5~z
z4zrV-)dO7;)_LEA9QXOXed&lO?Xlir(&RK4^w!w?Jo0f9&Oisw!`tu)+(e0kVur)#
zC>@}Tk5I*9*upcogdMz$m;1kxQxU=d_E`T|{0icJ|4w4Dy96-U5%2LIYQU55EUd!~
zcmPljYW0d^I<^x|i($2i^{~QBW;+%&Fh5oes=+h{mM>UlRA82quhpk9Nm&#v({_?g
z46A&O<%-3}rp0=9HYa4qN2j)cPVdi6zgrK+_=-^$)Cgr9Sv2V(3~hc@Z62%jA@iNV
z7;l1UF&|dS!@SLXoJIwTDHOd%FrJRsjle~01|o_nL_x{9Q`L+;8u&sQu`qMeRy5u7
zosq1TF|p2wZbif{N`he}>@=Y$uxL!tvSu<yWD-#&FGm%L9NLNb1xKIA1g4tJ`xPfj
zW!s%{4cV~Lc{!Hy3$AROSWp$JYEjz2FGr{<(o(1!W<(gS*Oa*B5r!yhan11UXpAzV
zDJ4>Gh24lAioeLI$;M-|&m3Wo$5m4tp|;s_e3{6Jl<=)uI9{u~P)@TTEX|-HRAp74
z^zu{6Kc8!}C2!o5aN9u5OA`B2FO_ilaxdwQZDnZGi8C}%Rh(oxzwKvDD(Z2f=w|Wb
zg(p6YHCjRX#3{t0KqeaH*BdFFNJT^=KXdeGY@}R7+1Pm3)MY9ZqCdr`5=|Dj7iJAK
lT$5zC)2X<tGD5wCJHC}+x@%A)!v4Rhf9u+PMXK|s{4drYuzLUi

delta 1018
zcmXw%OKcle6o${a^BzBv8PCHuj$_ZnnK&`F<9O^qotPw~DzzXgYJ<cg#cdL@NN8xQ
zDhMQ}3l^|S>q@{1kSZ2PWl?V`L`B)KKomBp&60!-NCB}ZF9~9fgP5aV_uT*d_nU|2
z-Mj3AyKKj8tpMN~0I+y|qq%u4b8rQK{|q4b_RH(9t={@}_bmYZ9>CSV*H)U#-lGpQ
zl>MGmStCQ87by!p4Xtfl-a3eMZxio30QTehh4amwf%UHdv=iiA*=TNU;y3UY^-;>F
zUTJQu?8w$y0N@4z*qfUdE?qv=Z2Sc9&ePZK6en--@9mxKtNjK6p7H>Dp-&F}U%UHV
zL)_(Rw3mVPT)L3-Dg4|{;aL>h+gL}Ta}WPy)56!?F3kiIN6L{1$$flu0@zJ*duMaB
zsz*N0wrF326y*}_-}xs{XqSX(*6p@mm5v=l8r5J4R$&dc;Ul<>jEcuNRf1~dsEYVs
zmGCJ%jZ3(UtGLzqMR*|~(39*7os-(@h=-jo_2pKp+wG1D_qiNA33JeZt8fSCWo@rg
zov=*HwrnlW`Q>S>`V)pohAH-;JM5RevX@6sOES|4Gs(2with|ZL@A7>VcC&s^vg6y
zyJRQPwg%8h;vk9=74_m6`W7)O)d9a;J!&XCJcR`1+)T+fiAlls&h@M!5TH^=Yoh(d
z^<=9~Il8kWc@>URFvC#r7Hd;k-C3-8?4>Dzi9_^BLZ#vPQ)6zqmS>|}<>YocteYeG
zOd%i1CAmjd-mznHK-R;Bq8b*Jndc+cpw19Q-qym8rLwZhSip$s{~QEmBdznjK`P;7
z<(7(Ez>M}Axl|%12Z<n!j4OngMI~COx@J8iO{MzseqmwAR71|lyk`fa>1-tw%@nF$
zuzzmmT)0o}k67~J<MK0?W`#cOxPYFTsx`(ImY!8+lz4(4m6Gv`$%q*c1JN`){3Bd^
z@x=V<Y(_1&j!)K2_G=)d9dq+jfy3$kg-N&UiY$j=WiU3B-yQMdvT4e}NUZem^m7JA
zoVb|S&!p^hP?cmin)V+IshVTRG(ydZ3j;qmY1=Vn#f>?o2N^{lv=wGxDA>b2B%H!)
zmK4<EJznv?)wt-p8;q4WsnVEzzmd`;aU9Vo)X$u;vUB4s5MDm_d0bZ&z8C@MbZ+b^
Iyib4izoq`d`v3p{

diff --git a/frontend/desktop/src/assets/fonts/bksops-icon.woff b/frontend/desktop/src/assets/fonts/bksops-icon.woff
index f42a17ea0db6696572d6614a5a46c32e6abe872f..d89befc02ae74241f6f408d79e85f8fbf762302c 100644
GIT binary patch
delta 3560
zcmV<E4Hxpjy8)!T0Tg#nMn(Vu00000U8DdD00000o|usoKYwInZDDW#00Dpi00jmB
z01T2;t?t-oY<Xq?00xKv08oVh0D<h-+;MwoWnp9h09OzI001!n001^9acYZbXk}pl
z09Ql+001BW001NkMFzZRZFG1509RxH0055w00QXhM*p*HZ)0Hq09W(?00DLY00DN8
z6>Q3FVR&!=05e%^0000U0000W0nPySZeeX@003Ex000430007okO*iCaBp*T003I#
z0008L000MDQ<DV&JppEuLjfp%Gwb}<VTfV2VR!=+W(3Ir0LsS-`*@tq*7>tna~#L<
z=l6D1$d)3N_Jy=bg|rauR6-GLmQ+fmB-c`w_9&r{rA3iwlcgCm%`{Up_I}8|jQ2%@
ze$I?F@7H~u@dxM^_srvdzxT}Neb4*6Kj-r~Z{Qf9T56lh^Xm>u`HixFSMzMC>U=eh
zt2$p^HaGw7Ns}Dch}ls)>P3TS6TM<k%!-Pb8_Q!wtcumKF*e2K*bzHpckGFMu|K|z
zgK;Q+tt_i7udH$8NdBMMQHnZIKN>~b=o5o8eooBG_>~#IrYe3*5x+OyjRO(!Qyh-p
z{*C|dKc&2fo{VJzlX#GSm)Th=&!c*&VIGb0Xj64`Dvr*j-lgHCv8C~)38jisMOA!R
z)}%ZuSDhNv<XDcUR@UeQPUIv`<`imkDs?!Gx|~iu&Y(UGXvmpawZ>V!rZl5DEoezA
zT5}d>(}r`h&h2PV2Rd>toj8xqbfGKfa{(99jf?0`kIcFk7jp@Jy}6Xj=tE!n(Vqbf
zWDu8g1%nyFP_AScS8+AhFq{!w%XN(8dTwA8qZyO;J&qf>iJQ5F@!XnKn3#3Ajmb>m
zcBV3o>3Q6d#|&n2C$qSV+1yP9_i`WiGl#i6kac^AhndHG7O;>-EM^Hyd4xw<#&RCZ
zvnzO<CwP*Ttl}wup5_@=^DNKtJTI_@wX9=3FLDnX*vLyc3!8X_&AiHMY+)<g*ui#Q
zXD4s)CU5aJyRz`rk80kJ@}c>k{M6E~n%@<Fy_04aGQ}w56G{}cx}%^K9tExZDCCn&
z6!MuS3i)&sg?!G5LO$`tai)yoc+*Z1wJg^IQOK1+6mpG|<pU6ZbqsyhwOn6B0i8SD
z&}ThEpY<)*A<@9lxkiT0HMU%(L=(&PN;EYzwwa-^%?*uhVQ6eiLt|SR8r#~?*s~0c
zJ=@UOHipKwH8i%Jp|R}^jqPB$cMu&-yLg;yD6W&CxbqCfbv6{&#ZX*VLviODio3v2
z+=YhXx*3YQ$WUB=cSCVK48`>{6xYj8TpvSmeGSF+GZfd~P}~5^-H;e)xi1ofEO$s^
zu;pG!46)obiJ^wBd8MIi4l{Jks|;Q9YD3q&#?Uo~8@lEQ%Uzhb)^a~4t}~R&NJF_?
zZzz`=4COM)P%fhl<ub-lE@KVlGR{ygHyX<2CPTU0Y$%t1TMXqg-cT;L8p>sYp<E^!
z%4L$FTy8Uz%Va~jOfi(p?S^uhYABa!hH{y1D3?17<ub!iE;9|~a;KqOW*N$*!cZ=A
z4COM{P%iTf<ucz;E(;9hve2r&FEW(ZVypVT#88e)4dwWVp&TDIl;bkX_b9R4v|q;x
z%XcfW($IZ>tg?LH600rWyu=#IcQCQm(7moRbg%0z-_XR1mhWm}gXLSB*l79wCN>$W
z&1OTj*<z?RTMgA_o1xllH&mM)hHA6ZP;GV_s?8olwb^T^Hv0_K=3UDUf_TrWa(LfR
z%|5W~FNhB<I}PF^%btVy*ic>f8>;I8%Z`Nj#IiSkAwIS2Qi#tC)&6tK&V~5GvWFqQ
zwCrYxuPpl-;%h^5^^Kvq`qt1~g`v5sG&EP=TlPf64~FLLM?>>=(6VD9ezNSHh@TD3
z=P#E16miJV+#a^<v4~$SyDj23Lv#MSp*jD<(47BiXrBKvH2;5Fc51{C%bpG0l4SQr
zWy!J?kE628vZJH2+_JZ$vWBtiAK<LoakGX7B1wP9V%s>be6!qLUc1YCxg^Cyq_h+n
ziQ*;FR4lDi+p<Kdfg;$5V<%D4+DKYU^?|~0To|e$tAL9@{YqK~L8Kx@;R7v_!fu-a
ziDU$5kpeM-pdU5RkNgz<NQ<QXNSbyxotfoQwCn)t2X~gUGqZ1wee>SDt7dsxWD<g(
z@p^waec4Qzgr;wRX0(6kgiqx3DKW_46y3t<l5RsAnqf0}KGxhjsjW>Kk9>hz09wxF
zYLyxZCe{O{KY*`<A-TCZwz;_*L-5+>rU4Ix1U#h7*e1+lNdB|=_A^@my@t{jKwD!V
zP>nXKp_u6$aAj(iUO}KU_sqtUWs`zG4o!dC(6o6H$pjM*Czf<;dNs@<o1mZ#znDsi
z{`MI#p-+e(fhMLMj*|2Hz^EDFq;mp7l<SGuylzspn8htn=W={IxRvQ_nTppf8LXVn
zY}M;-kF`pyX{`HePwaKUC3-@Ap8nZ~@86GQvm@CoinR+E=c$*8OWO<l%vfSOdE$S*
zt;Y0!wp;KNs<pg7?r$gaKypX2#zzm%Uw?4+_83fsZB{4UwpktAQt7xVxDN~5UHi~(
z|8R|7FC0FNn3dy4FG~A`Bjc0v2(=!*4?iqhrSWw|x_I>X3WH7`ez=9u{N(r%!Lk?o
zE?zT4zmynd5Nuu{tTI*7#+y1LXV8E505OK{fnON^0^#&G#mC=z3w<ott~m5XX32Qv
zxwFsBP4LKl)9f#EjrKQz_aK`UxlpaqCh^Lzba`E`_sO6#*JPi59`oC1*?8Z`p=ZAy
z_UVs$W!Z~9s~es=+|aKQ_3a!gLSaU~@^9lK(<cOa6Q>79^}mi%eA>q>P#=GJC7Vrw
zQczA11GlmnQLSz{!RLuu88LN4CYvFVz-y{6_IUntSIGHkELGYAM7`$MV~@ej>#Q?<
z*>30FKFD~`!FM=@`5~rZICMql(y@VX<R={Wk{=!^q0gx@j=>#49DDmR>w@?jEc-?r
zT<qoBEQd_|G|&7IeTGNbl!kxel^|~ugAz$RM{>&;x+>1?4Yc*b&=Fq1Xu03Gl{+?I
z+)`C&smCt_(|0SV1kzBWxaZFBu<^;zt~<smoHAC?2fSdsmph)rW&5FpD?zL8WGH=i
zxG`vaQYvY8hME|~myO-c=F82dB?~%@E)jd4wjaZCD5&B!kg9vp!5@DcH=*_V?e~mj
zxCnmCabLK4?ZVG*z~TP_XX$Kj^>27*y-Pw@?6aNraCu;HabR&FzqpuR*l9QakzZJ}
zs%@VO)5?Db(8}FM7+qiPjv-g(NWjNA^V*z7Xu3(SJMG20oyv3HX<C)>)f)d-nN{>V
zTh+FQYQj*~i%3W-CNh5^I9G%a-t6TxC4$rD*{XRIX2vco6W?VtL`0>d34=dh^nvk>
z-eR#Aejrs7B@I9;C90BfYW8`EjqF$9)oiJhHO_TEgw@&Szs>vO0;i<Y{!~Q&!`3|<
zgYw=oiX}iB#uXAV_T*#g#I7X3@PQI^XTN?5Qh`)j;l;R5N$G!ww(c!CWVhdoB>t`n
z54QNitBiWFF2F7Txla9AkK+4#oM8;<8rs-D_@cHkH)yPw>AgNN$o79`@WnYy1N@36
z{|^lJytfOU`(ZFP%$I-hRWKNTH-Y%G2?U`hzx?9Mf_;Li;`!fgTK#fVJDMoTiKb2v
zG3zBuwubLAW}bf;1Tbxe3g(As2(I#oeFC1GntCBJ(+_CwjC69k^(_}aJ300J<fD1a
zFXwK`=ccEgLhw{;`kV}-NO@su^5{u2d!+-z=vZq(a7|4FE<NpE`c1g?1lXT#wa$k8
z+CJaPGl8))#RD@=;l%Xxg2y>?fSZ_f3nyCHVN$t0r`LZmO?3m)v3oEjyJUOQ_BWfY
zu3{=dCag(q2s6;66BQmaGniA6Ak$w}skkOY0^x~>56KyFSRJ4$(U|uR5P1%M4&_P+
zKMsa)Rh$x04B>YYOr1D@CPRd|9I8D<b)bl0Jo)H}S$-W?BwGdfPu)oO7ZKrs3p5ya
zovJwX^6GyGOO>vAO!sVIGQ5O)q8hjD_SGR`xJ(U4$=h+#i#Uh?6K$xum^<816@W37
z0VV=~oGE3n8V~oX2^7P$SaB}w#H?mQPWE`>L8$Yr5OOnM#~h$P9Ai0*m_@JC(-RDM
zSqJNO*`q1WX=e-9y@{+W48+x-t0$AF$Rg(mD}#TE<d8zKjKdpAWEF=rJMMCFE|17H
z;I~Q6#c=tWAO+osH1BcxLQ$3naCm$kDG?UE9M5{3dA5G2<`!zqUmTH#8tKuAU3|&s
z3NlG996Tf^9IV41LBDrp_l{I%$}wK8<%=Mps>3Bb6wM4ejbD03^U++?4(k$lq5(F1
zH5z~ME4b}wK<QtLbE53y@fPiJ%7IvBJ<${77{SLng<#)L$D3EYjYDc|7N8HY1C8?8
zMnqukeE?FXsA=A0xepxDk5+?%gF{*IPhQR`2Kv^=M<tMyAltJZi}(~5&vH?}l3R=O
zf+BH}oA12H_CMb`FHHad0C=2ZU}Rum0OBZf-4|BJ^V@u7;AUX}frmcA^I`P=NB>3G
zZZO*bxf~2kAW;BbZVX<NSy!tEhz0;@IW)7g4_I~qA@%?Oc${NkWME*}#qf%Oiva|f
ifS3!+{txCe001+n0>!hYSq}sYtI_CxbGG4)0001cTFp2B

delta 3589
zcmX|Ec{tSV`~8eH8M~AvCDFWvge-3u8e5hOk}!oBOURh9hK4eBgY07+QrWW``>u>-
zWM8t3EM?1!kY#@J{pa^w*SXGh&U5bj{C&S~1hqAS_<fCabN~=Qe^1*0_WyBqZUR3P
zi?nyQLjeFN7yy`=0RSA8AhF@&<mT@P04xyz0M7z|kdxA($w+6UodW<^K<JZq=uo_|
zN0e};n{*FB*H`JdeqNiU$=Th@kM0H1bpik|tZneoD&0Kn>A5G|^d6u8A^x&kpSztO
zy;t6nUIK{HaTPQO9KE!2M*@K5Cwj<&K8%Y$=gf}sz<2?GH9f-63;?XwCW*`-HIRKG
z3<SZ-t)EQTMcCEa`7!c4GJORBWWxCqzs&A&7s_MIrQV(GQ@_e&=>k=WJkx(R3$<#K
zu2p};RTptfi(2;aPU}G&*dn9W65M+X<p*RFPjNvmh&m)?z2AYn--um}t$VeozWcK!
zN1j%U$y&#r(J-L>U`EsMM_EuMlRleArP!gWg1#e0<!W?GLy;nFi_E4{rcyI3OVFuu
zzH<5;)gQ-P0eRe0^n}mV9_AJ^U~+NhdB8@5FLi110<?SUuoPilR_9@JcDu$TO2>px
zIuEuNCnne|E8w*EE9RL+<eaHi>*ae(i4lh?f4b(--V%RXU+bp_*+|MJ|CD;p=#4EX
zQY|vL>#s1B@4mc-5P53glpK~SnIxI|A?3xbVROsqUnP?vB3<nw_k)BS+&Py}_ys+D
zo|x`PguSyN9|0|OSAnd5S(hC@R8;dr>tWu7QkTxJ)diO~RV3DD63l*TIW<s{UwVCH
zRa1$5w)cVSqf?6$O7c`Wx=JM+qY{Tb%Nzn&(4e=M`f-RZZkZKc86>3h(%?BAxv1fo
zMY$e1{EmNbDu$Vl^zMP7qy8MNx}?p#-&V4!p5R)aGKEO(-S_Xeli5uh;uuAXv)89v
z*C*pFD`x7m?$sxD&vt*G?c`0Vj9D&Oc(!FPaj-gNuG;oiwd=+BZ`rut5Lc{!Ot1f&
z8<xFhssr*RtCHCRf1$m*ZVr4I{vj8qIt-c&FI)TL+?)Dbn+AoO(s57}bR`f9Eud|G
zqn#;GpsZMnll{j<(hgB3Uv4BpoXvGLZ{0g@wL@3wkRS3!{Qv!wJb#qQhYO@e!i)s9
zgGM-cIHV>RO}->+@}pz96IU6zu(9AErCNlI7AVX0`C4Nkaa)M&t*0RGRfZ#CdacV$
zsZ8X3{b~h;KUy$*V>yM|WMV}rN36TO^TyY(p4z(#wOPc9O^(=2TW2?2dV+2wF3)Lt
zDQ?aUcf%1DFwgJcZf_<2iB34e80Ps=FlrqMDXSyatA|k^(rxSnd{!`wI;g-uF$70o
zVV<kPQNp&6m$}4xb}3)j^Z4Z!J#g);Sfp4=fP`noa@hmK^EE=MP{RrwHX-7;M(E^t
ziU}pU;uX9GOi~(U?@Xhil0BFDmgQiin7c`2WjZM(k(pp5#7ju(E%373FkHq$s1Ny$
zh>#TSLt>+dh!1p0pp$Ul@=X}2Up9$sNGG`@@>m#})B~59p#Rqr5oPj8<oz&ox;-S7
zL?<Um>QNZl(iW16qmu(9wVR$M!)1KwYeb7ro;`<@7d$>{?uX;a9Lx0`aQuN#-;O%@
z08;U-+NSp=+4ok(G$jaIQV}@M>nc6p)b%gfS9T|f7!Wi~X;!yC3X>eSZYhp*lAfRL
zVj&+WRSd)36@`li1YkA(U*Yc06dz@jhP^Oz`lL7m9&>CYPH)IQ%BbTQTe%FYnR1!Z
z<leTD2tNRiZ3L0e-W;}7j$Bo*-cX5%1CQ<7!@N(sD#gXrYc{Y(5kpdq{8S9AhSpJu
z5o@X5u!|^{Y80fpl3T(Kdnkw?SLZSxK|-;tf&~(W*>6S~Yn|9S&%IVq@PJzS7<LV%
zH1q956OT^DDs!&+2oq-1Qq%-?GLUuJ8+R2}TZIX`Q1HM}PT0!PZP+fY4*5}MqiSP{
zBK^R}Bgr5|AV_5SCK-=M*C0J~N!dFq&{468PM|7`<=O-6w0*wv;Nif==9bz)U_e~+
z?&Z~)0KXyM!#OVH)<G8N1fIFf#4q$;ektb)b{%u3M_;Zk=|AG3-DTr>qhDA=ftd1Y
zawoir{ZCgrITvF3?LQl<LTp0B^<+Ig-|y*D*2l71Xj*+1X)1ln!^hESC1d*_$mT&^
zwH|Imb<DvYo5U>r{{CGg+vw<DE>UlEj9drlAN~$uNTvlCRro<jAv<n-{9&G}c%D+u
zHKE`JPm(DyG%M1bfuI(g^PY(GCk6PE*iBGKe@o_}_e_(h>@B1$4szsq)Om5@Tmyr4
zR&I^2?TrY<H}IG;QIxj9zh!MT(+8v9n#vO2sN=1$?uCytI<gHZD~oGQdA=ST6<>t@
zK}D{1*x}1_Kuf1=wc>E?fbgKhlesaXzp|wosD0s;lw!Gaqg5C6LxiVF?bfWme63;E
zdIR_|cfRYg(0cy9h=psl_e}Pt04h5Zo+F9<YjTpPA@vyFZJV2|sb*ASm}!%<X#7jH
znb3pXFE{@XXkFf(ax>*!V0<~N8SpX1{#WYIL)ubR;>5A7e(A`+E~5ihS=Q%^Kb+4d
zFmKtM_B)?!+$3dBsj(Jz{|s6cVf@pq)@jDwmt{P_#s2E0*Hf>|8Kq{ucGCAOxlprC
zwSdirmPrpvTKl1CNm7W@E`wt-o1U=ruOx09wv{>F^n$RT^(p7%DkpkqzJdA5xdH=8
zWD3E;272;sF;Y{&s@!$6pe*4}7)8i|qIOYV!c;=&2**;qo?H)H|3z4M^ice@u*|2N
zPi%e*D&=N^9=xHFhoADMZ!SnL8-eE^wt@9x|4DrfZyj~J-{xzgJViWdeB1xg^F`R?
z7c5y2{5l@PE>^OTGND>z?j?RG6_#vguKTG%kaNS&2+fjh{MutDt(7el(+qUF&TY@J
zmC<mD(HCQMRyrT_vE1;G=id*g4!2v7!0|A;Kbv<2@3M;SEiW7}#pKHch{5Jb8rB-W
zFB4whI48A-yQjcdbL0~BS2!?qu2Pai8!N8)<OWOkJ3p3>D?HxXNkX1uo_46)uDT=W
z;#cCHpNyKt9%!U|7^?3+W=><o@1+=SH@iI!N}GFS+<XpSd~xw($<yYHw1>G(r5ZZ8
zU=ipF&$d%tbukx)G~MiV!Dz?7rr0W|z-kPsiTSNMzFIhQr$1npSBP;@pD#1eycx^+
zLuqT){9>C*n>hZsKVxF><VgDSacl7Kof+3n^2-u$>D=~%DIM#2isHQ)#e0dFSw@3y
z)#)}joE-O`uOHtZ`EMSmxxd7t)0x_6*LTV{xwsVSQ;NT@Y$Y)fTT9I!>)>lG`-K}e
z$I?;@qkl8PhA9T|vZ4DOyx-m^rY~SsQW-_7C)uw}F-1>L75VUgIFjkNpFwtMYuR03
zd#i49Sok+uPm&MRis6Tmgn$~vr!{!owlV|5GKdX<Uq;{AcUUq)dG;pQR0L865497x
zj+0u;y4%I#=d;5@xIZCHLg2ybwPr%I(+nCu5LThYd1cOyvd?Qyq}-7!kFh?b-QFq=
z`QM`j_MR4Gm+s(n1S_6rF<67RZ+2ySvqnMfz~ZH&3*R)3$u$L$KHetmIn|LNsWiUL
z+s3(SZ2{L0vCe)}633pZ(c6aiY9~9!!?~{ucy_pA&o$*B{F~m%ahht6(w-8=Z^J0V
zm#+7^q+Kl;j}CWZ>&~+xtYDeoqX_0I7wVf^Hj12YF6!t!JnFFmWhyT!E8e7i>)5&^
zsxl*&t#yK?HlWa64p64!<>5qzwcs-|@y=uX;vAU+xhUq}^HNaID~qNA#g5$C2K6vj
zp1cb$-@kX!#>+eB3ph4?Q&(5l$!(=V%n>#D0(!HzvR-y;Bsn?xI`;Gqp|`l}#jItg
zQ77YD&3KAT`+9qugp-gbrTzl5(o%a#6r+~4fp+9Mx6H{4qO6v2+|sGnN@W<LbY|<=
z4ZJ8p3geMXEO(R+wZgByS9GZzZDJCLPQ&n04{%5M3KwEmdBPd*hMmLhQ}0I<*;Wnj
z$1q{E<ISFAW$UDK8(=r2AHg3qbu5JQu8))oMqD9WQ*R0YLUgpB6dIa1a)$?}_;~x&
z>?AzR;?4Y(C&u@-&3UNq&$ga6PaRX@BY%fyKm3fZT^@S>Gy^t@ZTcCppk!&Jn)=mB
zxo5U<WZ8XD42Us7p+is^Um1vFo2$vJiiy@gVh?qcFKPY^u6%_JG};<i%$;|DUHBZC
zDL6)9?Qa27sjsMR7Ly4w$R2yqXtj51sZ1HhZntKFb_}&E@4Bz6wW$~y$&|ZTG`bvW
zUD-r&QZy<<?=6oWp54KelT@4yD~T(lc(OgRM4hK7u6`q%c=ofUzCihNK`-MKtIa{Y
za|5}^M=91LQUIF|o&_soqM<2g0ry`h`m0K2kaK8Mry)|vt#AEIG(j%*ynzlvo_fWe
ze?K**-e^q#r9=2>M2m{J-(@eSdzx^v>M1{eEsZGb`J=w!Hr(4We}p`J=!lr_edb@r
zpA{l&T!AEQM~V1Uf~hLs)3d)m@R+F;sYbJM&Awcb)^M~R$AzuX0INt%Ed7A-%e1$3
zu(buKHB$0ddUj_5kqeG?KuCDg`dr%@E$%G(^LN`?5L)F@nnoV*?3jZ!QPZNBeLbB<
z1HH^vdJO<oyB0nmv9tf*G}-+-B_tZelop)E-halmB2T}lb{W1@MOkt&v5z?KK{1~f
Iqv^%}2O}Haq5uE@

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
index 4b7041edf2..dd592e4b9f 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -104,7 +104,7 @@
             <i
                 :class="['common-icon-variable-hook hook-icon', { actived: hook, disabled: !option.formEdit || !render }]"
                 v-bk-tooltips="{
-                    content: hook ? $t('恢复为非变量节点内维护') : $t('转换为变量集中维护'),
+                    content: hook ? $t('取消使用变量，节点内维护') : $t('转换为变量，集中维护'),
                     placement: 'bottom',
                     zIndex: 3000
                 }"
@@ -425,7 +425,15 @@
         background: #ffeeec;
     }
     &.rf-has-hook .rf-tag-form {
-        margin-right: 45px;
+        margin-right: 40px;
+    }
+    &.show-render {
+        > .rf-tag-form {
+            margin-right: 58px;
+        }
+        .hook-icon {
+            padding-right: 3px !important;
+        }
     }
     .rf-group-name {
         display: block
@@ -446,15 +454,17 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        padding: 0 8px;
         height: 32px;
         background: #f0f1f5;
         border-radius: 2px;
+        cursor: pointer;
         z-index: 1;
-        .hook-icon {
-            font-size: 16px;
+        .hook-icon,
+        .render-skip-icon {
+            height: 32px;
+            line-height: 32px;
+            font-size: 12px;
             color: #979ba5;
-            cursor: pointer;
             &.disabled {
                 color: #c4c6cc;
                 cursor: not-allowed;
@@ -464,8 +474,13 @@
             }
         }
         .hook-icon {
+            line-height: 33px;
+            padding: 0 8px;
             font-size: 16px;
         }
+        .render-skip-icon {
+            padding: 0 8px 0 3px;
+        }
         .icon-angle-up-fill {
             font-size: 12px;
             color: #c4c6cc;
diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
index dae623311b..6d53b47681 100644
--- a/frontend/desktop/src/components/common/RenderForm/FormItem.vue
+++ b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -477,12 +477,15 @@
     }
     &.rf-has-hook {
         & > .rf-tag-form {
-            margin-right: 45px;
+            margin-right: 40px;
         }
     }
     &.show-render {
         > .rf-tag-form {
-            margin-right: 64px;
+            margin-right: 58px;
+        }
+        .hook-icon {
+            padding-right: 3px !important;
         }
     }
     &.rf-col-layout {
@@ -548,16 +551,17 @@
         display: flex;
         align-items: center;
         justify-content: space-between;
-        padding: 0 8px;
         height: 32px;
         background: #f0f1f5;
         border-radius: 2px;
         z-index: 1;
+        cursor: pointer;
         .hook-icon,
         .render-skip-icon {
-            font-size: 14px;
+            height: 32px;
+            line-height: 32px;
+            font-size: 12px;
             color: #979ba5;
-            cursor: pointer;
             &.disabled {
                 color: #c4c6cc;
                 cursor: not-allowed;
@@ -567,10 +571,12 @@
             }
         }
         .hook-icon {
+            line-height: 31px;
+            padding: 0 8px;
             font-size: 16px;
         }
         .render-skip-icon {
-            margin-left: 7px;
+            padding: 0 8px 0 3px;
         }
         .icon-angle-up-fill {
             font-size: 12px;
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
index 520428a8f5..e438f40b05 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagCodeEditor.vue
@@ -213,12 +213,14 @@
                             }
                         })
                     })
-                } else if (this.decorationsMap[lineNumber]) {
-                    this.decorationsMap[lineNumber].forEach(decorations => {
-                        monacoInstance.deltaDecorations(
-                            [...decorations],
-                            []
-                        )
+                } else {
+                    Object.keys(this.decorationsMap).forEach(key => {
+                        this.decorationsMap[key].forEach(decorations => {
+                            monacoInstance.deltaDecorations(
+                                [...decorations],
+                                []
+                            )
+                        })
                     })
                     this.decorationsMap = {}
                 }
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index f3679cd257..3b772babee 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -48,11 +48,11 @@
                             <li
                                 class="rf-select-item"
                                 v-for="item in varList"
-                                v-bk-overflow-tips
-                                :key="item"
-                                :class="{ 'is-hover': hoverKey === item }"
-                                @click.stop="onSelectVal(item)">
-                                {{ item }}
+                                :key="item.key"
+                                :class="{ 'is-hover': hoverKey === item.key }"
+                                @click.stop="onSelectVal(item.key)">
+                                <span class="key">{{ item.key }}</span>
+                                <span class="name" v-bk-overflow-tips>{{ item.name }}</span>
                             </li>
                         </ul>
                     </div>
@@ -122,14 +122,14 @@
             }),
             constantArr: {
                 get () {
-                    let Keylist = []
+                    let KeyList = []
                     if (this.constants) {
-                        Keylist = [...Object.keys(this.constants)]
+                        KeyList = [...Object.values(this.constants)]
                     }
                     if (this.internalVariable) {
-                        Keylist = [...Keylist, ...Object.keys(this.internalVariable)]
+                        KeyList = [...KeyList, ...Object.values(this.internalVariable)]
                     }
-                    return Keylist
+                    return KeyList
                 },
                 set (val) {
                     this.varList = val
@@ -330,7 +330,7 @@
                     matchResult = [matchText]
                 }
                 if (matchResult && matchResult[0]) {
-                    this.varList = this.constantArr.filter(item => item.indexOf(matchText) > -1)
+                    this.varList = this.constantArr.filter(item => item.key.indexOf(matchText) > -1)
                     // 计算变量下拉列表的left
                     this.isListOpen = false
                     if (this.varList.length) {
@@ -352,11 +352,10 @@
                         this.$el.appendChild(newDom)
                         const focusValueWidth = newDom.offsetWidth || 0
                         this.$el.removeChild(newDom)
-                        let right = inputWidth - 238 - previousDomLeft - previousDomWidth - focusValueWidth
-                        right = right > 0 ? right : 0
-                        this.varListPositionRight = right
                         this.$nextTick(() => {
-                            const { height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            const { width: varListWidth, height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            let right = inputWidth - varListWidth - previousDomLeft - previousDomWidth - focusValueWidth
+                            right = right > 0 ? right : 0
                             const top = window.innerHeight < inputTop + 30 + varListHeight + 50 ? -95 : 30
                             this.varListPosition = `right: ${right}px; top: ${top}px`
                         })
@@ -382,9 +381,14 @@
                 // 获取行内纯文本
                 const divInputDom = this.$el.querySelector('.div-input')
                 let inputValue = divInputDom.textContent
+                inputValue.replace(' ', ' ')
                 if (divInputDom.childNodes.length) {
                     inputValue = Array.from(divInputDom.childNodes).map(item => {
-                        return item.type === 'button' ? item.value : item.textContent
+                        return item.type === 'button'
+                            ? item.value
+                            : item.textContent.trim() === ''
+                                ? ' '
+                                : item.textContent.replace(/&nbsp;/g, ' ')
                     }).join('')
                 }
                 this.input.value = inputValue
@@ -410,7 +414,7 @@
                     let isExistVar = false
                     if ($0) {
                         isExistVar = this.constantArr.some(item => {
-                            const varText = item.slice(2, -1)
+                            const varText = item.key.slice(2, -1)
                             if ($0.indexOf(varText) > -1) {
                                 const regexp = new RegExp(`^(.*\\W|\\W)?${varText}(\\W|\\W.*)?$`)
                                 return regexp.test($0)
@@ -451,12 +455,12 @@
                 if (len) {
                     event.preventDefault()
                     event.stopPropagation()
-                    let curIndex = this.varList.findIndex(item => item === this.hoverKey)
+                    let curIndex = this.varList.findIndex(item => item.key === this.hoverKey)
                     curIndex = event.code === 'ArrowDown' ? curIndex + 1 : curIndex - 1
                     curIndex = curIndex > len - 1 ? 0 : (curIndex < 0 ? len - 1 : curIndex)
                     const option = this.varList[curIndex]
                     if (option) {
-                        this.hoverKey = option
+                        this.hoverKey = option.key
                         const selectDom = this.$el.querySelector('.rf-select-content')
                         const hoverItemDom = selectDom.querySelector('.is-hover')
                         if (hoverItemDom) {
@@ -487,12 +491,17 @@
             position: absolute;
             top: 30px;
             right: 0;
-            width: 238px;
+            max-width: 600px;
             background: #ffffff;
+            border: 1px solid #dcdee5;
             border-radius: 2px;
-            box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
+            box-shadow: 0 3px 9px 0 rgba(0,0,0,.1);
             overflow-y: hidden;
             z-index: 100;
+            .name {
+                color: #c4c6cc;
+                margin-left: 16px;
+            }
         }
         .rf-select-content {
             max-height: 100px;
@@ -501,12 +510,21 @@
             @include scrollbar;
         }
         .rf-select-item {
+            display: flex;
+            align-items: center;
             padding: 0 10px;
             line-height: 32px;
             font-size: 12px;
             cursor: pointer;
-            overflow: hidden;
-            text-overflow: ellipsis;
+            > span {
+                flex-shrink: 0;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            .name {
+                max-width: 250px;
+            }
             &.is-hover,
             &:hover {
                 background: #f5f7fa;
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 4d16f302c8..c3f3832971 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -38,11 +38,11 @@
                         <li
                             class="rf-select-item"
                             v-for="item in varList"
-                            v-bk-overflow-tips
-                            :key="item"
-                            :class="{ 'is-hover': hoverKey === item }"
-                            @click.stop="onSelectVal(item)">
-                            {{ item }}
+                            :key="item.key"
+                            :class="{ 'is-hover': hoverKey === item.key }"
+                            @click.stop="onSelectVal(item.key)">
+                            <span class="key">{{ item.key }}</span>
+                            <span class="name" v-bk-overflow-tips>{{ item.name }}</span>
                         </li>
                     </ul>
                 </div>
@@ -107,10 +107,10 @@
                 get () {
                     let KeyList = []
                     if (this.constants) {
-                        KeyList = [...Object.keys(this.constants)]
+                        KeyList = [...Object.values(this.constants)]
                     }
                     if (this.internalVariable) {
-                        KeyList = [...KeyList, ...Object.keys(this.internalVariable)]
+                        KeyList = [...KeyList, ...Object.values(this.internalVariable)]
                     }
                     return KeyList
                 },
@@ -277,7 +277,7 @@
                 }
                 // 判断是否为变量格式
                 if (matchText === '$' || /^\${[a-zA-Z_]*[\w|.]*/.test(matchText)) {
-                    this.varList = this.constantArr.filter(item => item.indexOf(matchText) > -1)
+                    this.varList = this.constantArr.filter(item => item.key.indexOf(matchText) > -1)
                     // 计算变量下拉列表的坐标
                     this.isListOpen = false
                     if (this.varList.length) {
@@ -307,13 +307,13 @@
                         const focusValueWidth = newDom.offsetWidth || 0
                         const focusValueHeight = newDom.offsetHeight || 0
                         this.$el.removeChild(newDom)
-                        let popLeft = previousDomLeft + previousDomWidth + focusValueWidth
-                        if (popLeft > inputWidth - 238) {
-                            popLeft = inputWidth - 238
-                        }
-                        let popTop = textNodeTop - inputTop + focusValueHeight + 2 // 2px是为了使光标和联想列表隔开
                         this.$nextTick(() => {
-                            const { height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            const { height: varListHeight, width: varListWidth } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            let popLeft = previousDomLeft + previousDomWidth + focusValueWidth
+                            if (popLeft > inputWidth - varListWidth) {
+                                popLeft = inputWidth - varListWidth
+                            }
+                            let popTop = textNodeTop - inputTop + focusValueHeight + 2 // 2px是为了使光标和联想列表隔开
                             if (window.innerHeight < textNodeTop + focusValueHeight + varListHeight + 50) {
                                 popTop = textNodeTop - inputTop - varListHeight - 2
                             }
@@ -345,7 +345,11 @@
                     let domValue = dom.textContent || '\n'
                     if (dom.childNodes.length) {
                         domValue = Array.from(dom.childNodes).map(item => {
-                            return item.type === 'button' ? item.value : item.textContent
+                            return item.type === 'button'
+                                ? item.value
+                                : item.textContent.trim() === ''
+                                    ? ' '
+                                    : item.textContent.replace(/&nbsp;/g, ' ')
                         }).join('')
                     }
                     return domValue
@@ -376,7 +380,7 @@
                         let isExistVar = false
                         if ($0) {
                             isExistVar = this.constantArr.some(item => {
-                                const varText = item.slice(2, -1)
+                                const varText = item.key.slice(2, -1)
                                 if ($0.indexOf(varText) > -1) {
                                     const regexp = new RegExp(`^(.*\\W|\\W)?${varText}(\\W|\\W.*)?$`)
                                     return regexp.test($0)
@@ -436,12 +440,12 @@
                 if (len) {
                     event.preventDefault()
                     event.stopPropagation()
-                    let curIndex = this.varList.findIndex(item => item === this.hoverKey)
+                    let curIndex = this.varList.findIndex(item => item.key === this.hoverKey)
                     curIndex = event.code === 'ArrowDown' ? curIndex + 1 : curIndex - 1
                     curIndex = curIndex > len - 1 ? 0 : (curIndex < 0 ? len - 1 : curIndex)
                     const option = this.varList[curIndex]
                     if (option) {
-                        this.hoverKey = option
+                        this.hoverKey = option.key
                         const selectDom = this.$el.querySelector('.rf-select-content')
                         const hoverItemDom = selectDom.querySelector('.is-hover')
                         if (hoverItemDom) {
@@ -471,12 +475,17 @@
             position: absolute;
             top: 40px;
             right: 0;
-            width: 238px;
+            max-width: 600px;
             background: #ffffff;
+            border: 1px solid #dcdee5;
             border-radius: 2px;
-            box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
+            box-shadow: 0 3px 9px 0 rgba(0,0,0,.1);
             overflow-y: hidden;
             z-index: 100;
+            .name {
+                color: #c4c6cc;
+                margin-left: 16px;
+            }
         }
         .rf-select-content {
             max-height: 100px;
@@ -485,12 +494,21 @@
             @include scrollbar;
         }
         .rf-select-item {
+            display: flex;
+            align-items: center;
             padding: 0 10px;
             line-height: 32px;
             font-size: 12px;
             cursor: pointer;
-            overflow: hidden;
-            text-overflow: ellipsis;
+            > span {
+                flex-shrink: 0;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            .name {
+                max-width: 250px;
+            }
             &.is-hover,
             &:hover {
                 background: #f5f7fa;
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index fff8ebb805..b69269f734 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1788,7 +1788,10 @@ const cn = {
     '清除所有IP': '清除所有IP',
     '清除异常IP': '清除异常IP',
     '节点输入型变量仅支持从节点"取消使用变量"来删除': '节点输入型变量仅支持从节点"取消使用变量"来删除',
-    '节点输出型变量仅支持从节点"取消接收输出"来删除': '节点输出型变量仅支持从节点"取消接收输出"来删除   '
+    '节点输出型变量仅支持从节点"取消接收输出"来删除': '节点输出型变量仅支持从节点"取消接收输出"来删除',
+    '刷新': '刷新',
+    'exFailedText': '节点执行失败，请前往{0}查看错误原因',
+    'exFailedText_调用日志': '调用日志'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index ecff355d91..ad57c28e8d 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1822,7 +1822,10 @@ const en = {
     '清除所有IP': 'Clear all IPs',
     '清除异常IP': 'Clear abnormal IP',
     '节点输入型变量仅支持从节点"取消使用变量"来删除': 'Node input variables can only be deleted by the node "Cancel Using variable"',
-    '节点输出型变量仅支持从节点"取消接收输出"来删除': 'Node output variables can only be deleted by the node "Cancel Receiving Output"'
+    '节点输出型变量仅支持从节点"取消接收输出"来删除': 'Node output variables can only be deleted by the node "Cancel Receiving Output"',
+    '刷新': 'Refresh',
+    'exFailedText': 'Node execution failed. Please go to the {0} to check the error reason.',
+    'exFailedText_调用日志': 'call log'
 }
 
 export default en
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index d654c1de1a..14df3b33f6 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -130,7 +130,8 @@
                                     :execute-info="executeRecord"
                                     :node-detail-config="nodeDetailConfig"
                                     :not-performed-sub-node="notPerformedSubNode"
-                                    :is-sub-process-node="isSubProcessNode">
+                                    :is-sub-process-node="isSubProcessNode"
+                                    @onTabChange="onTabChange">
                                 </ExecuteRecord>
                                 <ExecuteInfoForm
                                     v-else-if="curActiveTab === 'config'"
@@ -1588,25 +1589,27 @@
         height: 320px;
         margin: 0 25px 8px 15px;
         position: relative;
-        background: #e1e4e8;
+        background: #f5f7fb;
         .sub-flow {
             height: 100%;
             border: 0;
-            background: #e1e4e8;
+            /deep/.canvas-wrapper {
+                background: #f5f7fb;
+            }
             /deep/.canvas-flow {
                 .active {
                     box-shadow: none;
                     &::before {
                         content: '';
                         display: block;
-                        height: calc(100% + 8px);
-                        width: calc(100% + 8px);
+                        height: calc(100% + 16px);
+                        width: calc(100% + 16px);
                         position: absolute;
-                        top: -4.5px;
-                        left: -5px;
+                        top: -9px;
+                        left: -9px;
                         z-index: -1;
                         background: #e1ecff;
-                        border: 1px solid #699df4;
+                        border: 1px solid #1768ef;
                         border-radius: 2px;
                     }
                 }
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
index 5e7fba5ad3..acf59d9de2 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteInfoForm.vue
@@ -752,7 +752,7 @@
         }
         .form-item-group {
             padding: 16px;
-            margin-right: 45px;
+            margin-right: 40px;
             background: #f5f7fa;
             .rf-tag-form {
                 margin-right: 0;
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
index efd7f45b99..7eb7b9c302 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
@@ -1,10 +1,15 @@
 <template>
     <div class="execute-record">
         <template v-if="Object.keys(executeInfo).length && !notPerformedSubNode">
-            <section class="info-section abnormal-section" data-test-id="taskExecute_form_exceptionInfo" v-if="executeInfo.ex_data">
-                <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
-                <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
-                <span class="expand-btn" v-if="isExpandTextShow" @click="isExpand = !isExpand">{{ isExpand ? $t('收起') : $t('显示全部') }}</span>
+            <section class="info-section abnormal-section" data-test-id="taskExecute_form_exceptionInfo" v-if="executeInfo.state === 'FAILED'">
+                <template v-if="!executeInfo.ex_data">
+                    <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
+                    <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
+                    <span class="expand-btn" v-if="isExpandTextShow" @click="isExpand = !isExpand">{{ isExpand ? $t('收起') : $t('显示全部') }}</span>
+                </template>
+                <i18n v-else tag="div" path="exFailedText" class="show-html-text">
+                    <a href="javascript:void(0);" class="link" @click="$emit('onTabChange', 'log')">{{ $t('exFailedText_调用日志') }}</a>
+                </i18n>
             </section>
             <section class="info-section" data-test-id="taskExecute_form_executeInfo">
                 <ul class="operation-table" v-if="isReadyStatus">
@@ -174,11 +179,6 @@
             color: #3a84ff;
         }
     }
-    .not-fail {
-        color: #979ba5;
-        font-size: 12px;
-        padding-left: 15px;
-    }
     .operation-table {
         display: flex;
         align-items: center;
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
index 527f870c8d..3d88878eaf 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/InputParams.vue
@@ -434,7 +434,7 @@
     }
     .form-item-group {
         padding: 16px;
-        margin-right: 45px;
+        margin-right: 40px;
         background: #f5f7fa;
         .rf-tag-form {
             margin-right: 0;
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableCitedList.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableCitedList.vue
index 53d94550fb..d1925685c0 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableCitedList.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/VariableCitedList.vue
@@ -24,7 +24,7 @@
                         @click.stop="onCitedNodeClick(group.key, item.id)">
                         {{ item.name }}
                     </span>
-                    <i class="common-icon-box-top-right-corner"></i>
+                    <i class="common-icon-box-top-right-corner" @click.stop="onCitedNodeClick(group.key, item.id)"></i>
                 </div>
             </div>
         </template>
diff --git a/frontend/desktop/src/scss/iconfont.scss b/frontend/desktop/src/scss/iconfont.scss
index bad7e07801..eb48bed614 100644
--- a/frontend/desktop/src/scss/iconfont.scss
+++ b/frontend/desktop/src/scss/iconfont.scss
@@ -590,9 +590,9 @@
 .common-icon-full-screen:before {
 	content: "\e202";
 }
-.common-icon-variable-hook:before {
-	content: "\e205";
-}
 .common-icon-converge-node:before {
 	content: "\e204";
 }
+.common-icon-variable-hook:before {
+	content: "\e207";
+}

From 7a8d18cf479ed5c4eb8ab17db2f23941515371cf Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Fri, 13 Oct 2023 16:45:26 +0800
Subject: [PATCH 107/112] =?UTF-8?q?optimization:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=9E=E6=80=A7&&=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/RenderForm/tags/TagInput.vue   | 1 +
 .../components/common/RenderForm/tags/TagTextarea.vue    | 1 +
 frontend/desktop/src/pages/task/PeriodicList/index.vue   | 3 ++-
 .../desktop/src/pages/task/TaskExecute/ExecuteInfo.vue   | 5 +++--
 .../desktop/src/pages/task/TaskExecute/TaskOperation.vue | 9 ++++++++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index 3b772babee..b5b38ea8e5 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -32,6 +32,7 @@
                         }"
                         :contenteditable="!isDisabled"
                         :data-placeholder="placeholder"
+                        data-test-name="formTag_input_divInput"
                         v-bk-clickoutside="handleClickOutSide"
                         @mouseup="handleInputMouseUp"
                         @focus="handleInputFocus"
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index c3f3832971..0ec4ac324d 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -21,6 +21,7 @@
                     }"
                     :contenteditable="!isDisabled"
                     :data-placeholder="placeholder"
+                    data-test-name="formTag_textarea_divInput"
                     v-bk-clickoutside="handleClickOutSide"
                     @mouseup="handleInputMouseUp"
                     @focus="handleInputFocus"
diff --git a/frontend/desktop/src/pages/task/PeriodicList/index.vue b/frontend/desktop/src/pages/task/PeriodicList/index.vue
index 5455b34667..891bdd5ff2 100644
--- a/frontend/desktop/src/pages/task/PeriodicList/index.vue
+++ b/frontend/desktop/src/pages/task/PeriodicList/index.vue
@@ -65,9 +65,10 @@
                                                 'disable': collectingId === row.id,
                                                 'text-permission-disable': !hasPermission(['periodic_task_edit'], row.auth_actions)
                                             }"
+                                            :title="row.name"
                                             @click="onCollectTask(row)">
                                         </a>
-                                        <span class="name" v-bk-overflow-tips>{{row.name || '--'}}</span>
+                                        <span class="name" :title="row.name" v-bk-overflow-tips>{{row.name || '--'}}</span>
                                         <span
                                             class="label"
                                             v-if="row.is_latest === null"
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 14df3b33f6..2684f05919 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -11,7 +11,7 @@
 */
 <template>
     <div class="parameter-details">
-        <bk-resize-layout class="details-wrapper" placement="left" :max="500" :initial-divide="403" :min="400">
+        <bk-resize-layout class="details-wrapper" placement="left" :max="sidebarWidth - 600" :initial-divide="243" :min="240">
             <NodeTree
                 slot="aside"
                 :tree-data="nodeData"
@@ -304,7 +304,8 @@
             smallMapImg: {
                 type: String,
                 default: ''
-            }
+            },
+            sidebarWidth: Number
         },
         data () {
             return {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 70c54091e3..09fdd057ae 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -65,7 +65,7 @@
         </div>
         <bk-sideslider
             :is-show.sync="isNodeInfoPanelShow"
-            :width="['viewNodeDetails', 'executeInfo'].includes(nodeInfoType) ? 1300 : 960"
+            :width="sidebarWidth"
             :quick-close="true"
             :before-close="onBeforeClose"
             @hidden="onHiddenSideslider">
@@ -107,6 +107,7 @@
                     :constants="pipelineData.constants"
                     :gateways="pipelineData.gateways"
                     :condition-data="conditionData"
+                    :sidebar-width="sidebarWidth"
                     @close="onCloseConfigPanel"
                     @onRetryClick="onRetryClick"
                     @onSkipClick="onSkipClick"
@@ -488,6 +489,12 @@
             },
             adminView () {
                 return this.hasAdminPerm && this.$route.query.is_admin === 'true'
+            },
+            sidebarWidth () {
+                if (['viewNodeDetails', 'executeInfo'].includes(this.nodeInfoType)) {
+                    return window.innerWidth - 340
+                }
+                return 960
             }
         },
         mounted () {

From 4495f9637eb728802f288257cf6c63020db46e6e Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 16 Oct 2023 14:37:57 +0800
Subject: [PATCH 108/112] =?UTF-8?q?optimization:=20=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0hover=E8=A7=A6=E5=8F=91=E7=83=AD=E5=8C=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateEdit/NodeConfig/OutputParams.vue        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index ebdd9c6c5a..65495fa772 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -25,17 +25,18 @@
             <bk-table-column label="Key" class-name="param-key" :width="260">
                 <template slot-scope="props">
                     <div v-bk-overflow-tips :style="{ color: props.row.hooked ? '#3a84ff' : '#63656e' }">{{ props.row.key }}</div>
-                    <span class="hook-icon-wrap">
+                    <span
+                        class="hook-icon-wrap"
+                        v-bk-tooltips="{
+                            content: props.row.hooked ? $t('取消接收输出') : $t('使用变量接收输出'),
+                            placement: 'bottom',
+                            zIndex: 3000
+                        }">
                         <i
                             :class="['common-icon-variable-hook hook-icon', {
                                 actived: props.row.hooked,
                                 disabled: isViewMode || !hook
                             }]"
-                            v-bk-tooltips="{
-                                content: props.row.hooked ? $t('取消接收输出') : $t('使用变量接收输出'),
-                                placement: 'bottom',
-                                zIndex: 3000
-                            }"
                             @click="onHookChange(props)">
                         </i>
                     </span>

From 29e335de12579c3fd3515a035dba599fb21862bd Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 16 Oct 2023 15:27:42 +0800
Subject: [PATCH 109/112] minor: release V3.31.0_beta1

---
 app.yml           | 2 +-
 app_desc.yaml     | 2 +-
 config/default.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app.yml b/app.yml
index c1de4d0cdd..ba4805ebe7 100644
--- a/app.yml
+++ b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.31.0-alpha2
+version: 3.31.0-beta1
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index ff5bd6bc65..070b829d00 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.31.0-alpha2"
+app_version: "3.31.0-beta1"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index 911fe0b52e..f828cdaf84 100644
--- a/config/default.py
+++ b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.31.0-alpha2"
+STATIC_VERSION = "3.31.0-beta1"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]

From 0d014bad80d5acbaa850b97397fc4eca4a1bd21a Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 16 Oct 2023 19:08:33 +0800
Subject: [PATCH 110/112] =?UTF-8?q?bugfix:=20=E5=8F=98=E9=87=8F=E8=81=94?=
 =?UTF-8?q?=E6=83=B3=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?&&=E4=BE=A7=E6=A0=8F=E6=8B=96=E6=8B=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       |   3 +-
 .../common/RenderForm/tags/TagTextarea.vue    |   3 +-
 .../TaskExecute/ExecuteInfo/ExecuteRecord.vue |   2 +-
 .../pages/task/TaskExecute/TaskOperation.vue  | 108 +++++++++++++++++-
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |   7 +-
 .../TemplateEdit/NodeConfig/OutputParams.vue  |   2 +-
 .../TabGlobalVariables/index.vue              |   7 +-
 7 files changed, 118 insertions(+), 14 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
index b5b38ea8e5..5ec2d2737f 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -354,7 +354,7 @@
                         const focusValueWidth = newDom.offsetWidth || 0
                         this.$el.removeChild(newDom)
                         this.$nextTick(() => {
-                            const { width: varListWidth, height: varListHeight } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            const { width: varListWidth, height: varListHeight } = this.$el.querySelector('.rf-select-list').getBoundingClientRect()
                             let right = inputWidth - varListWidth - previousDomLeft - previousDomWidth - focusValueWidth
                             right = right > 0 ? right : 0
                             const top = window.innerHeight < inputTop + 30 + varListHeight + 50 ? -95 : 30
@@ -429,6 +429,7 @@
                     return match
                 })
                 divInputDom.innerHTML = innerHtml
+                this.updateInputValue()
             },
             // 文本框按键事件
             handleInputKeyDown (e) {
diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
index 0ec4ac324d..c5e3e305a0 100644
--- a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
+++ b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -309,7 +309,7 @@
                         const focusValueHeight = newDom.offsetHeight || 0
                         this.$el.removeChild(newDom)
                         this.$nextTick(() => {
-                            const { height: varListHeight, width: varListWidth } = document.querySelector('.rf-select-list').getBoundingClientRect()
+                            const { height: varListHeight, width: varListWidth } = this.$el.querySelector('.rf-select-list').getBoundingClientRect()
                             let popLeft = previousDomLeft + previousDomWidth + focusValueWidth
                             if (popLeft > inputWidth - varListWidth) {
                                 popLeft = inputWidth - varListWidth
@@ -407,6 +407,7 @@
                         dom.innerHTML = innerHtml
                     }
                 })
+                this.updateInputValue()
             },
             // 文本框按键事件
             handleInputKeyDown (e) {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
index 7eb7b9c302..f64e4a0635 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/ExecuteRecord.vue
@@ -2,7 +2,7 @@
     <div class="execute-record">
         <template v-if="Object.keys(executeInfo).length && !notPerformedSubNode">
             <section class="info-section abnormal-section" data-test-id="taskExecute_form_exceptionInfo" v-if="executeInfo.state === 'FAILED'">
-                <template v-if="!executeInfo.ex_data">
+                <template v-if="executeInfo.ex_data">
                     <p class="hide-html-text" v-html="executeInfo.failInfo"></p>
                     <div class="show-html-text" :class="{ 'is-fold': !isExpand }" v-html="executeInfo.failInfo"></div>
                     <span class="expand-btn" v-if="isExpandTextShow" @click="isExpand = !isExpand">{{ isExpand ? $t('收起') : $t('显示全部') }}</span>
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index 09fdd057ae..ab81b62540 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -78,6 +78,12 @@
                 </div>
             </div>
             <div class="node-info-panel" ref="nodeInfoPanel" v-if="isNodeInfoPanelShow" slot="content">
+                <!--可拖拽-->
+                <template v-if="['viewNodeDetails', 'executeInfo'].includes(nodeInfoType)">
+                    <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
+                    <i :class="['resize-proxy', 'left']" ref="resizeProxy"></i>
+                    <div class="resize-mask" ref="resizeMask"></div>
+                </template>
                 <ModifyParams
                     ref="modifyParams"
                     v-if="nodeInfoType === 'modifyParams'"
@@ -317,6 +323,7 @@
                 sideSliderTitle: '',
                 taskId: this.instance_id,
                 isNodeInfoPanelShow: false,
+                sidebarWidth: 960,
                 nodeInfoType: '',
                 state: '', // 当前流程状态，画布切换时会更新
                 rootState: '', // 根流程状态
@@ -489,12 +496,6 @@
             },
             adminView () {
                 return this.hasAdminPerm && this.$route.query.is_admin === 'true'
-            },
-            sidebarWidth () {
-                if (['viewNodeDetails', 'executeInfo'].includes(this.nodeInfoType)) {
-                    return window.innerWidth - 340
-                }
-                return 960
             }
         },
         mounted () {
@@ -1905,6 +1906,7 @@
             openNodeInfoPanel (type, name, isCondition = false) {
                 this.sideSliderTitle = name
                 this.isNodeInfoPanelShow = true
+                this.sidebarWidth = 960
                 this.nodeInfoType = type
                 this.isCondition = isCondition
             },
@@ -2396,6 +2398,47 @@
                         && this.pipelineData.activities[key].component.code === 'pause_node'))
                         ? 'SUSPENDED'
                         : ''
+            },
+            handleMousedown (event) {
+                this.updateResizeMaskStyle()
+                this.updateResizeProxyStyle()
+                document.addEventListener('mousemove', this.handleMouseMove)
+                document.addEventListener('mouseup', this.handleMouseUp)
+            },
+            handleMouseMove (event) {
+                const maxWidth = window.innerWidth - 340
+                let width = window.innerWidth - event.clientX
+                width = width < 960 ? 960 : width
+                width = width > maxWidth ? maxWidth : width
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.right = `${width}px`
+            },
+            updateResizeMaskStyle () {
+                const resizeMask = this.$refs.resizeMask
+                resizeMask.style.display = 'block'
+                resizeMask.style.cursor = 'col-resize'
+            },
+            updateResizeProxyStyle () {
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'visible'
+                resizeProxy.style.right = `${this.sidebarWidth}px`
+            },
+            handleMouseUp () {
+                const resizeMask = this.$refs.resizeMask
+                const resizeProxy = this.$refs.resizeProxy
+                resizeProxy.style.visibility = 'hidden'
+                resizeMask.style.display = 'none'
+                let right = resizeProxy.style.right.slice(0, -2)
+                right = Number(right)
+                const widthDiff = right - this.sidebarWidth
+                this.sidebarWidth = right
+                const layoutAsideDom = document.querySelector('.bk-resize-layout-aside')
+                if (layoutAsideDom) {
+                    const { width } = layoutAsideDom.getBoundingClientRect() || {}
+                    layoutAsideDom.style.width = `${width + widthDiff}px`
+                }
+                document.removeEventListener('mousemove', this.handleMouseMove)
+                document.removeEventListener('mouseup', this.handleMouseUp)
             }
         }
     }
@@ -2504,6 +2547,59 @@
     .operation-flow {
         padding: 20px 30px;
     }
+    >.resize-trigger {
+        width: 5px;
+        height: calc(100vh - 60px);
+        position: absolute;
+        left: 0;
+        top: 0;
+        cursor: col-resize;
+        z-index: 2500;
+        &::before {
+            content: '';
+            position: absolute;
+            top: 0;
+            left: 0;
+            bottom: 0;
+            width: 2px;
+            background-color: transparent;
+        }
+        &::after {
+            content: "";
+            position: absolute;
+            top: 50%;
+            right: -1px;
+            width: 2px;
+            height: 2px;
+            color: #979ba5;
+            transform: translate3d(0,-50%,0);
+            background: currentColor;
+            box-shadow: 0 4px 0 0 currentColor,0 8px 0 0 currentColor,0 -4px 0 0 currentColor,0 -8px 0 0 currentColor;
+        }
+        &:hover::before {
+            background-color: #3a84ff;
+        }
+    }
+    >.resize-proxy {
+        visibility: hidden;
+        position: fixed;
+        pointer-events: none;
+        z-index: 9998;
+        &.left {
+            top: 0;
+            height: 100%;
+            border-left: 1px dashed #3a84ff;
+        }
+    }
+    >.resize-mask {
+        display: none;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 9999;
+    }
 }
 .approval-dialog-content {
     /deep/ .bk-form-radio {
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index b0b9b30a9f..fb277d213b 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1654,8 +1654,10 @@
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
+                const maxWidth = window.innerWidth - 300
                 let width = window.innerWidth - event.clientX
-                width = width > 800 ? width : 800
+                width = width < 800 ? 800 : width
+                width = width > maxWidth ? maxWidth : width
                 const resizeProxy = this.$refs.resizeProxy
                 resizeProxy.style.right = `${width}px`
             },
@@ -1674,7 +1676,8 @@
                 const resizeProxy = this.$refs.resizeProxy
                 resizeProxy.style.visibility = 'hidden'
                 resizeMask.style.display = 'none'
-                this.sideWidth = resizeProxy.style.right
+                const right = resizeProxy.style.right.slice(0, -2)
+                this.sideWidth = Number(right)
                 document.removeEventListener('mousemove', this.handleMouseMove)
                 document.removeEventListener('mouseup', this.handleMouseUp)
             }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
index 65495fa772..7b06164531 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/OutputParams.vue
@@ -343,7 +343,7 @@
     .hook-icon-wrap {
         position: absolute;
         right: 22px;
-        top: 9px;
+        top: 5px;
         display: inline-block;
         width: 32px;
         height: 32px;
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index 562791e853..14c1c9207a 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -704,8 +704,10 @@
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
+                const maxWidth = window.innerWidth - 300
                 let width = window.innerWidth - event.clientX
-                width = width > 800 ? width : 800
+                width = width < 800 ? 800 : width
+                width = width > maxWidth ? maxWidth : width
                 const resizeProxy = this.$refs.resizeProxy
                 resizeProxy.style.right = `${width}px`
             },
@@ -724,7 +726,8 @@
                 const resizeProxy = this.$refs.resizeProxy
                 resizeProxy.style.visibility = 'hidden'
                 resizeMask.style.display = 'none'
-                this.sideWidth = resizeProxy.style.right
+                const right = resizeProxy.style.right.slice(0, -2)
+                this.sideWidth = Number(right)
                 document.removeEventListener('mousemove', this.handleMouseMove)
                 document.removeEventListener('mouseup', this.handleMouseUp)
             }

From 4e7fba00b2861e5672551b935b837021b7611385 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Tue, 17 Oct 2023 15:45:32 +0800
Subject: [PATCH 111/112] =?UTF-8?q?optimization:=20=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E8=8A=82=E7=82=B9=E8=8F=9C=E5=8D=95=E4=BE=A7?=
 =?UTF-8?q?=E6=A0=8F&&=E7=94=BB=E5=B8=83=E9=80=89=E4=B8=AD=E6=80=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/tags/TagInput.vue       |  2 +-
 .../common/RenderForm/tags/TagTextarea.vue    |  5 +-
 .../NodeTemplate/BranchGateway.vue            |  1 +
 .../ConditionalParallelGateway.vue            |  1 +
 .../NodeTemplate/ConvergeGateway.vue          | 10 +++-
 .../NodeTemplate/ParallelGateway.vue          | 10 +++-
 .../TemplateCanvas/PalettePanel/index.vue     | 49 +------------------
 .../pages/task/TaskExecute/ExecuteInfo.vue    |  4 +-
 .../pages/task/TaskExecute/TaskOperation.vue  | 18 ++++++-
 .../TemplateEdit/NodeConfig/NodeConfig.vue    |  2 +-
 .../TabGlobalVariables/index.vue              |  2 +-
 11 files changed, 47 insertions(+), 57 deletions(-)

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(/<br>/g, '<div><br></div>')
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() : ''
         ]">
         <div class="node-type-icon common-icon-node-branchgateway"></div>
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() : ''
         ]">
         <div class="node-type-icon common-icon-node-conditionalparallelgateway"></div>
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.
 */
 <template>
-    <div :class="['gateway-node', 'converge-gateway', node.status ? node.status.toLowerCase() : '', { 'ready': node.ready }]">
+    <div :class="[
+        'gateway-node',
+        'converge-gateway',
+        node.status ? node.status.toLowerCase() : '',
+        {
+            'ready': node.ready,
+            'actived': node.isActived
+        }
+    ]">
         <div class="node-type-icon common-icon-node-convergegateway"></div>
     </div>
 </template>
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.
 */
 <template>
-    <div :class="['gateway-node', 'parallel-gateway', node.status ? node.status.toLowerCase() : '', { 'ready': node.ready }]">
+    <div :class="[
+        'gateway-node',
+        'parallel-gateway',
+        node.status ? node.status.toLowerCase() : '',
+        {
+            'ready': node.ready,
+            'actived': node.isActived
+        }
+    ]">
         <div class="node-type-icon common-icon-node-parallelgateway"></div>
     </div>
 </template>
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 @@
                 <div :class="`node-type-icon common-icon-node-endpoint-${langSuffix}`"></div>
             </div>
             <div
-                :class="['palette-item', 'entry-item', 'palette-with-menu', { actived: menuType === 'plugin' }]"
+                :class="['palette-item', 'entry-item', 'palette-with-menu']"
                 data-type="tasknode"
                 @mousedown="onNodeMouseDown('plugin', $event)">
                 <div class="node-type-icon common-icon-node-tasknode"></div>
             </div>
             <div
-                :class="['palette-item','entry-item', 'palette-with-menu', { actived: menuType === 'subflow' }]"
+                :class="['palette-item','entry-item', 'palette-with-menu']"
                 data-type="subflow"
                 @mousedown="onNodeMouseDown('subflow', $event)">
                 <div class="node-type-icon common-icon-node-subflow"></div>
@@ -57,29 +57,14 @@
                 <div class="node-type-icon common-icon-node-conditionalparallelgateway"></div>
             </div>
         </div>
-        <transition name="slideLeft">
-            <node-menu
-                v-if="menuType !== ''"
-                :menu-type="menuType"
-                :template-labels="templateLabels"
-                :built-in-plugins="atomTypeList.tasknode"
-                :common="common"
-                @change="menuType = $event === 'tasknode' ? 'plugin' : 'subflow'"
-                @close="menuType = ''">
-            </node-menu>
-        </transition>
     </div>
 </template>
 <script>
     import i18n from '@/config/i18n/index.js'
-    import NodeMenu from './NodeMenu/NodeMenu.vue'
     import Guide from '@/utils/guide.js'
 
     export default {
         name: 'PalattePanel',
-        components: {
-            NodeMenu
-        },
         props: {
             templateLabels: Array,
             atomTypeList: {
@@ -104,12 +89,6 @@
         },
         data () {
             return {
-                menuType: '',
-                nodeMouse: {
-                    type: '',
-                    startX: null,
-                    startY: null
-                },
                 moveFlag: {
                     x: 0,
                     y: 0
@@ -132,30 +111,6 @@
                     y: e.pageY
                 }
             },
-            onOpenNodeMenu () {
-                this.menuType = this.nodeMouse.type
-            },
-            /**
-             * 节点点击，区分是 展开菜单 还是 拖拽
-             * @param {String} type -node type
-             * @param {Object} e -event
-             */
-            onNodeMouseDown (type, e) {
-                this.nodeMouse.startX = e.pageX
-                this.nodeMouse.startY = e.pageY
-                this.nodeMouse.type = type
-                document.addEventListener('mouseup', this.mouseUpHandler)
-            },
-            mouseUpHandler (e) {
-                const endX = e.pageX
-                const endY = e.pageY
-                const max = Math.max(endX - this.nodeMouse.startX, endY - this.nodeMouse.startY)
-                // 移动距离小于 3 像素，认为是点击事件
-                if (max < 3) {
-                    this.menuType = this.nodeMouse.type
-                }
-                document.removeEventListener('mouseup', this.mouseUpHandler)
-            },
             renderGuide () {
                 const nodesGuide = [
                     {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
index 2684f05919..12cea5ec09 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo.vue
@@ -1590,12 +1590,12 @@
         height: 320px;
         margin: 0 25px 8px 15px;
         position: relative;
-        background: #f5f7fb;
+        background: #f5f7fa;
         .sub-flow {
             height: 100%;
             border: 0;
             /deep/.canvas-wrapper {
-                background: #f5f7fb;
+                background: #f5f7fa;
             }
             /deep/.canvas-flow {
                 .active {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index ab81b62540..9020878e05 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -2406,7 +2406,7 @@
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
-                const maxWidth = window.innerWidth - 340
+                const maxWidth = window.innerWidth - 400
                 let width = window.innerWidth - event.clientX
                 width = width < 960 ? 960 : width
                 width = width > maxWidth ? maxWidth : width
@@ -2486,6 +2486,22 @@
                 .jtk-endpoint {
                     z-index: 2 !important;
                 }
+                .actived {
+                    box-shadow: none;
+                    &::after {
+                        content: '';
+                        display: block;
+                        height: calc(100% + 16px);
+                        width: calc(100% + 16px);
+                        position: absolute;
+                        top: -9px;
+                        left: -9px;
+                        z-index: -1;
+                        background: #e1ecff;
+                        border: 1px solid #1768ef;
+                        border-radius: 2px;
+                    }
+                }
             }
         }
     }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
index fb277d213b..64cc589e48 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/NodeConfig.vue
@@ -1654,7 +1654,7 @@
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
-                const maxWidth = window.innerWidth - 300
+                const maxWidth = window.innerWidth - 400
                 let width = window.innerWidth - event.clientX
                 width = width < 800 ? 800 : width
                 width = width > maxWidth ? maxWidth : width
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
index 14c1c9207a..fd3242d79d 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/TemplateSetting/TabGlobalVariables/index.vue
@@ -704,7 +704,7 @@
                 document.addEventListener('mouseup', this.handleMouseUp)
             },
             handleMouseMove (event) {
-                const maxWidth = window.innerWidth - 300
+                const maxWidth = window.innerWidth - 400
                 let width = window.innerWidth - event.clientX
                 width = width < 800 ? 800 : width
                 width = width > maxWidth ? maxWidth : width

From 7ff3213ab4d3baf9916c42ed75c4663012d013a3 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Thu, 19 Oct 2023 15:26:48 +0800
Subject: [PATCH 112/112] minor: release V3.31.0

---
 app.yml                                  | 2 +-
 app_desc.yaml                            | 2 +-
 config/default.py                        | 2 +-
 version_logs_md/V3.31.0_2023-09-21.md    | 6 ++++--
 version_logs_md_en/V3.31.0_2023-09-21.md | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app.yml b/app.yml
index ba4805ebe7..9f37147d67 100644
--- a/app.yml
+++ b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.31.0-beta1
+version: 3.31.0
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index 070b829d00..c45cea3485 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.31.0-beta1"
+app_version: "3.31.0"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index f828cdaf84..e797d76236 100644
--- a/config/default.py
+++ b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.31.0-beta1"
+STATIC_VERSION = "3.31.0"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
diff --git a/version_logs_md/V3.31.0_2023-09-21.md b/version_logs_md/V3.31.0_2023-09-21.md
index 8f1582bc72..98543371de 100644
--- a/version_logs_md/V3.31.0_2023-09-21.md
+++ b/version_logs_md/V3.31.0_2023-09-21.md
@@ -9,9 +9,9 @@
 
 - [ 优化 ] 移除变量免渲染功能，同时限制全局变量的生效范围。不再支持脚本中引用全局变量，请使用脚本参数传入。
 
-- [ 优化 ] 调整节点的失败处理选项逻辑，自动跳过和手动跳过不再支持同时勾选。
+- [ 优化 ] 优化插件字段转为变量的图标和文案，并不再允许从变量面板删除这类变量，仅支持从节点配置里取消使用后自动删除
 
-- [ 优化 ] 节点输入、输出变量型变量，当所有来源取消使用变量时，自动删除变量。
+- [ 优化 ] 调整节点的失败处理选项逻辑，自动跳过和手动跳过不允许同时勾选。
 
 - [ 优化 ] 优化了子流程节点详情，在一个界面中同时展示子流程节点的输入参数和内部详情。
 
@@ -23,6 +23,8 @@
 
 - [ 优化 ] 优化文本输入的交互，增加长度限制和提示。
 
+- [ 优化 ] 节点配置、变量编辑、节点详情支持拖动调整宽度
+
 ### 修复
 
 - [修复] 修复修改周期任务配置时，修改时间未刷新问题。
diff --git a/version_logs_md_en/V3.31.0_2023-09-21.md b/version_logs_md_en/V3.31.0_2023-09-21.md
index 3539cdf3ee..e72988a9a5 100644
--- a/version_logs_md_en/V3.31.0_2023-09-21.md
+++ b/version_logs_md_en/V3.31.0_2023-09-21.md
@@ -42,7 +42,7 @@
 
 - [Fixed] Fixed the issue that the results of the "IP Selector" variable were not correct when the selected cluster/module was removed from CMDB.
 
-- [Fixed] Fixed the issue that the "CMDB UPdate Set Attribute" plugin was not available due to parameter passing errors.
+- [Fixed] Fixed the issue that the "CMDB Update Set Attribute" plugin was not available due to parameter passing errors.
 
 - [Fixed] Fixed the issue that the "BKMonitor BlueKing Monitor Alarm Shield (Based on Strategy)" plugin do not display exceptions when run failed.